This commit was manufactured by cvs2svn to create tagoci_wchar_refactor_branch_post_merge_in_4_26_06

'oci_wchar_refactor_branch_post_merge_in_4_26_06'.

2209 files changed, 49872 insertions, 25523 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index af32d3517b3..c4f26ba777c 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -116,7 +116,7 @@ document</a>.</p><p>
   <tr>
     <th>DOC Group</th>
     <td>Solaris 7, 8, 9, and 10 (many compilers excluding SunC++ 4.x);
-        Windows 2000, XP (MSVC++ 7.1, and 8);
+        Windows 2000, XP (MSVC++ 6, 7.1, and 8);
         many versions of Linux/Intel (many compilers), Linux/IA64 (GCC).
     </td>
     <td>DOC sites at <a href="http://www.dre.vanderbilt.edu/">ISIS</a>,
@@ -147,7 +147,7 @@ document</a>.</p><p>
     <td>Maintains ACE on many platforms required for their ACE and
         TAO service offerings. Besides the standard DOC group platforms
         we also support AIX, Borland C++ Builder 6/2006, CBuilderX 1.0, MinGW,
-        Cygwin, VxWorks 5.5.1 & 6.2, OpenVMS 7.3-2 & 8.2-1, 
+        Cygwin, VxWorks 5.5.1 & 6.x, OpenVMS 7.3-2 & 8.2-1, 
         Tru64, SuSE Linux on Alpha/IA32/EM64T, 
         HPUX 11i v2/v2 32/64 bit on PA-RISC, and
         HPUX 11i v2 on Itanium. The Intel C++ compiler is supported on 
@@ -177,7 +177,7 @@ document</a>.</p><p>
         no longer maintained and may be removed from ACE at any time.
         If you want to have support for these environments contact one
         of the commercial support organisations. The platforms include:
-        DG/UX, VxWorks 5.4, MSVC5/6/7.0, Borland C++ Builder 4 and 5.
+        DG/UX, VxWorks 5.4, MSVC5, Borland C++ Builder 4 and 5.
         For up-to-date listings on platform that are deprecated and pending
         removal from ACE, please see the <a href="NEWS">NEWS file</a>.
     </td>
@@ -213,10 +213,10 @@ supported by the DOC group, Riverace, OCI or Remedy IT. </p><p>
 
 ACE (including TAO and CIAO) uses MPC (MakeProjectCreator) to generate
 files useful for the build tools (such as GNUmakefiles for UNIX based
-platforms, sln and vcproj files for VC71/vc8 and borland makefiles) on various
+platforms, dsp and dsw files for VC6 and borland makefiles) on various
 platforms. To help new users to bootstrap quickly the release bundles
-of ACE (TAO and CIAO) includes GNUmakefiles for UNIX platforms, and VC71/vc8
-solution files. If it is necessary to generate
+of ACE (TAO and CIAO) includes GNUmakefiles for UNIX platforms, VC6
+project files, and VC71 solution files. If it is necessary to generate
 files for build tools for other compilers such as Visual Age for IBM,
 and Windows CE users have to run MPC themselves to generate the
 appropriate files.  Please see <a href="MPC/USAGE">USAGE</a>, <a
@@ -2945,9 +2945,9 @@ quickly.
 
   from <code> $ACE_ROOT </code> to generate GNUmakefiles. Please use
 
-  <code> $ACE_ROOT/bin/mwc.pl -type vc8 ACE.mwc </code> </p><p>
+  <code> $ACE_ROOT/bin/mwc.pl -type vc6 ACE.mwc </code> </p><p>
 
-  to generate VC8 project and solution files. Please use <code>-type
+  to generate VC6 project and workspace files. Please use <code>-type
   vc71</code> to generate VC71 project and solution files.
 
   </p></li><li>If you want to build TAO+CIAO and its associated libraries
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp
index b6f5e6aa423..731676d7f94 100644
--- a/ACEXML/common/HttpCharStream.cpp
+++ b/ACEXML/common/HttpCharStream.cpp
@@ -251,7 +251,7 @@ ACEXML_HttpCharStream::get_url (size_t& len)
 int
 ACEXML_HttpCharStream::send_request (void)
 {
-  char* path = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (this->url_addr_->get_path_name()));
+  char* path = ACE::strnew (ACE_TEXT_TO_CHAR_IN (this->url_addr_->get_path_name()));
   ACE_Auto_Basic_Array_Ptr<char> path_ptr (path);
   size_t commandsize = ACE_OS::strlen (path)
                        + ACE_OS::strlen (this->url_addr_->get_host_name ())
@@ -382,7 +382,7 @@ ACEXML_HttpCharStream::read (ACEXML_Char *str,
     return -1;
   len = len * sizeof (ACEXML_Char);
   char* temp = const_cast<char*> (this->stream_->recv (len));
-  str = ACE_TEXT_CHAR_TO_TCHAR (temp);
+  ACE_OS::string_copy( str, temp, len );
   if (str == 0)
     return -1;
   return static_cast<int> (len);
diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp
index b58c916c73f..3bec4ae6ec4 100644
--- a/ACEXML/common/URL_Addr.cpp
+++ b/ACEXML/common/URL_Addr.cpp
@@ -33,7 +33,7 @@ ACEXML_URL_Addr::addr_to_string (ACEXML_Char *s,
   else
     {
       ACE_OS::sprintf (s, ACE_TEXT ("%s:%d/%s"),
-                       ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
+                       ACE_TEXT_TO_TCHAR_IN (ipaddr_format == 0
                                                ? this->get_host_name ()
                                                : this->get_host_addr ()),
                        this->get_port_number (),
@@ -55,7 +55,7 @@ ACEXML_URL_Addr::addr_to_string (int ipaddr_format)
     }
   ACE_OS::sprintf (this->addr_string_,
                    ACE_TEXT ("%s:%d/%s"),
-                   ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
+                   ACE_TEXT_TO_TCHAR_IN (ipaddr_format == 0
                                            ? this->get_host_name ()
                                           : this->get_host_addr ()),
                    this->get_port_number (),
@@ -67,7 +67,7 @@ ACEXML_URL_Addr::addr_to_string (int ipaddr_format)
 int
 ACEXML_URL_Addr::string_to_addr (const char* s)
 {
-  return this->string_to_addr (ACE_TEXT_CHAR_TO_TCHAR (s));
+  return this->string_to_addr (ACE_TEXT_TO_TCHAR_IN (s));
 }
 #endif /* ACE_USES_WCHAR */
 
diff --git a/ACEXML/common/XML_Types.h b/ACEXML/common/XML_Types.h
index 5a55d6b7754..ed8f170e290 100644
--- a/ACEXML/common/XML_Types.h
+++ b/ACEXML/common/XML_Types.h
@@ -27,17 +27,17 @@
 #include "ace/SString.h"
 #include "ace/Functor_String.h"
 
-# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 2)
+# if (ACE_SIZEOF_WCHAR == 2)
 typedef wchar_t ACEXML_UTF16;
 # else
 typedef ACE_USHORT16 ACEXML_UTF16;
-# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 2 */
+# endif /* ACE_SIZEOF_WCHAR == 2 */
 
-# if defined (ACE_HAS_WCHAR) && (ACE_SIZEOF_WCHAR == 4)
+# if (ACE_SIZEOF_WCHAR == 4)
 typedef wchar_t ACEXML_UCS4;
 # else
 typedef ACE_UINT32 ACEXML_UCS4;
-# endif /* ACE_HAS_WCHAR && ACE_SIZEOF_WCHAR == 4 */
+# endif /* ACE_SIZEOF_WCHAR == 4 */
 
 typedef char ACEXML_UTF8;
 
diff --git a/ACEXML/examples/SAXPrint/main.cpp b/ACEXML/examples/SAXPrint/main.cpp
index f6f334cee0e..f5eb2625125 100644
--- a/ACEXML/examples/SAXPrint/main.cpp
+++ b/ACEXML/examples/SAXPrint/main.cpp
@@ -37,7 +37,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   int zip = 0;
   ACEXML_Char* url = 0;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("sf:lu:z"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("sf:lu:z"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/ASNMP/agent/main.cpp b/ASNMP/agent/main.cpp
index ff0c9431518..c47d0da0ce9 100644
--- a/ASNMP/agent/main.cpp
+++ b/ASNMP/agent/main.cpp
@@ -9,13 +9,13 @@
 
 ACE_RCSID(agent, main, "$Id$")
 
-int 
-main (int argc, char *argv[])
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE::init ();
   snmp_agent the_agent;
 
-  if (the_agent.set_args(argc, argv)) 
+  if (the_agent.set_args(argc, argv))
     return 1;
 
   if (!the_agent.valid()) {
diff --git a/ASNMP/agent/snmp_agent.cpp b/ASNMP/agent/snmp_agent.cpp
index 520c58eaccf..0ed8285b373 100644
--- a/ASNMP/agent/snmp_agent.cpp
+++ b/ASNMP/agent/snmp_agent.cpp
@@ -41,7 +41,7 @@ int snmp_agent::set_args(int argc, char *argv[])
   const ACE_TCHAR *wr = WR_COM;
   ACE_Argv_Type_Converter to_tchar (argc, argv);
 
-  ACE_Get_Opt get_opt
+  ACE_Get_Arg_Opt<char> get_opt
     (argc, to_tchar.get_TCHAR_argv (), ACE_TEXT ("p:w:r:hv"));
   for (int c; (c = get_opt ()) != -1; ) {
      switch (c)
@@ -71,8 +71,8 @@ int snmp_agent::set_args(int argc, char *argv[])
 
    
    agent_ = new agent_impl(port,
-                           ACE_TEXT_ALWAYS_CHAR (rd),
-                           ACE_TEXT_ALWAYS_CHAR (wr)); // opens OS IO port
+                           ACE_TEXT_TO_CHAR_IN (rd),
+                           ACE_TEXT_TO_CHAR_IN (wr)); // opens OS IO port
    return 0;
 }
 
diff --git a/ASNMP/asnmp/sagent.cpp b/ASNMP/asnmp/sagent.cpp
index 8ee2fdb5b8d..70fef1fc5bd 100644
--- a/ASNMP/asnmp/sagent.cpp
+++ b/ASNMP/asnmp/sagent.cpp
@@ -55,7 +55,7 @@ int sagent::handle_input(ACE_HANDLE fd)
   const ACE_INET_Addr &ta = tr.get_from_addr();
   ACE_TCHAR buf_tmp[MAXHOSTNAMELEN + 1];
   ta.addr_to_string (buf_tmp, MAXHOSTNAMELEN);
-  UdpAddress ra (ACE_TEXT_ALWAYS_CHAR (buf_tmp));
+  UdpAddress ra (ACE_TEXT_TO_CHAR_IN (buf_tmp));
   tgt_.set_address(ra);
 
 
diff --git a/ASNMP/examples/get/get.cpp b/ASNMP/examples/get/get.cpp
index ff6fcb9681f..a633059a08c 100644
--- a/ASNMP/examples/get/get.cpp
+++ b/ASNMP/examples/get/get.cpp
@@ -67,7 +67,7 @@ class getapp {
 
 
 // main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
 {
   getapp get(argc, argv);
   if (get.valid())
@@ -95,22 +95,22 @@ getapp::getapp(int argc, char *argv[]): valid_(0)
    }
 
    ACE_Argv_Type_Converter to_tchar (argc, argv);
-   ACE_Get_Opt get_opt (argc,
-                        to_tchar.get_TCHAR_argv (),
-                        ACE_TEXT ("o:c:r:t:p:"));
+   ACE_Get_Arg_Opt<char> get_opt (argc,
+                         to_tchar.get_TCHAR_argv (),
+                         ACE_TEXT ("o:c:r:t:p:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          if (req.valid() == 0)
          cout << "ERROR: oid value: "
-              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+              << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
diff --git a/ASNMP/examples/get/get_async.cpp b/ASNMP/examples/get/get_async.cpp
index 8217ffabac1..ee9c9791d39 100644
--- a/ASNMP/examples/get/get_async.cpp
+++ b/ASNMP/examples/get/get_async.cpp
@@ -67,7 +67,7 @@ class getapp : public Snmp_Result {
 
 
 // main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
 {
   getapp get(argc, argv);
   if (get.valid())
@@ -95,22 +95,22 @@ getapp::getapp(int argc, char *argv[]): valid_(0)
    }
 
    ACE_Argv_Type_Converter to_tchar (argc, argv);
-   ACE_Get_Opt get_opt (argc,
-                        to_tchar.get_TCHAR_argv (),
-                        ACE_TEXT ("o:c:r:t:p:"));
+   ACE_Get_Arg_Opt<char> get_opt (argc,
+                         to_tchar.get_TCHAR_argv (),
+                         ACE_TEXT ("o:c:r:t:p:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          if (req.valid() == 0)
          cout << "ERROR: oid value: "
-              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+              << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
diff --git a/ASNMP/examples/next/next.cpp b/ASNMP/examples/next/next.cpp
index 7a9a2208ca2..0ec2a7fc945 100644
--- a/ASNMP/examples/next/next.cpp
+++ b/ASNMP/examples/next/next.cpp
@@ -66,7 +66,7 @@ class nextapp {
 
 
 // main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
 {
   nextapp get(argc, argv);
   if (get.valid())
@@ -94,22 +94,22 @@ nextapp::nextapp(int argc, char *argv[]): valid_(0)
    }
 
    ACE_Argv_Type_Converter to_tchar (argc, argv);
-   ACE_Get_Opt get_opt (argc,
-                        to_tchar.get_TCHAR_argv (),
-                        ACE_TEXT ("o:c:r:t:"));
+   ACE_Get_Arg_Opt<char> get_opt (argc,
+                         to_tchar.get_TCHAR_argv (),
+                         ACE_TEXT ("o:c:r:t:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          if (req.valid() == 0)
          cout << "ERROR: oid value: "
-              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+              << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
diff --git a/ASNMP/examples/set/set.cpp b/ASNMP/examples/set/set.cpp
index 39eb447f9a7..938a385c4e2 100644
--- a/ASNMP/examples/set/set.cpp
+++ b/ASNMP/examples/set/set.cpp
@@ -66,7 +66,7 @@ class set {
 
 
 // main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
 {
   set get(argc, argv);
   if (get.valid())
@@ -97,22 +97,22 @@ set::set(int argc, char *argv[]): valid_(0)
    }
 
    ACE_Argv_Type_Converter to_tchar (argc, argv);
-   ACE_Get_Opt get_opt (argc,
-                        to_tchar.get_TCHAR_argv (),
-                        ACE_TEXT ("o:c:r:t:I:U:C:G:T:O:S:P:"));
+   ACE_Get_Arg_Opt<char> get_opt (argc,
+                         to_tchar.get_TCHAR_argv (),
+                         ACE_TEXT ("o:c:r:t:I:U:C:G:T:O:S:P:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          if (req.valid() == 0)
          cout << "ERROR: oid value: "
-              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+              << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          target_.set_write_community(community_);
          break;
 
@@ -166,14 +166,14 @@ set::set(int argc, char *argv[]): valid_(0)
 
        case 'O': // Oid as a variable identifier
         {
-         oid_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         oid_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          vb.set_oid(oid_); // when value is set, pdu updated
          }
          break;
 
        case 'S': // Octet String
          {
-         OctetStr o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()));
+         OctetStr o(ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
          vb.set_value(o);                    // set the Oid portion of the Vb
          pdu_ += vb;
          }
@@ -181,7 +181,7 @@ set::set(int argc, char *argv[]): valid_(0)
 
        case 'P': // Oid String as a value
          {
-         Oid o(ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()));
+         Oid o(ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
          vb.set_value(o);                    // set the Oid portion of the Vb
          pdu_ += vb;
          }
diff --git a/ASNMP/examples/trap/trap.cpp b/ASNMP/examples/trap/trap.cpp
index 59d4f9f25bc..bfba5d3552e 100644
--- a/ASNMP/examples/trap/trap.cpp
+++ b/ASNMP/examples/trap/trap.cpp
@@ -68,7 +68,7 @@ class trapapp {
 
 
 // main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
 {
   trapapp get(argc, argv);
   if (get.valid())
@@ -98,23 +98,23 @@ trapapp::trapapp(int argc, char *argv[]): valid_(0)
    }
 
    ACE_Argv_Type_Converter to_tchar (argc, argv);
-   ACE_Get_Opt get_opt (argc,
-                        to_tchar.get_TCHAR_argv (),
-                        ACE_TEXT ("c:e:t:"));
+   ACE_Get_Arg_Opt<char> get_opt (argc,
+                         to_tchar.get_TCHAR_argv (),
+                         ACE_TEXT ("c:e:t:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'c': // community string
-         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
        case 'e': // trap oid to send
-         ent = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         ent = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          break;
 
        case 't': // trap oid
-         trap = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         trap = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          break;;
 
        default:
diff --git a/ASNMP/examples/walk/walk.cpp b/ASNMP/examples/walk/walk.cpp
index 56fc112fd71..75d62fa66f7 100644
--- a/ASNMP/examples/walk/walk.cpp
+++ b/ASNMP/examples/walk/walk.cpp
@@ -65,7 +65,7 @@ class walkapp {
 
 
 // main entry point
-int main( int argc, char *argv[])
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[])
 {
   walkapp get(argc, argv);
   if (get.valid())
@@ -94,22 +94,22 @@ walkapp::walkapp(int argc, char *argv[]): valid_(0)
    }
 
    ACE_Argv_Type_Converter to_tchar (argc, argv);
-   ACE_Get_Opt get_opt (argc,
-                        to_tchar.get_TCHAR_argv (),
-                        ACE_TEXT ("o:c:r:t:"));
+   ACE_Get_Arg_Opt<char> get_opt (argc,
+                         to_tchar.get_TCHAR_argv (),
+                         ACE_TEXT ("o:c:r:t:"));
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
        case 'o':
-         req = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         req = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          if (req.valid() == 0)
          cout << "ERROR: oid value: "
-              << ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg())
+              << ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg())
               << "is not valid. using default.\n";
          break;
 
        case 'c':
-         community_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg());
+         community_ = ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg());
          target_.set_read_community(community_);
          break;
 
diff --git a/ASNMP/tests/test_config.h b/ASNMP/tests/test_config.h
index 887fa5cec8a..cd416bafdff 100644
--- a/ASNMP/tests/test_config.h
+++ b/ASNMP/tests/test_config.h
@@ -99,8 +99,8 @@ do {\
 #define ACE_INIT_LOG(NAME) \
   char temp[BUFSIZ]; \
   ACE_OS::sprintf (temp, "%s%s%s", \
-                   ACE_TEXT_ALWAYS_CHAR (ACE_LOG_DIRECTORY), \
-                   ACE_TEXT_ALWAYS_CHAR (ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR)), \
+                   ACE_TEXT_TO_CHAR_IN (ACE_LOG_DIRECTORY), \
+                   ACE_TEXT_TO_CHAR_IN (ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR)), \
                    ".log"); \
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Deleting old log file %C (if any)\n\n"), temp)); \
   ACE_OS::unlink (temp);
@@ -146,8 +146,8 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
   // Ignore the error value since the directory may already exist.
   ACE_OS::mkdir (ACE_LOG_DIRECTORY);
   ACE_OS::sprintf (temp, "%s%s%s",
-                   ACE_TEXT_ALWAYS_CHAR (ACE_LOG_DIRECTORY),
-                   ACE_TEXT_ALWAYS_CHAR (ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)),
+                   ACE_TEXT_TO_CHAR_IN (ACE_LOG_DIRECTORY),
+                   ACE_TEXT_TO_CHAR_IN (ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR)),
                    ".log");
 
   this->output_file_.open (temp, ios::out | (append ? ios::app : ios::trunc));
diff --git a/ChangeLog b/ChangeLog
index e70e1a75735..9c210d62fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,106 +1,3 @@
-Wed Apr 26 17:13:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added test for Parallel_Connect_Strategy. This test will take
-          about 9 minutes to run to completion.
-
-Wed Apr 26 14:22:31 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added tests for new POA features.
-
-        * bin/MakeProjectCreator/config/endpointpolicy.mpb:
-          Applications wishing to use the TAO EndpointPolicy should add
-          this base project to their MPC files. This will include
-          libTAO_EndpointPolicy in their link lines.
-
-Wed Apr 26 14:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_hpux_kcc.GNU:
-        * include/makeinclude/platform_irix6.x_kcc.GNU:
-        * include/makeinclude/platform_linux_kcc.GNU:
-        * include/makeinclude/platform_osf1_4.x_kcc.GNU:
-        * include/makeinclude/platform_sunos5_kcc.GNU:
-        * include/makeinclude/platform_tru64_kcc.GNU:
-          Removed these files which are for the KAI C++ compiler. This
-          compiler doesn't exist anymore and full support for KAI C++
-          has been removed now from ACE/TAO. See bugzilla bug 2007
-
-Wed Apr 26 13:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/POA/Bug_2511_Regression
-
-Wed Apr 26 12:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Process_Manager.cpp:
-          Fixed fuzz errors and use const when possible
-
-Wed Apr 26 12:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/CDR_Test.cpp:
-          Boolean is now size 1 or bigger, the marshaling code will take
-          care that a Boolean is marshaled as octet of size 1
-
-Wed Apr 26 11:28:28 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/OBV/truncatable.
-
-Wed Apr 26 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/OBV
-
-Wed Apr 26 09:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added TAO/tests/Portable_Interceptors/Bug_2510_Regression
-
-Wed Apr 26 07:21:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_vxworks5.5.x.GNU:
-          Increased template-depth to 50, hopefully this is large enough to
-          also build CIAO
-
-Tue Apr 25 16:44:04 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.cpp:
-          Added code to support rewinding the output CDR to some previous
-          location and updating a value there. This is required to support
-          marshaling offset values were the target of the offset is not
-          known until the final offset target is actually reached.
-
-Tue Apr 25 13:50:12 UTC 2006  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Signal_Test.cpp:
-          Fixed this test for (modern) Linux and Solaris at least.
-          The crux is blocking signals before calling sigwait() when doing
-          synchronous signal handling.
-
-Tue Apr 25 09:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Base_Thread_Adapter.h:
-        * ace/Cleanup.h:
-          Fixed some errors I made
-
-Tue Apr 25 09:23:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Updated supported platforms and use vc8 for the MPC examples
-
-Tue Apr 25 08:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Base.h:
-          Always use bool for Boolean, see bugzilla 2514 for more info
-
-Tue Apr 25 06:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.h:
-          Put back ACE_TSS_CLEANUP_NAME that got lost by accident with the
-          vc6 cleanup. Thanks to Olli Savia for reporting this.
-
 Mon Apr 24 17:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/run_test.lst:
diff --git a/Kokyu/tests/EDF/test.cpp b/Kokyu/tests/EDF/test.cpp
index 0c6939ee613..b6bbe66a35c 100644
--- a/Kokyu/tests/EDF/test.cpp
+++ b/Kokyu/tests/EDF/test.cpp
@@ -145,7 +145,7 @@ int parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'p':
-        sched_policy_str = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
+        sched_policy_str = ACE_TEXT_TO_CHAR_IN(get_opts.opt_arg ());
         break;
 
       case '?':
diff --git a/Kokyu/tests/FIFO/test.cpp b/Kokyu/tests/FIFO/test.cpp
index deb25823a3b..fcda380ded6 100644
--- a/Kokyu/tests/FIFO/test.cpp
+++ b/Kokyu/tests/FIFO/test.cpp
@@ -149,7 +149,7 @@ int parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'p':
-        sched_policy_str = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
+        sched_policy_str = ACE_TEXT_TO_CHAR_IN(get_opts.opt_arg ());
         break;
 
       case '?':
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/CIDLC/cidlc.cpp b/TAO/CIAO/CIDLC/cidlc.cpp
index 1afeb08b859..d3a1ed91885 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
   {
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 14610139336..76e0c4ecf02 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,82 +1,1276 @@
-Wed Apr 26 13:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Apr 11 12:39:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tools/Config_Handlers/DP_Handler.cpp:
-        * tools/Config_Handlers/XML_File_Intf.cpp:
-        * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp:
-        * tools/Config_Handlers/XSCRT/XMLSchema.hpp:
-        * tools/Config_Handlers/XSCRT/Elements.hpp:
-        * tools/Config_Handlers/XSCRT/XML.hpp:
-          Removed workarounds for vc6 again
+        * tools/Config_Handlers/Utils/Utils.mpc:
+          Use exceptions as base project
 
-        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h:
-          Added missing post.h
+Tue Apr 11 12:43:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h:
-        * tools/Config_Handlers/Package_Handlers/PC_Intf.h:
-          Fixed incorrect file tags
+        * ciao/Container_Base.cpp:
+          Small simplification
 
-Wed Apr 26 08:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Apr 11 12:22:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/TargetManager/DomainDataManager.h:
-          Fixed compile problem in gcc4 build
+        * tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc:
+        * tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc:
+          Updated base projects to get correct build order
 
-Tue Apr 25 21:27:05 UTC 2006  William R. Otte <wotte@dre.vanderbilt.edu>
+Tue Apr 11 08:43:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * DAnCE/TargetManager/TargetManager.mpc
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
+          Initialise pointers with 0
 
-          Linking problems for Borland.
+Tue Apr 11 06:54:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+        * 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.
 
-          More compile fixes for Borland.
-Tue Apr 25 20:12:25 UTC 2006  William R. Otte <wotte@dre.vanderbilt.edu>
+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/Containers_Info_Map.h
-        * ciao/Deployment_Core.idl
+        * 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/CEPE_Handler.h
         * tools/Config_Handlers/CPD_Handler.cpp
-        * tools/Config_Handlers/CPD_Handler.h
+        * tools/Config_Handlers/CRDD_Handler.cpp
+        * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+        * tools/Config_Handlers/DD_Handler.cpp
         * tools/Config_Handlers/DP_Handler.cpp
-        * tools/Config_Handlers/Deployment.hpp
+        * tools/Config_Handlers/DP_PCD_Handler.cpp
+        * tools/Config_Handlers/DataType_Handler.cpp
         * tools/Config_Handlers/ERE_Handler.cpp
-        * tools/Config_Handlers/ERE_Handler.h
+        * 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/PCD_Handler.h
+        * tools/Config_Handlers/PSPE_Handler.cpp
         * tools/Config_Handlers/Property_Handler.cpp
-        * tools/Config_Handlers/Property_Handler.h
+        * tools/Config_Handlers/RDD_Handler.cpp
         * tools/Config_Handlers/Req_Handler.cpp
-        * tools/Config_Handlers/Req_Handler.h
-        * tools/Config_Handlers/SatisfierProperty_Handler.cpp
-        * tools/Config_Handlers/SatisfierProperty_Handler.h
+        * 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
-        * tools/Config_Handlers/toplevel.hpp
-        * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/CPD_Handler.h
-        * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/NIA_Handler.h
-        * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
-        * tools/Config_Handlers/Package_Handlers/SID_Handler.h
 
-        Compilation fixes for borland, some cosmetic fixes as well.
+          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.
 
-Tue Apr 25 09:00:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+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
 
-        * tools/Config_Handlers/CPD_Handler.h:
-          ComponentPortDescription is a struct, so also forward declare it
-          as a struct
+        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!
 
-Mon Apr 24 18:53:22 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+Wed Feb  1 20:42:42 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
         * CIDLC/ServantSourceGenerator.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/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 9cf69544075..c3c675aaab6 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -26,20 +26,19 @@ namespace CIAO
     bool
     parse_args (int argc, char *argv[])
     {
-      ACE_Get_Opt get_opts (argc, argv, "o:m:i:n:p");
+      ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:m:i:n:p");
       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 'p':
             pid_file_name_ = get_opts.opt_arg ();
@@ -117,11 +116,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
       try
@@ -201,8 +201,7 @@ namespace CIAO
                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
-          
-          if (write_to_ior_)
+          else
             {
               retval =
                 write_ior_file (orb.in (),
@@ -267,7 +266,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/NodeApplication/NodeApplication.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
index 5629d1235a8..442581f0795 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
@@ -13,7 +13,7 @@ void print_arg (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
    int priority = 20;
    // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index b87578e5a4e..5837ca5692d 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplication): ciao_server_dnc, ciao_events_dnc {
+project(NodeApplication): ciao_server_dnc {
   after += NoOp_Configurator
   libs  += CIAO_NoOp_Configurator
   exename   = NodeApplication
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 0cd1d7954b2..5edb7a51b3a 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -413,13 +413,13 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name
                   "CIAO::NodeApplication_Impl::passivate_component, "
                   "invalid instance [%s] \n",
                    name));
-      ACE_TRY_THROW (Components::RemoveFailure ());
+      ACE_TRY_THROW (Deployment::StartError ());
     }
 
   if (CORBA::is_nil (comp_state.objref_.in ()))
     {
       ACE_DEBUG ((LM_DEBUG, "comp is nil\n"));
-      throw Components::RemoveFailure ();
+      throw Deployment::StartError ();
     }
 
   comp_state.objref_->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -430,7 +430,7 @@ void
 CIAO::NodeApplication_Impl::activate_component (const char * name
                                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Deployment::StartError))
+                   ::Components::RemoveFailure))
 {
   Component_State_Info comp_state;
 
@@ -438,7 +438,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name
     {
       ACE_ERROR ((LM_ERROR,
                   "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::activate_component, "
+                  "CIAO::NodeApplication_Impl::passivate_component, "
                   "invalid instance [%s] \n",
                    name));
       ACE_TRY_THROW (Deployment::StartError ());
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index ee1878ff07d..8a08e3456c5 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -183,7 +183,7 @@ namespace CIAO
     virtual void activate_component (const char * name
                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Deployment::StartError));
+                       ::Components::RemoveFailure));
 
     virtual void passivate_component (const char * name
                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
index 352a005515a..df31c704651 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -272,11 +272,9 @@ namespace CIAO
     // For svnt/exec artifacts
     for (CORBA::ULong j = 0; j < artifact_num; ++j)
       {
-        Deployment::ArtifactDeploymentDescription arti =
+        const Deployment::ArtifactDeploymentDescription & arti =
           this->plan_.artifact[ impl.artifactRef[j] ];
 
-	// @Stoyan:  Is there any particular reason the repository
-	// manager should only work on Windows? -Will
 #if defined (ACE_WIN32) || defined (ACE_WIN64)
         for (size_t loc_num = 0;
              loc_num < arti.location.length ();
@@ -294,11 +292,8 @@ namespace CIAO
                          "Containers_Info_Map::insert_instance_into_container -"
                          "ERROR: Unable to resolve HTTP ref to location[%d] of %s\n",
                          loc_num, arti.name.in ()));
-		    
-		    // @Stoyan:  This is an inappropriate response to
-		    // this type of failure.  Please throw an
-		    // exception, Deployment::UnknownImplId would be appropriate.
-                    arti.location[loc_num] = "HTTP_failure";
+
+                    arti.location[loc_num] = CORBA::string_dup ("HTTP_failure");
                   }
                 else
                   {
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
index a60cbe662b3..4fb23a46f19 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
@@ -87,10 +87,7 @@ namespace CIAO
      * any references to HTTP URLs
      */
   protected:
-    
-    // @Stoyan - Please follow ACE coding guideines when naming your
-    //member variables.  In particular, please use lower case and
-    //follow the name with a trailing underscore.
+
     //directory in which to download the libraries obtained via HTTP
     ACE_CString HTTP_DOWNLOAD_PATH;
 
diff --git a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
index b4f5f55cd31..d082a5ecd3c 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
@@ -3,7 +3,7 @@
 
 // MPC file for the Monitor
 
-project(*monitorlib): ciao_client_dnc, ciao_events_base_dnc {
+project(*monitorlib): ciao_client_dnc{
   after += CIAO_TargetManager_stub
   includes += $(CIAO_ROOT)/DAnCE/TargetManager
   sharedname = ciaomonlib
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
index 01b11fa563a..d5338b6c140 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -2,7 +2,7 @@
 // $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  {
+project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub  {
   sharedname = NodeManager
   after += NodeApplicationManager NodeManager_stub CIAO_TargetManager_stub NoOp_Configurator
   libs += NodeManager_stub NodeApplicationManager TargetManager_stub CIAO_NoOp_Configurator
diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index 5cad11e47b9..d835d8b9ba6 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -26,7 +26,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:p:z:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:c:m:s:d:na:p:z:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -158,7 +158,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
     {
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index 141e1ff7e9a..faa2d6a8eb5 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -54,7 +54,7 @@ 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"));
       int c;
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/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/StaticConfigurator/StaticDAnCEParser.mpc b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
index 6ff77c3e1fa..0a8a72fdb43 100644
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
+++ b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions, ciao_server_dnc {
+project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions {
   exename   = StaticDAnCEParser
   includes += ..
   libs     += NodeApplicationManager
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
index ea704259a0e..84e50a5fabf 100644
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -201,9 +201,10 @@ namespace CIAO
        * @param available The available Properties
        */
 
-      void match_properties (
-                        ::Deployment::Properties deployed,
-                        ::Deployment::SatisfierProperties& available);
+        void CIAO::DomainDataManager::
+        match_properties (
+                          ::Deployment::Properties deployed,
+                          ::Deployment::SatisfierProperties& available);
 
 
         /// The different actiona that can take place
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 07200eb0eca..b5a7aaa5458 100644
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -22,7 +22,7 @@ project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub {
 project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
   after += CIAO_TargetManager_stub
   sharedname  = TargetManager_svnt
-  libs    += TargetManager_stub NodeManager_stub
+  libs    += TargetManager_stub
 
   idlflags  +=  -Wb,export_macro=TARGETMANAGER_SVNT_Export -Wb,export_include=TargetManager_svnt_export.h
   dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL
@@ -47,7 +47,7 @@ project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
 project(CIAO_TargetManager_exec) : ciao_servant_dnc, ciao_config_handlers, ciao_domainapplicationmanager_dnc {
   after   += CIAO_TargetManager_svnt
   sharedname = TargetManager_exec
-  libs      += TargetManager_stub TargetManager_svnt NodeManager_stub
+  libs      += TargetManager_stub TargetManager_svnt
 
   idlflags  +=  -Wb,export_macro=TARGETMANAGER_EXEC_Export -Wb,export_include=TargetManager_exec_export.h
   dynamicflags   = TARGETMANAGER_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/DAnCE/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/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/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/NodeApplicationTest/NodeAppTest.mpc b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
index 2cc04a9a18a..81004d6b00d 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
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index 21502bb63a6..c371f277a43 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
@@ -18,7 +18,7 @@ int counter = 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;
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 d984de8860b..90cafe7eee5 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
     {
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..be98bf4ce1c 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
     {
diff --git a/TAO/CIAO/NEWS b/TAO/CIAO/NEWS
index ab5537075ec..275c66d8c1b 100644
--- a/TAO/CIAO/NEWS
+++ b/TAO/CIAO/NEWS
@@ -70,24 +70,6 @@ PLANNED MAJOR CHANGES FOR THE NEXT RELEASE
 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.
   
diff --git a/TAO/CIAO/ciao/Deployment_Core.idl b/TAO/CIAO/ciao/Deployment_Core.idl
index 6f0a465f7e2..bfb58b6e2c8 100644
--- a/TAO/CIAO/ciao/Deployment_Core.idl
+++ b/TAO/CIAO/ciao/Deployment_Core.idl
@@ -284,7 +284,7 @@ module Deployment
     /// CIAO specific extensions
     /// Activate a component instance from the NodeApplication
     void activate_component (in string inst_name)
-      raises (::Deployment::StartError);
+      raises (::Components::RemoveFailure);
 
     /// CIAO specific extensions
     /// Passivate a component instance from the NodeApplication
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
new file mode 100644
index 00000000000..bcfcca9ef93
--- /dev/null
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.idl
@@ -0,0 +1,69 @@
+// $Id$
+
+/**
+ * @file CIAO_Events.idl
+ *
+ * @author George Edwards <g.edwards@vanderbilt.edu>
+ * @author Gan Deng <dengg@dre.vanderbilt.edu>
+ *
+ * @brief Interfaces for configuring CIAO's event mechanism.
+ */
+
+#include "ciao/CCM_Event.idl"
+
+module CIAO
+{
+  /// A component's UUID + port name.
+  typedef string CONNECTION_ID;
+
+  enum EventServiceType
+  {
+    DIRECT,
+    EC,
+    RTEC,
+    NOTIFY,
+    RTNOTIFY
+  };
+
+  interface Supplier_Config
+  {
+    attribute CONNECTION_ID supplier_id;
+
+    readonly attribute EventServiceType service_type;
+
+    void destroy ();
+  };
+
+  interface Consumer_Config : Supplier_Config
+  {
+    attribute CONNECTION_ID consumer_id;
+    attribute Components::EventConsumerBase consumer;
+
+    void start_conjunction_group (in long size);
+
+    void start_disjunction_group (in long size);
+
+    void insert_source (in CONNECTION_ID source_id);
+
+    void insert_type (in long event_type);
+  };
+
+  interface CIAO_Event_Service : Components::EventConsumerBase
+  {
+    Supplier_Config create_supplier_config ();
+
+    Consumer_Config create_consumer_config ();
+
+    void connect_event_supplier (in Supplier_Config supplier_conf);
+
+    void connect_event_consumer (in Consumer_Config consumer_conf);
+
+    void disconnect_event_supplier (in CONNECTION_ID conn_id)
+      raises (Components::InvalidConnection);
+
+    void disconnect_event_consumer (in CONNECTION_ID conn_id)
+      raises (Components::InvalidConnection);
+
+    //void push_event (in Components::EventBase ev);
+  };
+};
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
index a5a1417673e..c4ba7145521 100644
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc {
+project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc, ciao_events_base_dnc {
 
   sharedname  = CIAO_DnC_Events
   idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
@@ -14,7 +14,4 @@ project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc {
   Header_Files {
     CIAO_EventService_Factory_impl.h
   }
-
-  IDL_Files {
-  }
 }
diff --git a/TAO/CIAO/docs/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 73fd7a94ffe..a07e199285d 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
@@ -20,11 +20,10 @@ project(Stock_Base_Distributor_stub): ciao_events_base_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
-  
+
   idlflags  +=  -Wb,export_macro=DISTRIBUTOR_SVNT_Export -Wb,export_include=Distributor_svnt_export.h
   dynamicflags = DISTRIBUTOR_SVNT_BUILD_DLL
 
@@ -45,27 +44,25 @@ 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
-  
+
   idlflags  +=  -Wb,export_macro=DISTRIBUTOR_EXEC_Export -Wb,export_include=Distributor_exec_export.h
   dynamicflags   = DISTRIBUTOR_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
-    
+
     Distributor_exec.cpp
   }
 }
 
 
 project (Stock_Distributor) : ciao_client_dnc, valuetype{
-  avoids += ace_for_tao
   exename = Distributor
   after += Stock_Base_Distributor_stub
   libs += Distributor_stub Stock_Base_stub
@@ -77,4 +74,3 @@ project (Stock_Distributor) : ciao_client_dnc, valuetype{
     Distributor.cpp
   }
 }
-
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index 7eaa7d913a4..26aa8a8b939 100644
--- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -7,9 +7,9 @@ project(BMClosedED_DnC_stub): ciao_events_base_dnc {
   after += BasicSP_DnC_stub
   sharedname = BMClosedED_stub
 
-  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export 
-  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h 
-  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export
+  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h
+  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export
   idlflags += -Wb,skel_export_include=BMClosedED_svnt_export.h
 
   libs += BasicSP_stub
@@ -26,17 +26,16 @@ project(BMClosedED_DnC_stub): ciao_events_base_dnc {
 }
 
 project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += BasicSP_DnC_svnt BMClosedED_DnC_stub
 
   sharedname = BMClosedED_svnt
 
-  libs    += BMClosedED_stub BasicSP_stub 
+  libs    += BMClosedED_stub BasicSP_stub
   libs    += BasicSP_svnt
 
   libpaths += ..
 
-  idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags  +=  -Wb,export_macro=BMCLOSEDED_SVNT_Export
   idlflags  += -Wb,export_include=BMClosedED_svnt_export.h
 
   dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL
@@ -58,16 +57,15 @@ 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
 
-  libs       += BMClosedED_stub BMClosedED_svnt 
+  libs       += BMClosedED_stub BMClosedED_svnt
   libs       += BasicSP_stub BasicSP_svnt
 
   libpaths   += ..
-  idlflags   += -Wb,export_macro=BMCLOSEDED_EXEC_Export 
+  idlflags   += -Wb,export_macro=BMCLOSEDED_EXEC_Export
   idlflags   += -Wb,export_include=BMClosedED_exec_export.h
 
   dynamicflags   = BMCLOSEDED_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index 762fb25c8e8..18c801c9c9a 100644
--- a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -20,7 +20,6 @@ project(BMDevice_DnC_stub): ciao_events_base_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 +44,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 740c50abf8e..6a516f426d3 100644
--- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -7,12 +7,12 @@ project(BMDisplay_DnC_stub): ciao_events_base_dnc {
 
   sharedname = BMDisplay_stub
 
-  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export 
-  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h 
-  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export
+  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h
+  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export
   idlflags += -Wb,skel_export_include=BMDisplay_svnt_export.h
   dynamicflags   = BMDISPLAY_STUB_BUILD_DLL
- 
+
   libs += BasicSP_stub
 
   IDL_Files {
@@ -25,7 +25,6 @@ project(BMDisplay_DnC_stub): ciao_events_base_dnc {
 }
 
 project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += BasicSP_DnC_svnt BMDisplay_DnC_stub
 
   sharedname  = BMDisplay_svnt
@@ -34,7 +33,7 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
 
   libpaths += ..
 
-  idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export 
+  idlflags  +=  -Wb,export_macro=BMDISPLAY_SVNT_Export
   idlflags += -Wb,export_include=BMDisplay_svnt_export.h
 
   dynamicflags = BMDISPLAY_SVNT_BUILD_DLL
@@ -56,17 +55,16 @@ 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
 
-  libs      += BMDisplay_stub BMDisplay_svnt 
+  libs      += BMDisplay_stub BMDisplay_svnt
   libs      += BasicSP_stub BasicSP_svnt
 
   libpaths  += ..
 
-  idlflags  += -Wb,export_macro=BMDISPLAY_EXEC_Export 
+  idlflags  += -Wb,export_macro=BMDISPLAY_EXEC_Export
   idlflags  += -Wb,export_include=BMDisplay_exec_export.h
 
   dynamicflags   = BMDISPLAY_EXEC_BUILD_DLL
diff --git a/TAO/CIAO/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
index d425aad92e3..314f7c62be4 100644
--- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
@@ -7,9 +7,9 @@ project(EC_DnC_stub): ciao_events_base_dnc {
 
   sharedname = EC_stub
 
-  idlflags += -Wb,stub_export_macro=EC_STUB_Export 
-  idlflags += -Wb,stub_export_include=EC_stub_export.h 
-  idlflags += -Wb,skel_export_macro=EC_SVNT_Export 
+  idlflags += -Wb,stub_export_macro=EC_STUB_Export
+  idlflags += -Wb,stub_export_include=EC_stub_export.h
+  idlflags += -Wb,skel_export_macro=EC_SVNT_Export
   idlflags += -Wb,skel_export_include=EC_svnt_export.h
 
   dynamicflags   = EC_STUB_BUILD_DLL
@@ -26,13 +26,12 @@ project(EC_DnC_stub): ciao_events_base_dnc {
 }
 
 project(EC_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after     += BasicSP_DnC_svnt EC_DnC_stub
   sharedname = EC_svnt
 
   libpaths  += ..
 
-  idlflags  += -Wb,export_macro=EC_SVNT_Export 
+  idlflags  += -Wb,export_macro=EC_SVNT_Export
   idlflags  += -Wb,export_include=EC_svnt_export.h
 
   dynamicflags = EC_SVNT_BUILD_DLL
@@ -56,7 +55,6 @@ 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
 
@@ -64,7 +62,7 @@ project(EC_DnC_exec) : ciao_component_dnc {
 
   libpaths += ..
 
-  idlflags +=  -Wb,export_macro=EC_EXEC_Export 
+  idlflags +=  -Wb,export_macro=EC_EXEC_Export
   idlflags += -Wb,export_include=EC_exec_export.h
 
   dynamicflags   = EC_EXEC_BUILD_DLL
@@ -82,7 +80,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
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/Display/GPS/GPS.mpc b/TAO/CIAO/examples/Display/GPS/GPS.mpc
index b72c8b64f97..5d60b1dc6d0 100644
--- a/TAO/CIAO/examples/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/Display/GPS/GPS.mpc
@@ -9,7 +9,7 @@ project(GPS_DnC_stub): ciao_events_base_dnc {
   libpaths+=..
   libs += HUDisplay_DnC_stub
   dynamicflags   = GPS_STUB_BUILD_DLL
-  
+
   IDL_Files {
     GPS.idl
   }
@@ -20,7 +20,6 @@ project(GPS_DnC_stub): ciao_events_base_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 +44,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
@@ -58,12 +56,9 @@ project(GPS_DnC_exec) : ciao_component_dnc {
   }
 
   Source_Files {
-    
+
     GPSEIC.cpp
 
     GPS_exec.cpp
   }
 }
-
-
-
diff --git a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 3addb40ebee..e4edcc630c5 100644
--- a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -18,11 +18,10 @@ project(NavDisplay_DnC_stub): ciao_events_base_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
-  
+
   idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h
   dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
 
@@ -43,7 +42,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
@@ -60,6 +58,3 @@ project(NavDisplay_DnC_exec) : ciao_component_dnc {
     NavDisplay_exec.cpp
   }
 }
-
-
-
diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
index e0cd424393e..71bdfe9297f 100644
--- a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -18,7 +18,6 @@ project(RateGen_DnC_stub): ciao_events_base_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 +42,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 +61,16 @@ 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/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/Hello/Receiver/Receiver.mpc b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
index abde96ca404..3694a180d18 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -20,25 +20,24 @@ project(Hello_Base_Receiver_DnC_stub): ciao_events_base_dnc {
   Source_Files {
     ReceiverC.cpp
   }
-  
+
   Header_Files {
     ReceiverC.h
   }
-  
+
   Inline_Files {
     ReceiverC.inl
   }
 }
 
 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
   libs    += Receiver_DnC_stub \
              Hello_Base_DnC_stub \
              Hello_Base_DnC_svnt
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=RECEIVER_SVNT_Export \
                 -Wb,export_include=Receiver_svnt_export.h
@@ -72,14 +71,13 @@ 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 \
                Receiver_DnC_svnt \
                Hello_Base_DnC_stub \
                Hello_Base_DnC_svnt
-  
+
   idlflags  +=  -Sc \
                 -Wb,export_macro=RECEIVER_EXEC_Export \
                 -Wb,export_include=Receiver_exec_export.h
@@ -91,10 +89,10 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Receiver_exec.cpp
   }
-  
+
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 }
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.mpc b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
index 1363b6c0e71..9a903b00ee1 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
@@ -20,18 +20,17 @@ project(Hello_Base_Sender_DnC_stub): ciao_events_base_dnc {
   Source_Files {
     SenderC.cpp
   }
-  
+
   Header_Files {
     SenderC.h
   }
-  
+
   Inline_Files {
     SenderC.inl
   }
 }
 
 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
@@ -57,13 +56,13 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
     SenderS.cpp
     Sender_svnt.cpp
   }
-  
+
   Header_Files {
     SenderEC.h
     SenderS.h
     Sender_svnt.h
   }
-  
+
   Inline_Files {
     SenderEC.inl
     SenderS.inl
@@ -71,7 +70,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 \
@@ -90,14 +88,13 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
   Source_Files {
     Sender_exec.cpp
   }
-  
+
   Header_Files {
     Sender_exec.h
   }
 }
 
 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
@@ -108,10 +105,10 @@ project (Hello_DnC_Starter) : ciao_client_dnc, valuetype {
   Source_Files {
     starter.cpp
   }
-  
+
   Header_Files {
   }
-  
+
   Inline_Files {
   }
 }
diff --git a/TAO/CIAO/examples/Hello/Sender/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/Swapping/Receiver/Receiver.mpc b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
index 3a587791546..d8676fff50c 100644
--- a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -19,11 +19,10 @@ project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_events_base_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
   sharedname  = Receiver_DnC_Upgradeable_svnt
   libs    += Receiver_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
-  
+
   idlflags  +=  -Wb,export_macro=RECEIVER_SVNT_Export -Wb,export_include=Receiver_svnt_export.h
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
   cidlflags -= --
@@ -46,11 +45,10 @@ 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
   sharedname = Receiver_DnC_Upgradeable_exec
   libs      += Receiver_DnC_Upgradeable_stub Receiver_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
-  
+
   idlflags  +=  -Wb,export_macro=RECEIVER_EXEC_Export -Wb,export_include=Receiver_exec_export.h
   dynamicflags   = RECEIVER_EXEC_BUILD_DLL
 
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
index f2490ad5976..4539e7d5b56 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -20,7 +20,6 @@ project(HelloB_Sender_DnC_Upgradeable_stub): ciao_events_base_dnc {
 }
 
 project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += Hello_Base_DnC_Upgradeable_svnt \
            HelloB_Sender_DnC_Upgradeable_stub
   sharedname  = Sender_DnC_Upgradeable_svnt
@@ -48,7 +47,6 @@ 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
   sharedname = Sender_DnC_Upgradeable_exec
   libs      += Sender_DnC_Upgradeable_stub Sender_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
@@ -65,7 +63,6 @@ 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
   sharedname = Sender_DnC_Upgradeable_exec_1
@@ -86,7 +83,6 @@ 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
   sharedname = Sender_DnC_Upgradeable_exec_2
@@ -107,7 +103,6 @@ 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
   libs += Sender_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub
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..32f12acaa2e 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
@@ -16,7 +16,6 @@ project(Benchmark_stub): ciao_client_dnc {
 }
 
 project(Benchmark_svnt) : ciao_component_dnc {
-  avoids += ace_for_tao
   after +=  Benchmark_stub
   sharedname = Benchmark_svnt
   libs    += Benchmark_stub
@@ -32,7 +31,6 @@ project(Benchmark_svnt) : ciao_component_dnc {
 }
 
 project (*server) : taoserver, strategies,ciao_component_dnc {
-  avoids += ace_for_tao
   after += Benchmark_svnt
   libs += Benchmark_svnt Benchmark_stub 
 
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..793f486cbbf 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,7 +53,6 @@ project(RoundTrip_svnt) : ciao_servant_dnc {
 
 
 project(RoundTrip_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after += RoundTrip_svnt
   sharedname = RoundTrip_exec
 
@@ -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/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/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/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index 41501f86b1e..d7202e70781 100644
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -1,7 +1,6 @@
 //$Id$
 
 project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
-  avoids += ace_for_tao
   after  += ENW_stub
   libpaths += ../interfaces
   libs     += ENW_stub
@@ -19,7 +18,6 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
 }
 
 project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
-  avoids += ace_for_tao
   after +=  TSEC_CheckPoint_stub
   after +=  ENW_svnt ENW_stub
   sharedname  = TSEC_CheckPoint_svnt
@@ -47,7 +45,6 @@ project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
 
 
 project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
-  avoids += ace_for_tao
   after   += TSEC_CheckPoint_svnt
   after   += ENW_svnt ENW_stub
 
@@ -73,7 +70,6 @@ project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
 
 
 project(TSEC_CheckPoint_controller) : ciao_client_dnc, valuetype, event {
-  avoids += ace_for_tao
   exename = controller
   after += TSEC_CheckPoint_stub
   libs += TSEC_CheckPoint_stub ENW_stub
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 46cd2ef5573..faf1f9917b2 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
+
   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/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 0a81e4c4859..204bd665a70 100644
--- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
@@ -84,8 +84,8 @@ namespace CIAO
              adcb != adce;
              ++adcb)
           {
-            Property_Handler::handle_property ((*adcb),
-					       dest.execParameter[len++]);
+            Property_Handler::get_property ((*adcb),
+                                            dest.execParameter[len++]);
           }
 
         if (src.id_p ())
diff --git a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
index f7e4a7e82d3..70104131917 100644
--- a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
@@ -70,8 +70,8 @@ namespace CIAO
            pstart != pend;
            ++pstart)
         {
-          Property_Handler::handle_property (*pstart,
-						 toconfig.configProperty [pos++]);
+          Property_Handler::get_property (*pstart,
+                                          toconfig.configProperty [pos++]);
         }
 
       pos = 0;
@@ -81,7 +81,8 @@ namespace CIAO
            port != desc.end_port ();
            ++port)
         {
-          CPD_Handler::handle_component_port_description (*port,
+          CPD_Handler::component_port_description (
+                                                   *port,
                                                    toconfig.port[pos++]);
         }
 
@@ -104,8 +105,9 @@ namespace CIAO
             infoProp != desc.end_infoProperty();
             infoProp++)
         {
-          Property_Handler::handle_property (*infoProp,
-						 toconfig.infoProperty[pos]);
+          Property_Handler::get_property (
+                                          *infoProp,
+                                          toconfig.infoProperty[pos]);
         }
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
index 3131ce5735b..b061c426987 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
@@ -24,13 +24,13 @@ namespace CIAO
            eeci_b != eeci_e;
            ++eeci_b)
         {
-          CEPE_Handler::handle_external_port_endpoint ((*eeci_b),
+          CEPE_Handler::external_port_endpoint ((*eeci_b),
                                                 dest[pos++]);
         }
     }
 
     void
-    CEPE_Handler::handle_external_port_endpoint (
+    CEPE_Handler::external_port_endpoint (
                                           const ComponentExternalPortEndpoint &src,
                                           ::Deployment::ComponentExternalPortEndpoint &dest)
     {
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
index f0ba7f0d2fb..681fcb1ec43 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  CEPE_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  CEPE_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CEPE_HANDLER_H
@@ -21,46 +21,48 @@
 
 namespace Deployment
 {
-  class ComponentExternalPortEndpoints;
-  struct ComponentExternalPortEndpoint;
+class ComponentExternalPortEndpoints;
+struct ComponentExternalPortEndpoint;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-    {
-      class PlanConnectionDescription;
-      class ComponentExternalPortEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class ComponentExternalPortEndpoint;
 
-      /*
-       * @class CEPE_Handler
-       *
-       * @brief Handler class for <ComponentExternalPortEndpoint> types.
-       *
-       * This class defines handler methods to map values from
-       * XSC ComponentExternalPortEndpoint objects, parsed from
-       * the descriptor files, to the corresponding CORBA IDL type.
-       *
-       */
+/*
+* @class CEPE_Handler
+*
+* @brief Handler class for <ComponentExternalPortEndpoint> types.
+*
+* This class defines handler methods to map values from
+* XSC ComponentExternalPortEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
 
-      class Config_Handlers_Export CEPE_Handler
-	{
-	public:
-	  static void external_port_endpoints (const PlanConnectionDescription &src,
-					       ::Deployment::ComponentExternalPortEndpoints &dest);
+class Config_Handlers_Export CEPE_Handler
+{
+public:
+static void external_port_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::ComponentExternalPortEndpoints &dest);
 
-	  static ComponentExternalPortEndpoint
-	    external_port_endpoint (const ::Deployment::ComponentExternalPortEndpoint &src);
+static ComponentExternalPortEndpoint
+external_port_endpoint (
+const ::Deployment::ComponentExternalPortEndpoint &src);
 
-	  static void handle_external_port_endpoint (const ComponentExternalPortEndpoint &src,
-						     ::Deployment::ComponentExternalPortEndpoint &dest);
-	};
+static void external_port_endpoint (const ComponentExternalPortEndpoint &src,
+::Deployment::ComponentExternalPortEndpoint &dest);
+};
 
-      typedef Sequence_Handler < ComponentExternalPortEndpoint,
-	::Deployment::ComponentExternalPortEndpoints,
-	::Deployment::ComponentExternalPortEndpoint,
-	CEPE_Handler::handle_external_port_endpoint > CEPE_Functor;
-    }
+typedef Sequence_Handler < ComponentExternalPortEndpoint,
+::Deployment::ComponentExternalPortEndpoints,
+::Deployment::ComponentExternalPortEndpoint,
+CEPE_Handler::external_port_endpoint > CEPE_Functor;
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index 0b7b54d1adf..67fcc0901c6 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -10,7 +10,7 @@ namespace CIAO
   namespace Config_Handlers
   {
     void
-    CPD_Handler::handle_component_port_description (
+    CPD_Handler::component_port_description (
                                              const ComponentPortDescription& desc,
                                              Deployment::ComponentPortDescription& toconfig)
     {
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
index 57c97bc5b60..31737241b51 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  CPD_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  CPD_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_CPD_HANDLER_H
@@ -22,46 +22,48 @@
 
 namespace Deployment
 {
-  struct ComponentPortDescription;
-  class ComponentPortDescriptions;
+class ComponentPortDescription;
+class ComponentPortDescriptions;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-    {
-      class ComponentPortDescription;
-      /*
-       * @class CPD_Handler
-       *
-       * @brief Handler class for <CCMComponentPortDescription> types.
-       *
-       * This class defines handler methods to map values from
-       * XSC objects, parsed from the descriptor files, to the
-       * corresponding CORBA IDL type for the schema element.
-       *
-       */
+namespace Config_Handlers
+{
+class ComponentPortDescription;
+/*
+* @class CPD_Handler
+*
+* @brief Handler class for <CCMComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
 
-      class Config_Handlers_Export CPD_Handler
-	{
+class Config_Handlers_Export CPD_Handler
+{
 
-	public:
-	  /// Maps the values from the XSC object
-	  /// <ComponentInterfaceDescription> to the CORBA IDL type
-	  /// <Deployment::ComponentInterfaceDescription>.
-	  static void handle_component_port_description (const ComponentPortDescription &desc,
-							 ::Deployment::ComponentPortDescription &toconfig);
+public:
+/// Maps the values from the XSC object
+/// <ComponentInterfaceDescription> to the CORBA IDL type
+/// <Deployment::ComponentInterfaceDescription>.
+static void component_port_description (
+const ComponentPortDescription &desc,
+::Deployment::ComponentPortDescription &toconfig);
 
-	  static ComponentPortDescription
-	    component_port_description (const Deployment::ComponentPortDescription& src);
-	};
+static ComponentPortDescription
+component_port_description (
+const Deployment::ComponentPortDescription& src);
+};
 
-      typedef Sequence_Handler < ComponentPortDescription,
-				 ::Deployment::ComponentPortDescriptions,
-				 ::Deployment::ComponentPortDescription,
-				 CPD_Handler::handle_component_port_description > CPD_Functor;
+typedef Sequence_Handler < ComponentPortDescription,
+::Deployment::ComponentPortDescriptions,
+::Deployment::ComponentPortDescription,
+CPD_Handler::component_port_description > CPD_Functor;
 
-    }
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
index 0953c705cd5..fb66b16fa41 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -1,4 +1,8 @@
-// $Id$
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+#pragma warning (disable: 4018)
+#pragma warning (disable: 4284)
+#pragma warning (disable: 4146)
+#endif
 
 #include "DP_Handler.h"
 #include "ace/UUID.h"
@@ -171,7 +175,7 @@ ACE_RCSID (Config_Handlers,
               }
             else
               {
-                Property_Handler::handle_property (*pstart,
+                Property_Handler::get_property (*pstart,
                                                 this->idl_dp_->infoProperty [len]);
               }
           }
diff --git a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
index ca6cf839a75..6c6cea3596f 100644
--- a/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Deployment.hpp
@@ -1,13 +1,13 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * Changes made to this code will most likely be overwritten
- * when the handlers are recompiled.
- *
- * If you find errors or feel that there are bugfixes to be made,
- * please contact the current XSC maintainer:
- *             Will Otte <wotte@dre.vanderbilt.edu>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* Changes made to this code will most likely be overwritten
+* when the handlers are recompiled.
+*
+* If you find errors or feel that there are bugfixes to be made,
+* please contact the current XSC maintainer:
+*             Will Otte <wotte@dre.vanderbilt.edu>
+*/
 
 
 // Fix for Borland compilers, which seem to have a broken
@@ -24,9 +24,9 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include <memory>
@@ -45,109 +45,109 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::Domain
-    domain (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::DeploymentPlan
-    deploymentPlan (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ImplementationArtifactDescription
-    implementationArtifactDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ComponentInterfaceDescription
-    componentInterfaceDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ComponentImplementationDescription
-    componentImplementationDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::ComponentPackageDescription
-    componentPackageDescription (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::PackageConfiguration
-    packageConfiguration (xercesc::DOMDocument const*);
-
-    XSC_XML_Handlers_Export
-    ::CIAO::Config_Handlers::TopLevelPackageDescription
-    topLevelPackageDescription (xercesc::DOMDocument const*);
-  }
+namespace Config_Handlers
+{
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::Domain
+domain (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::DeploymentPlan
+deploymentPlan (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ImplementationArtifactDescription
+implementationArtifactDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentInterfaceDescription
+componentInterfaceDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentImplementationDescription
+componentImplementationDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::ComponentPackageDescription
+componentPackageDescription (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::PackageConfiguration
+packageConfiguration (xercesc::DOMDocument const*);
+
+XSC_XML_Handlers_Export
+::CIAO::Config_Handlers::TopLevelPackageDescription
+topLevelPackageDescription (xercesc::DOMDocument const*);
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-    }
-  }
+namespace Config_Handlers
+{
+namespace Traversal
+{
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-    }
-  }
+namespace Config_Handlers
+{
+namespace Writer
+{
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    XSC_XML_Handlers_Export
-    void
-    domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
-
-    XSC_XML_Handlers_Export
-    void
-    topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
-  }
+namespace Config_Handlers
+{
+XSC_XML_Handlers_Export
+void
+domain (::CIAO::Config_Handlers::Domain const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+deploymentPlan (::CIAO::Config_Handlers::DeploymentPlan const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+implementationArtifactDescription (::CIAO::Config_Handlers::ImplementationArtifactDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentInterfaceDescription (::CIAO::Config_Handlers::ComponentInterfaceDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentImplementationDescription (::CIAO::Config_Handlers::ComponentImplementationDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+componentPackageDescription (::CIAO::Config_Handlers::ComponentPackageDescription const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+packageConfiguration (::CIAO::Config_Handlers::PackageConfiguration const&, xercesc::DOMDocument*);
+
+XSC_XML_Handlers_Export
+void
+topLevelPackageDescription (::CIAO::Config_Handlers::TopLevelPackageDescription const&, xercesc::DOMDocument*);
+}
 }
 
 #endif // DEPLOYMENT_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
index 009b8b37659..f4cf96dfb3c 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h
@@ -46,4 +46,3 @@ namespace CIAO
 
 #include /**/ "ace/post.h"
 #endif /* CIAO_CONFIG_HANDLERS_DYNENUM_HANDLER_H*/
-
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index d64528cfdeb..200282aa792 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -24,13 +24,13 @@ namespace CIAO
            erep_b != erep_e;
            ++erep_b)
         {
-          ERE_Handler::handle_external_ref_endpoint ((*erep_b),
+          ERE_Handler::external_ref_endpoint ((*erep_b),
                                               dest[pos++]);
         }
     }
 
     void
-    ERE_Handler::handle_external_ref_endpoint (
+    ERE_Handler::external_ref_endpoint (
                                         const ExternalReferenceEndpoint &src,
                                         Deployment::ExternalReferenceEndpoint &dest)
     {
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
index c3bad772118..934e2273bf5 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  ERE_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  ERE_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_ERE_HANDLER_H
@@ -22,48 +22,49 @@
 
 namespace Deployment
 {
-  class ExternalReferenceEndpoints;
-  struct ExternalReferenceEndpoint;
+class ExternalReferenceEndpoints;
+struct ExternalReferenceEndpoint;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-    {
-      class PlanConnectionDescription;
-      class ExternalReferenceEndpoint;
+namespace Config_Handlers
+{
+class PlanConnectionDescription;
+class ExternalReferenceEndpoint;
 
-      /*
-       * @class ERE_Handler
-       *
-       * @brief Handler class for <ExternalReferenceEndpoint> types.
-       *
-       * This class defines handler methods to map values from
-       * XSC ExternalReferenceEndpoint objects, parsed from
-       * the descriptor files, to the corresponding CORBA IDL type.
-       *
-       */
+/*
+* @class ERE_Handler
+*
+* @brief Handler class for <ExternalReferenceEndpoint> types.
+*
+* This class defines handler methods to map values from
+* XSC ExternalReferenceEndpoint objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
 
-      class Config_Handlers_Export ERE_Handler
-	{
-	public:
-	  static void external_ref_endpoints (const PlanConnectionDescription &src,
-					      ::Deployment::ExternalReferenceEndpoints &dest);
+class Config_Handlers_Export ERE_Handler
+{
+public:
+static void external_ref_endpoints (
+const PlanConnectionDescription &src,
+::Deployment::ExternalReferenceEndpoints &dest);
 
-	  static ExternalReferenceEndpoint external_ref_endpoint (
-								  const Deployment::ExternalReferenceEndpoint& src);
+static ExternalReferenceEndpoint external_ref_endpoint (
+const Deployment::ExternalReferenceEndpoint& src);
 
-	  static void handle_external_ref_endpoint (const ExternalReferenceEndpoint &src,
-					     Deployment::ExternalReferenceEndpoint &dest);
-	};
+static void external_ref_endpoint (const ExternalReferenceEndpoint &src,
+Deployment::ExternalReferenceEndpoint &dest);
+};
 
-      typedef Sequence_Handler < ExternalReferenceEndpoint,
-	::Deployment::ExternalReferenceEndpoints,
-	::Deployment::ExternalReferenceEndpoint,
-	ERE_Handler::handle_external_ref_endpoint > ERE_Functor;
+typedef Sequence_Handler < ExternalReferenceEndpoint,
+::Deployment::ExternalReferenceEndpoints,
+::Deployment::ExternalReferenceEndpoint,
+ERE_Handler::external_ref_endpoint > ERE_Functor;
 
-    }
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
index df30ed2e87f..c48c95b9eb5 100644
--- a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.h
@@ -68,4 +68,3 @@ throw (Config_Error);
 
 #include /**/ "ace/post.h"
 #endif /* CIAO_CONFIG_HANDLERS_IRDD_Handler_H */
-
diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index c86d6dc1da1..9006956d2de 100644
--- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -87,7 +87,7 @@ namespace CIAO
            epcb != epce;
            ++epcb)
         {
-          Property_Handler::handle_property ((*epcb),
+          Property_Handler::get_property ((*epcb),
                                           toconfig.execParameter[len++]);
         }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
index 23b332d471e..bcb5e4d917c 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
@@ -26,7 +26,7 @@ namespace CIAO
     ///This method takes a <Deployment::PlanConnectionDescription>
     ///and maps the values from the passed in XSC
     ///PlanConnectionDescription to its members.
-    void PCD_Handler::handle_PlanConnectionDescription (const PlanConnectionDescription& desc,
+    void PCD_Handler::get_PlanConnectionDescription (const PlanConnectionDescription& desc,
                                                      Deployment::PlanConnectionDescription& toconfig)
     {
       CIAO_TRACE("PCD_Handler::get_PlanConnectionDescription");
diff --git a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
index 7b852203f60..edac698d7b6 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.h
@@ -53,7 +53,7 @@ namespace CIAO
       ///This method takes a <Deployment::PlanConnectionDescription>
       ///and maps the values from the passed in XSC
       ///PlanConnectionDescription to its members.
-      static void handle_PlanConnectionDescription (const PlanConnectionDescription& desc,
+      static void get_PlanConnectionDescription (const PlanConnectionDescription& desc,
                                           Deployment::PlanConnectionDescription& toconfig);
 
       //This method takes a <Deployment::PlanConnectionDescription>
@@ -66,7 +66,7 @@ namespace CIAO
     typedef Sequence_Handler < PlanConnectionDescription,
                                ::Deployment::PlanConnectionDescriptions,
                                ::Deployment::PlanConnectionDescription,
-                               PCD_Handler::handle_PlanConnectionDescription > PCD_Functor;
+                               PCD_Handler::get_PlanConnectionDescription > PCD_Functor;
     
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
index df3c0884b60..d9756f3c07f 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp
@@ -21,7 +21,7 @@ namespace CIAO
       {
         struct SPE_Handler
         {
-          static void handle_spe (const SubcomponentPortEndpoint &desc,
+          static void get_spe (const SubcomponentPortEndpoint &desc,
                                ::Deployment::SubcomponentPortEndpoint &toconfig)
           {
             CIAO_TRACE("SPE_Handler::get_spe");
@@ -50,11 +50,11 @@ namespace CIAO
         typedef Sequence_Handler < SubcomponentPortEndpoint,
                                    ::Deployment::SubcomponentPortEndpoints,
                                    ::Deployment::SubcomponentPortEndpoint,
-                                   SPE_Handler::handle_spe > SPE_Functor;
+                                   SPE_Handler::get_spe > SPE_Functor;
 
         struct ACD_Handler
         {
-          static void handle_acd (const AssemblyConnectionDescription &desc,
+          static void get_acd (const AssemblyConnectionDescription &desc,
                                ::Deployment::AssemblyConnectionDescription &toconfig)
           {
             CIAO_TRACE("ACD_Handler::get_acd");
@@ -113,12 +113,12 @@ namespace CIAO
         typedef Sequence_Handler < AssemblyConnectionDescription,
                                    ::Deployment::AssemblyConnectionDescriptions,
                                    ::Deployment::AssemblyConnectionDescription,
-                                   ACD_Handler::handle_acd > ACD_Functor;
+                                   ACD_Handler::get_acd > ACD_Functor;
 
 
         struct SPR_Handler
         {
-          static void handle_spr (const SubcomponentPropertyReference &desc,
+          static void get_spr (const SubcomponentPropertyReference &desc,
                                ::Deployment::SubcomponentPropertyReference &toconfig)
           {
             CIAO_TRACE("SPR_Handler::get_spr");
@@ -149,11 +149,11 @@ namespace CIAO
         typedef Sequence_Handler < SubcomponentPropertyReference,
                                    ::Deployment::SubcomponentPropertyReferences,
                                    ::Deployment::SubcomponentPropertyReference,
-                                   SPR_Handler::handle_spr > SPR_Functor;
+                                   SPR_Handler::get_spr > SPR_Functor;
 
         struct APM_Handler
         {
-          static void handle_apm (const AssemblyPropertyMapping &desc,
+          static void get_apm (const AssemblyPropertyMapping &desc,
                                ::Deployment::AssemblyPropertyMapping &toconfig)
           {
             CIAO_TRACE("APM_Handler::get_apm");
@@ -185,7 +185,7 @@ namespace CIAO
         typedef Sequence_Handler < AssemblyPropertyMapping,
                                    ::Deployment::AssemblyPropertyMappings,
                                    ::Deployment::AssemblyPropertyMapping,
-                                   APM_Handler::handle_apm > APM_Functor;
+                                   APM_Handler::get_apm > APM_Functor;
       }
 
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
index 8818ff34518..782027a38fb 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CID_Handler.cpp
@@ -31,7 +31,7 @@ namespace CIAO
       {
         struct Capability_Handler
         {
-          static void handle_capability (const Capability &desc,
+          static void get_capability (const Capability &desc,
                                       ::Deployment::Capability &toconfig)
           {
             CIAO_TRACE ("Capability_Handler::get_capability");
@@ -68,11 +68,11 @@ namespace CIAO
         typedef Sequence_Handler < Capability,
                                    ::Deployment::Capabilities,
                                    ::Deployment::Capability,
-                                   Capability_Handler::handle_capability > Capability_Functor;
+                                   Capability_Handler::get_capability > Capability_Functor;
 
         struct IR_Handler
         {
-          static void handle_ir (const ImplementationRequirement &desc,
+          static void get_ir (const ImplementationRequirement &desc,
                               ::Deployment::ImplementationRequirement &toconfig)
           {
             CIAO_TRACE ("IR_Handler::get_ir");
@@ -173,13 +173,13 @@ namespace CIAO
         typedef Sequence_Handler < ImplementationRequirement,
                                    ::Deployment::ImplementationRequirements,
                                    ::Deployment::ImplementationRequirement,
-                                   IR_Handler::handle_ir > IR_Functor;
+                                   IR_Handler::get_ir > IR_Functor;
 
 
 
         struct MID_Handler
         {
-          static void handle_mid (const MonolithicImplementationDescription &desc,
+          static void get_mid (const MonolithicImplementationDescription &desc,
                                ::Deployment::MonolithicImplementationDescription &toconfig)
           {
             CIAO_TRACE ("MID_Handler::get_mid");
@@ -236,7 +236,7 @@ namespace CIAO
         typedef Sequence_Handler < MonolithicImplementationDescription,
                                    ::Deployment::MonolithicImplementationDescriptions,
                                    ::Deployment::MonolithicImplementationDescription,
-                                   MID_Handler::handle_mid > MID_Functor;
+                                   MID_Handler::get_mid > MID_Functor;
 
       }
 
@@ -279,7 +279,7 @@ namespace CIAO
         else if (cid->monolithicImpl_p ())
           {
             toconfig.monolithicImpl.length (1);
-            MID_Handler::handle_mid (cid->monolithicImpl (),
+            MID_Handler::get_mid (cid->monolithicImpl (),
                                   toconfig.monolithicImpl[0]);
           }
         else
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
index 09f02684a21..dc3976ce698 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp
@@ -19,7 +19,7 @@ namespace CIAO
       {
         struct PCI_Handler
         {
-          static void handle_pci (const PackagedComponentImplementation &desc,
+          static void get_pci (const PackagedComponentImplementation &desc,
                                ::Deployment::PackagedComponentImplementation &toconfig)
           {
             CIAO_TRACE ("PCI_Handler::get_pci");
@@ -41,11 +41,11 @@ namespace CIAO
         typedef Sequence_Handler < PackagedComponentImplementation,
                                    ::Deployment::PackagedComponentImplementations,
                                    ::Deployment::PackagedComponentImplementation,
-                                   PCI_Handler::handle_pci > PCI_Functor;
+                                   PCI_Handler::get_pci > PCI_Functor;
       }
 
       void
-      CPD_Handler::handle_component_package_descr (const ComponentPackageDescription &desc,
+      CPD_Handler::component_package_descr (const ComponentPackageDescription &desc,
                                             ::Deployment::ComponentPackageDescription &toconfig)
       {
         CIAO_TRACE ("CPD_Handler::component_package_descr");
@@ -136,7 +136,7 @@ namespace CIAO
       {
         CIAO_TRACE ("CPD_Handler::resolve_cpd");
         if (!XML_HELPER->is_initialized ())
-          return 0;
+          return false;
 
         xercesc::DOMDocument* dom =
           XML_HELPER->create_dom (uri);
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
index 9535d24eef2..92b05187fa8 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/CPD_Handler.h
@@ -1,6 +1,6 @@
 //================================================
 /**
- *  @file  CPD_Handler.h
+ *  @file  STD_CPD_Handler.h
  *
  *  $Id$
  *
@@ -50,11 +50,11 @@ namespace CIAO
         /// Maps the values from the XSC object
         /// <ComponentPackageDescription> to the CORBA IDL type
         /// <Deployment::ComponentPackageDescription>.
-        static void handle_component_package_descr (const ComponentPackageDescription &desc,
+        static void component_package_descr (const ComponentPackageDescription &desc,
                                              ::Deployment::ComponentPackageDescription &toconfig);
 
         static ComponentPackageDescription
-	  component_package_descr (const Deployment::ComponentPackageDescription& src);
+        component_package_descr (const Deployment::ComponentPackageDescription& src);
       private:
         static ComponentPackageDescription * resolve_cpd (const char *uri);
 
@@ -63,7 +63,7 @@ namespace CIAO
       typedef Sequence_Handler < ComponentPackageDescription,
                                  ::Deployment::ComponentPackageDescriptions,
                                  ::Deployment::ComponentPackageDescription,
-                                 CPD_Handler::handle_component_package_descr > CPD_Functor;
+                                 CPD_Handler::component_package_descr > CPD_Functor;
 
     }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
index 74223c6b2d8..ea487980046 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp
@@ -20,7 +20,7 @@ namespace CIAO
       {
         struct Comp_Prop_Handler
         {
-          static void handle_cpd (const ComponentPropertyDescription &desc,
+          static void get_cpd (const ComponentPropertyDescription &desc,
                                ::Deployment::ComponentPropertyDescription &toconfig)
           {
             CIAO_TRACE ("Comp_Prop_Handler::get_cpd");
@@ -44,7 +44,7 @@ namespace CIAO
         typedef Sequence_Handler < ComponentPropertyDescription,
                                    ::Deployment::ComponentPropertyDescriptions,
                                    ::Deployment::ComponentPropertyDescription,
-                                   Comp_Prop_Handler::handle_cpd > Comp_Prop_Functor;
+                                   Comp_Prop_Handler::get_cpd > Comp_Prop_Functor;
       }
 
       void
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
index edc5fe7fa6c..6ad2767104b 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/NIA_Handler.h
@@ -34,7 +34,7 @@ namespace CIAO
       class Packaging_Handlers_Export NIA_Handler
       {
       public:
-        static void handle_nia (const NamedImplementationArtifact &desc,
+        static void get_nia (const NamedImplementationArtifact &desc,
                              ::Deployment::NamedImplementationArtifact &toconfig)
         {
           toconfig.name = desc.name ().c_str ();
@@ -55,11 +55,10 @@ namespace CIAO
       typedef Sequence_Handler < NamedImplementationArtifact,
                                  ::Deployment::NamedImplementationArtifacts,
                                  ::Deployment::NamedImplementationArtifact,
-        NIA_Handler::handle_nia > NIA_Functor;
+        NIA_Handler::get_nia > NIA_Functor;
     }
   }
 }
 
-#include /**/ "ace/post.h"
 
 #endif /* CIAO_PACKAGING_NIA_HANDLER_H */
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
index 675060fd082..922c1fac252 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp
@@ -1,19 +1,19 @@
 // $Id$
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "ciao/CIAO_common.h"
-#include "ciao/Packaging_DataC.h"
-#include "Utils/XML_Helper.h"
-#include "Utils/XercesString.h"
-#include "Utils/Exceptions.h"
 #include "Package_Handlers/PCD_Handler.h"
 #include "Package_Handlers/CPD_Handler.h"
+#include "Basic_Deployment_Data.hpp"
+#include "ciao/Packaging_DataC.h"
 #include "Deployment.hpp"
 #include "Property_Handler.h"
 #include "Req_Handler.h"
-
-#include "Basic_Deployment_Data.hpp"
+#include "Utils/XercesString.h"
+#include "Utils/Exceptions.h"
 
 #include <memory>
+#include "ciao/CIAO_common.h"
+
+#include <xercesc/util/XMLString.hpp>
 
 namespace CIAO
 {
@@ -25,20 +25,13 @@ namespace CIAO
       PCD_Handler::package_config (const ACE_TCHAR *uri,
                                    ::Deployment::PackageConfiguration &toconfig)
       {
-        const xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
-
-	if (dom == 0)
-	  {
-	    std::string error ("Unable to open file: ");
-	    error += uri;
-	    throw Parse_Error (error);
-	  }
+        xercesc::DOMDocument *dom = XML_HELPER->create_dom (uri);
 
-	XStr root = dom->getDocumentElement ()->getTagName ();
+        XStr root = dom->getDocumentElement ()->getTagName ();
 
         if (root == XStr ("Deployment:topLevelPackageDescription"))
           {
-	TopLevelPackageDescription tpd = topLevelPackageDescription (dom);
+            TopLevelPackageDescription tpd (topLevelPackageDescription (dom));
             PCD_Handler::package_config (tpd.package (),
                                          toconfig);
           }
@@ -90,8 +83,8 @@ namespace CIAO
         if (pcd->basePackage_p ())
           {
             toconfig.basePackage.length (1);
-            CPD_Handler::handle_component_package_descr (pcd->basePackage (),
-							 toconfig.basePackage [0]);
+            CPD_Handler::component_package_descr (pcd->basePackage (),
+                                                  toconfig.basePackage [0]);
           }
 
         // @@ MAJO: Support other elements present here.
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
index e265295d040..334245559fa 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.cpp
@@ -1,5 +1,11 @@
 // $Id$
 
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+#pragma warning (disable: 4018)
+#pragma warning (disable: 4284)
+#pragma warning (disable: 4146)
+#endif
+
 #include "STD_PC_Intf.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
index c15ae0389b9..d280fb5c655 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/PC_Intf.h
@@ -1,6 +1,6 @@
 //==============================================================
 /**
- *  @file  PC_Intf.h
+ *  @file  STD_PC_Intf.h
  *
  *  $Id$
  *
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
index 34eadf9ea32..4cca9747789 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.cpp
@@ -19,7 +19,7 @@ namespace CIAO
       IDREF_Base<CORBA::ULong> SID_Handler::IDREF;
 
       void
-      SID_Handler::handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
+      SID_Handler::sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
                                          ::Deployment::SubcomponentInstantiationDescription &toconfig)
       {
         CIAO_TRACE ("SID_Handler::sub_comp_inst_descr");
@@ -28,7 +28,7 @@ namespace CIAO
         if (desc.basePackage_p ())
           {
             toconfig.basePackage.length (1);
-            CPD_Handler::handle_component_package_descr (desc.basePackage (),
+            CPD_Handler::component_package_descr (desc.basePackage (),
                                                   toconfig.basePackage[0]);
           }
         else if (desc.specializedConfig_p ())
diff --git a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
index 1bcb73e751e..c166fcd6294 100644
--- a/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Package_Handlers/SID_Handler.h
@@ -43,7 +43,7 @@ namespace CIAO
         }
 
       public:
-        static void handle_sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
+        static void sub_comp_inst_descr (const SubcomponentInstantiationDescription &desc,
                                          ::Deployment::SubcomponentInstantiationDescription &toconfig);
 
         static SubcomponentInstantiationDescription
@@ -61,7 +61,7 @@ namespace CIAO
       typedef Sequence_Handler < SubcomponentInstantiationDescription,
                                  ::Deployment::SubcomponentInstantiationDescriptions,
                                  ::Deployment::SubcomponentInstantiationDescription,
-	SID_Handler::handle_sub_comp_inst_descr > SID_Functor;
+                                 SID_Handler::sub_comp_inst_descr > SID_Functor;
 
     }
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
index 41129007618..273fe8c8e69 100644
--- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
@@ -19,7 +19,7 @@ namespace CIAO
     }
 
     void
-    Property_Handler::handle_property (
+    Property_Handler::get_property (
                                     const Property& desc,
                                     Deployment::Property& toconfig)
     {
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
index 9ef49062ecb..07044faed8e 100644
--- a/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Property_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  Property_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  Property_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_PROPERTY_HANDLER_H
@@ -22,51 +22,50 @@
 
 namespace Deployment
 {
-  struct Property;
-  class Properties;
+struct Property;
+class Properties;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-    {
-      class Property;
-
-      /*
-       * @class Property_Handler
-       *
-       * @brief Handler class for <CCMComponentPortDescription> types.
-       *
-       * This class defines handler methods to map values from
-       * XSC objects, parsed from the descriptor files, to the
-       * corresponding CORBA IDL type for the schema element.
-       *
-       */
+namespace Config_Handlers
+{
+class Property;
 
-      class Config_Handlers_Export Property_Handler
-	{
-	public:
-	  Property_Handler (void);
-	  virtual ~Property_Handler (void);
+/*
+* @class Property_Handler
+*
+* @brief Handler class for <CCMComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
 
-	  typedef Sequence_Iterator< const ::Deployment::Properties, const ::Deployment::Property > prop_iter;
+class Config_Handlers_Export Property_Handler
+{
+public:
+Property_Handler (void);
+virtual ~Property_Handler (void);
 
-	  /// This method maps the values from the XSC object
-	  /// <CIAO::Config_Handlers::Property> to the CORBA IDL type
-	  /// <Deployment::Property>.
-	  static void handle_property (const Property& desc,
-				    ::Deployment::Property& toconfig);
-	  static Property get_property (
-					const ::Deployment::Property& src);
-	};
+typedef Sequence_Iterator< const ::Deployment::Properties, const ::Deployment::Property > prop_iter;
 
+/// This method maps the values from the XSC object
+/// <CIAO::Config_Handlers::Property> to the CORBA IDL type
+/// <Deployment::Property>.
+static void get_property (const Property& desc,
+::Deployment::Property& toconfig);
+static Property get_property (
+const ::Deployment::Property& src);
+};
 
-      typedef Sequence_Handler < Property,
-				 ::Deployment::Properties,
-				 ::Deployment::Property,
-				 Property_Handler::handle_property > Property_Functor;
+typedef Sequence_Handler < Property,
+::Deployment::Properties,
+::Deployment::Property,
+Property_Handler::get_property> Property_Functor;
 
-    }
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
index 15fabe1f34a..cf31d9bb0b5 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 c20d5e428f2..37fd441ac92 100644
--- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
@@ -18,8 +18,8 @@ namespace CIAO
     }
 
     void
-    Req_Handler::handle_requirement (const Requirement& desc,
-				     Deployment::Requirement& toconfig)
+    Req_Handler::get_requirement (const Requirement& desc,
+                                  Deployment::Requirement& toconfig)
     {
       CIAO_TRACE("Req_Handler::get_Requirement");
 
diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
index be35f55e0a8..315eee76579 100644
--- a/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Req_Handler.h
@@ -1,11 +1,11 @@
 //==============================================================
 /**
- *  @file  Req_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  Req_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_REQ_HANDLER_H
@@ -22,49 +22,49 @@
 
 namespace Deployment
 {
-  struct Requirement;
-  class Requirements;
+struct Requirement;
+class Requirements;
 }
 
 namespace CIAO
 {
 
-  namespace Config_Handlers
-    {
-      /*
-       * @class REQ_Handler
-       *
-       * @brief Handler class for <Requirement> types.
-       *
-       * This class defines handler methods to map values from
-       * XSC Requirement objects, parsed from
-       * the descriptor files, to the corresponding CORBA IDL type.
-       *
-       */
+namespace Config_Handlers
+{
+/*
+* @class REQ_Handler
+*
+* @brief Handler class for <Requirement> types.
+*
+* This class defines handler methods to map values from
+* XSC Requirement objects, parsed from
+* the descriptor files, to the corresponding CORBA IDL type.
+*
+*/
 
-      class Config_Handlers_Export Req_Handler
-	{
-	public:
+class Config_Handlers_Export Req_Handler
+{
+public:
 
-	  Req_Handler (void);
-	  virtual ~Req_Handler (void);
+Req_Handler (void);
+virtual ~Req_Handler (void);
 
-	  ///This method takes a <Deployment::Requirement>
-	  ///and maps the values from the passed in XSC
-	  ///Requirement to its members.
-	  static void handle_requirement (const Requirement& desc,
-				       Deployment::Requirement& toconfig);
-	  static Requirement
-	    get_requirement (const Deployment::Requirement& src);
-	};
+///This method takes a <Deployment::Requirement>
+///and maps the values from the passed in XSC
+///Requirement to its members.
+static void get_requirement (const Requirement& desc,
+Deployment::Requirement& toconfig);
+static Requirement
+get_requirement (const Deployment::Requirement& src);
+};
 
-      typedef Sequence_Handler < Requirement,
-	::Deployment::Requirements,
-	::Deployment::Requirement,
-	Req_Handler::handle_requirement > Requirement_Functor;
+typedef Sequence_Handler < Requirement,
+::Deployment::Requirements,
+::Deployment::Requirement,
+Req_Handler::get_requirement > Requirement_Functor;
 
 
-    }
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
index 31f4d937a49..0a50d889b0b 100644
--- a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.cpp
@@ -20,7 +20,7 @@ namespace CIAO
     }
 
     void
-    SatisfierProperty_Handler::handle_sat_property (
+    SatisfierProperty_Handler::get_sat_property (
                                                  const SatisfierProperty& desc,
                                                  Deployment::SatisfierProperty& toconfig)
     {
diff --git a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
index 4ee0b804b24..2c2f671cb02 100644
--- a/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/SatisfierProperty_Handler.h
@@ -1,11 +1,11 @@
 //================================================
 /**
- *  @file  SatisfierProperty_Handler.h
- *
- *  $Id$
- *
- *  @author Jules White <jules@dre.vanderbilt.edu>
- */
+*  @file  SatisfierProperty_Handler.h
+*
+*  $Id$
+*
+*  @author Jules White <jules@dre.vanderbilt.edu>
+*/
 //================================================
 
 #ifndef CIAO_CONFIG_HANDLERS_SATIS_PROPERTY_HANDLER_H
@@ -22,49 +22,49 @@
 
 namespace Deployment
 {
-  struct SatisfierProperty;
-  class SatisfierProperties;
+struct SatisfierProperty;
+class SatisfierProperties;
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-    {
-      class SatisfierProperty;
+namespace Config_Handlers
+{
+class SatisfierProperty;
 
-      /*
-       * @class SatisfierProperty_Handler
-       *
-       * @brief Handler class for <CCMComponentPortDescription> types.
-       *
-       * This class defines handler methods to map values from
-       * XSC objects, parsed from the descriptor files, to the
-       * corresponding CORBA IDL type for the schema element.
-       *
-       */
+/*
+* @class SatisfierProperty_Handler
+*
+* @brief Handler class for <CCMComponentPortDescription> types.
+*
+* This class defines handler methods to map values from
+* XSC objects, parsed from the descriptor files, to the
+* corresponding CORBA IDL type for the schema element.
+*
+*/
 
-      class Config_Handlers_Export SatisfierProperty_Handler
-	{
-	public:
-	  SatisfierProperty_Handler (void);
-	  virtual ~SatisfierProperty_Handler (void);
+class Config_Handlers_Export SatisfierProperty_Handler
+{
+public:
+SatisfierProperty_Handler (void);
+virtual ~SatisfierProperty_Handler (void);
 
-	  typedef Sequence_Iterator< const ::Deployment::SatisfierProperties, const ::Deployment::SatisfierProperty > sat_prop_iter;
+typedef Sequence_Iterator< const ::Deployment::SatisfierProperties, const ::Deployment::SatisfierProperty > sat_prop_iter;
 
-	  /// This method maps the values from the XSC object
-	  /// <CIAO::Config_Handlers::SatisfierProperty> to the CORBA IDL type
-	  /// <Deployment::SatisfierProperty>.
-	  static void handle_sat_property (const SatisfierProperty& desc,
-					   ::Deployment::SatisfierProperty& toconfig);
-	  static SatisfierProperty get_sat_property (const ::Deployment::SatisfierProperty& src);
-	};
+/// This method maps the values from the XSC object
+/// <CIAO::Config_Handlers::SatisfierProperty> to the CORBA IDL type
+/// <Deployment::SatisfierProperty>.
+static void get_sat_property (const SatisfierProperty& desc,
+::Deployment::SatisfierProperty& toconfig);
+static SatisfierProperty get_sat_property (const ::Deployment::SatisfierProperty& src);
+};
 
-      typedef Sequence_Handler < SatisfierProperty,
-	::Deployment::SatisfierProperties,
-	::Deployment::SatisfierProperty,
-	SatisfierProperty_Handler::handle_sat_property> SatisfierProperty_Functor;
+typedef Sequence_Handler < SatisfierProperty,
+::Deployment::SatisfierProperties,
+::Deployment::SatisfierProperty,
+SatisfierProperty_Handler::get_sat_property> SatisfierProperty_Functor;
 
-    }
+}
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
index a23d7f2cdd9..93c2a003606 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp
@@ -29,9 +29,19 @@ namespace XMLSchema
   typedef XSCRT::FundamentalType<ACE_INT32> int_;
   typedef XSCRT::FundamentalType<ACE_UINT32> unsignedInt;
 
+  //@@ VC6
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+
+  typedef XSCRT::FundamentalType<__int64> long_;
+  typedef XSCRT::FundamentalType<unsigned __int64> unsignedLong;
+
+#else
+
   typedef XSCRT::FundamentalType<ACE_INT64> long_;
   typedef XSCRT::FundamentalType<ACE_UINT64> unsignedLong;
 
+#endif
+
   //@@ It would be nice to use some arbitrary-length integer class.
   //
   typedef long_ decimal;
diff --git a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
index d7d55058b25..041b369884a 100644
--- a/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
@@ -1,5 +1,11 @@
 // $Id$
 
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+#pragma warning (disable: 4018)
+#pragma warning (disable: 4284)
+#pragma warning (disable: 4146)
+#endif
+
 #include "XML_File_Intf.h"
 #include "Utils/XML_Helper.h"
 #include "Deployment.hpp"
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
index 26dfbc8e695..0d84a6bc28a 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp
@@ -12,6 +12,87 @@
 
 #include "XSCRT/Parser.hpp"
 
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+
+
+// Stuff for broken VC6. Don't like what you see - use better compiler!
+//
+
+
+inline
+std::wistream&
+operator>> (std::wistream& is, __int64& v)
+{
+  long t;
+  is >> t;
+  v = t;
+  return is;
+}
+
+inline
+std::wistream&
+operator>> (std::wistream& is, unsigned __int64& v)
+{
+  unsigned long t;
+  is >> t;
+  v = t;
+  return is;
+}
+
+inline
+std::wostream&
+operator<< (std::wostream& os, __int64 const& v)
+{
+  os << long (v);
+  return os;
+}
+
+inline
+std::wostream&
+operator<< (std::wostream& os, unsigned __int64 const& v)
+{
+  os << unsigned long (v);
+  return os;
+}
+
+inline
+std::istream&
+operator>> (std::istream& is, __int64& v)
+{
+  long t;
+  is >> t;
+  v = t;
+  return is;
+}
+
+inline
+std::istream&
+operator>> (std::istream& is, unsigned __int64& v)
+{
+  unsigned long t;
+  is >> t;
+  v = t;
+  return is;
+}
+
+inline
+std::ostream&
+operator<< (std::ostream& os, __int64 const& v)
+{
+  os << long (v);
+  return os;
+}
+
+inline
+std::ostream&
+operator<< (std::ostream& os, unsigned __int64 const& v)
+{
+  os << unsigned long (v);
+  return os;
+}
+
+#endif
+
 namespace XSCRT
 {
   struct IdentityProvider
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
index 1f11533e2bb..b12fda738d2 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
@@ -11,6 +11,16 @@
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/XMLString.hpp>
 
+
+//@@ VC6
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+
+namespace std
+{
+  typedef ::size_t size_t;
+}
+#endif
+
 namespace XSCRT
 {
   namespace XML
diff --git a/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
index 6f810782953..31bad0bc207 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XMLSchema.hpp
@@ -21,9 +21,19 @@ namespace XMLSchema
   typedef XSCRT::FundamentalType<int> int_;
   typedef XSCRT::FundamentalType<unsigned int> unsignedInt;
 
+  //@@ VC6
+#if defined (_MSC_VER) && (_MSC_VER < 1300)
+
+  typedef XSCRT::FundamentalType<__int64> long_;
+  typedef XSCRT::FundamentalType<unsigned __int64> unsignedLong;
+
+#else
+
   typedef XSCRT::FundamentalType<long long> long_;
   typedef XSCRT::FundamentalType<unsigned long long> unsignedLong;
 
+#endif
+
   //@@ It would be nice to use some arbitrary-length integer class.
   //
   typedef long_ decimal;
diff --git a/TAO/CIAO/tools/Config_Handlers/cdp.hpp b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
index f6033db9fca..8c8cb56e04f 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
@@ -1,13 +1,13 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * Changes made to this code will most likely be overwritten
- * when the handlers are recompiled.
- *
- * If you find errors or feel that there are bugfixes to be made,
- * please contact the current XSC maintainer:
- *             Will Otte <wotte@dre.vanderbilt.edu>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* Changes made to this code will most likely be overwritten
+* when the handlers are recompiled.
+*
+* If you find errors or feel that there are bugfixes to be made,
+* please contact the current XSC maintainer:
+*             Will Otte <wotte@dre.vanderbilt.edu>
+*/
 
 
 // Fix for Borland compilers, which seem to have a broken
@@ -25,10 +25,10 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-  }
+namespace Config_Handlers
+{
+class DeploymentPlan;
+}
 }
 
 #include <memory>
@@ -39,665 +39,665 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export DeploymentPlan : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
-
-      // label
-      //
-    public:
-      bool label_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& label () const;
-      void label (::XMLSchema::string< ACE_TCHAR > const& );
-
-    protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
-
-      // UUID
-      //
-    public:
-      bool UUID_p () const;
-      ::XMLSchema::string< ACE_TCHAR > const& UUID () const;
-      void UUID (::XMLSchema::string< ACE_TCHAR > const& );
-
-    protected:
-      ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
-
-      // realizes
-      //
-    public:
-      bool realizes_p () const;
-      ::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
-      void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
-
-    protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
-
-      // implementation
-      //
-    public:
-      typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::iterator implementation_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::const_iterator implementation_const_iterator;
-      implementation_iterator begin_implementation ();
-      implementation_iterator end_implementation ();
-      implementation_const_iterator begin_implementation () const;
-      implementation_const_iterator end_implementation () const;
-      void add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& );
-      size_t count_implementation (void) const;
-
-    protected:
-      ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
-
-      // instance
-      //
-    public:
-      typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::const_iterator instance_const_iterator;
-      instance_iterator begin_instance ();
-      instance_iterator end_instance ();
-      instance_const_iterator begin_instance () const;
-      instance_const_iterator end_instance () const;
-      void add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& );
-      size_t count_instance (void) const;
-
-    protected:
-      ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
-
-      // connection
-      //
-    public:
-      typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::const_iterator connection_const_iterator;
-      connection_iterator begin_connection ();
-      connection_iterator end_connection ();
-      connection_const_iterator begin_connection () const;
-      connection_const_iterator end_connection () const;
-      void add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& );
-      size_t count_connection (void) const;
-
-    protected:
-      ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
-
-      // dependsOn
-      //
-    public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
-      dependsOn_iterator begin_dependsOn ();
-      dependsOn_iterator end_dependsOn ();
-      dependsOn_const_iterator begin_dependsOn () const;
-      dependsOn_const_iterator end_dependsOn () const;
-      void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
-      size_t count_dependsOn (void) const;
-
-    protected:
-      ::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
-
-      // artifact
-      //
-    public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::const_iterator artifact_const_iterator;
-      artifact_iterator begin_artifact ();
-      artifact_iterator end_artifact ();
-      artifact_const_iterator begin_artifact () const;
-      artifact_const_iterator end_artifact () const;
-      void add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& );
-      size_t count_artifact (void) const;
-
-    protected:
-      ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
-
-      // infoProperty
-      //
-    public:
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
-      infoProperty_iterator begin_infoProperty ();
-      infoProperty_iterator end_infoProperty ();
-      infoProperty_const_iterator begin_infoProperty () const;
-      infoProperty_const_iterator end_infoProperty () const;
-      void add_infoProperty (::CIAO::Config_Handlers::Property const& );
-      size_t count_infoProperty (void) const;
-
-    protected:
-      ::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
-
-    public:
-      DeploymentPlan ();
-
-      DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      DeploymentPlan (DeploymentPlan const& s);
-
-      DeploymentPlan&
-      operator= (DeploymentPlan const& s);
-
-    private:
-      char regulator__;
-    };
-  }
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export DeploymentPlan : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
+
+// label
+//
+public:
+bool label_p () const;
+::XMLSchema::string< ACE_TCHAR > const& label () const;
+void label (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > label_;
+
+// UUID
+//
+public:
+bool UUID_p () const;
+::XMLSchema::string< ACE_TCHAR > const& UUID () const;
+void UUID (::XMLSchema::string< ACE_TCHAR > const& );
+
+protected:
+::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > UUID_;
+
+// realizes
+//
+public:
+bool realizes_p () const;
+::CIAO::Config_Handlers::ComponentInterfaceDescription const& realizes () const;
+void realizes (::CIAO::Config_Handlers::ComponentInterfaceDescription const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::ComponentInterfaceDescription > realizes_;
+
+// implementation
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::iterator implementation_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription >::const_iterator implementation_const_iterator;
+implementation_iterator begin_implementation ();
+implementation_iterator end_implementation ();
+implementation_const_iterator begin_implementation () const;
+implementation_const_iterator end_implementation () const;
+void add_implementation (::CIAO::Config_Handlers::MonolithicDeploymentDescription const& );
+size_t count_implementation (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::MonolithicDeploymentDescription > implementation_;
+
+// instance
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::iterator instance_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription >::const_iterator instance_const_iterator;
+instance_iterator begin_instance ();
+instance_iterator end_instance ();
+instance_const_iterator begin_instance () const;
+instance_const_iterator end_instance () const;
+void add_instance (::CIAO::Config_Handlers::InstanceDeploymentDescription const& );
+size_t count_instance (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::InstanceDeploymentDescription > instance_;
+
+// connection
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::iterator connection_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription >::const_iterator connection_const_iterator;
+connection_iterator begin_connection ();
+connection_iterator end_connection ();
+connection_const_iterator begin_connection () const;
+connection_const_iterator end_connection () const;
+void add_connection (::CIAO::Config_Handlers::PlanConnectionDescription const& );
+size_t count_connection (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::PlanConnectionDescription > connection_;
+
+// dependsOn
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::iterator dependsOn_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ImplementationDependency >::const_iterator dependsOn_const_iterator;
+dependsOn_iterator begin_dependsOn ();
+dependsOn_iterator end_dependsOn ();
+dependsOn_const_iterator begin_dependsOn () const;
+dependsOn_const_iterator end_dependsOn () const;
+void add_dependsOn (::CIAO::Config_Handlers::ImplementationDependency const& );
+size_t count_dependsOn (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ImplementationDependency > dependsOn_;
+
+// artifact
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::iterator artifact_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription >::const_iterator artifact_const_iterator;
+artifact_iterator begin_artifact ();
+artifact_iterator end_artifact ();
+artifact_const_iterator begin_artifact () const;
+artifact_const_iterator end_artifact () const;
+void add_artifact (::CIAO::Config_Handlers::ArtifactDeploymentDescription const& );
+size_t count_artifact (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::ArtifactDeploymentDescription > artifact_;
+
+// infoProperty
+//
+public:
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::iterator infoProperty_iterator;
+typedef ::std::list< ::CIAO::Config_Handlers::Property >::const_iterator infoProperty_const_iterator;
+infoProperty_iterator begin_infoProperty ();
+infoProperty_iterator end_infoProperty ();
+infoProperty_const_iterator begin_infoProperty () const;
+infoProperty_const_iterator end_infoProperty () const;
+void add_infoProperty (::CIAO::Config_Handlers::Property const& );
+size_t count_infoProperty (void) const;
+
+protected:
+::std::list< ::CIAO::Config_Handlers::Property > infoProperty_;
+
+public:
+DeploymentPlan ();
+
+DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR > const&);
+DeploymentPlan (DeploymentPlan const& s);
+
+DeploymentPlan&
+operator= (DeploymentPlan const& s);
+
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
-      {
-	virtual void
-	traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export DeploymentPlan : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::DeploymentPlan >
+{
+virtual void
+traverse (Type&);
 
-	virtual void
-	traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-	virtual void
-	pre (Type&);
+virtual void
+pre (Type&);
 
-	virtual void
-	pre (Type const&);
+virtual void
+pre (Type const&);
 
-	virtual void
-	label (Type&);
+virtual void
+label (Type&);
 
-	virtual void
-	label (Type const&);
+virtual void
+label (Type const&);
 
-	virtual void
-	label_none (Type&);
+virtual void
+label_none (Type&);
 
-	virtual void
-	label_none (Type const&);
+virtual void
+label_none (Type const&);
 
-	virtual void
-	UUID (Type&);
+virtual void
+UUID (Type&);
 
-	virtual void
-	UUID (Type const&);
+virtual void
+UUID (Type const&);
 
-	virtual void
-	UUID_none (Type&);
+virtual void
+UUID_none (Type&);
 
-	virtual void
-	UUID_none (Type const&);
+virtual void
+UUID_none (Type const&);
 
-	virtual void
-	realizes (Type&);
+virtual void
+realizes (Type&);
 
-	virtual void
-	realizes (Type const&);
+virtual void
+realizes (Type const&);
 
-	virtual void
-	realizes_none (Type&);
+virtual void
+realizes_none (Type&);
 
-	virtual void
-	realizes_none (Type const&);
+virtual void
+realizes_none (Type const&);
 
-	virtual void
-	implementation (Type&);
+virtual void
+implementation (Type&);
 
-	virtual void
-	implementation (Type const&);
+virtual void
+implementation (Type const&);
 
-	virtual void
-	implementation_pre (Type&);
+virtual void
+implementation_pre (Type&);
 
-	virtual void
-	implementation_pre (Type const&);
+virtual void
+implementation_pre (Type const&);
 
-	virtual void
-	implementation_next (Type&);
+virtual void
+implementation_next (Type&);
 
-	virtual void
-	implementation_next (Type const&);
+virtual void
+implementation_next (Type const&);
 
-	virtual void
-	implementation_post (Type&);
+virtual void
+implementation_post (Type&);
 
-	virtual void
-	implementation_post (Type const&);
+virtual void
+implementation_post (Type const&);
 
-	virtual void
-	instance (Type&);
+virtual void
+instance (Type&);
 
-	virtual void
-	instance (Type const&);
+virtual void
+instance (Type const&);
 
-	virtual void
-	instance_pre (Type&);
+virtual void
+instance_pre (Type&);
 
-	virtual void
-	instance_pre (Type const&);
+virtual void
+instance_pre (Type const&);
 
-	virtual void
-	instance_next (Type&);
+virtual void
+instance_next (Type&);
 
-	virtual void
-	instance_next (Type const&);
+virtual void
+instance_next (Type const&);
 
-	virtual void
-	instance_post (Type&);
+virtual void
+instance_post (Type&);
 
-	virtual void
-	instance_post (Type const&);
+virtual void
+instance_post (Type const&);
 
-	virtual void
-	instance_none (Type&);
+virtual void
+instance_none (Type&);
 
-	virtual void
-	instance_none (Type const&);
+virtual void
+instance_none (Type const&);
 
-	virtual void
-	connection (Type&);
+virtual void
+connection (Type&);
 
-	virtual void
-	connection (Type const&);
+virtual void
+connection (Type const&);
 
-	virtual void
-	connection_pre (Type&);
+virtual void
+connection_pre (Type&);
 
-	virtual void
-	connection_pre (Type const&);
+virtual void
+connection_pre (Type const&);
 
-	virtual void
-	connection_next (Type&);
+virtual void
+connection_next (Type&);
 
-	virtual void
-	connection_next (Type const&);
+virtual void
+connection_next (Type const&);
 
-	virtual void
-	connection_post (Type&);
+virtual void
+connection_post (Type&);
 
-	virtual void
-	connection_post (Type const&);
+virtual void
+connection_post (Type const&);
 
-	virtual void
-	connection_none (Type&);
+virtual void
+connection_none (Type&);
 
-	virtual void
-	connection_none (Type const&);
+virtual void
+connection_none (Type const&);
 
-	virtual void
-	dependsOn (Type&);
+virtual void
+dependsOn (Type&);
 
-	virtual void
-	dependsOn (Type const&);
+virtual void
+dependsOn (Type const&);
 
-	virtual void
-	dependsOn_pre (Type&);
+virtual void
+dependsOn_pre (Type&);
 
-	virtual void
-	dependsOn_pre (Type const&);
+virtual void
+dependsOn_pre (Type const&);
 
-	virtual void
-	dependsOn_next (Type&);
+virtual void
+dependsOn_next (Type&);
 
-	virtual void
-	dependsOn_next (Type const&);
+virtual void
+dependsOn_next (Type const&);
 
-	virtual void
-	dependsOn_post (Type&);
+virtual void
+dependsOn_post (Type&);
 
-	virtual void
-	dependsOn_post (Type const&);
+virtual void
+dependsOn_post (Type const&);
 
-	virtual void
-	dependsOn_none (Type&);
+virtual void
+dependsOn_none (Type&);
 
-	virtual void
-	dependsOn_none (Type const&);
+virtual void
+dependsOn_none (Type const&);
 
-	virtual void
-	artifact (Type&);
+virtual void
+artifact (Type&);
 
-	virtual void
-	artifact (Type const&);
+virtual void
+artifact (Type const&);
 
-	virtual void
-	artifact_pre (Type&);
+virtual void
+artifact_pre (Type&);
 
-	virtual void
-	artifact_pre (Type const&);
+virtual void
+artifact_pre (Type const&);
 
-	virtual void
-	artifact_next (Type&);
+virtual void
+artifact_next (Type&);
 
-	virtual void
-	artifact_next (Type const&);
+virtual void
+artifact_next (Type const&);
 
-	virtual void
-	artifact_post (Type&);
+virtual void
+artifact_post (Type&);
 
-	virtual void
-	artifact_post (Type const&);
+virtual void
+artifact_post (Type const&);
 
-	virtual void
-	artifact_none (Type&);
+virtual void
+artifact_none (Type&);
 
-	virtual void
-	artifact_none (Type const&);
+virtual void
+artifact_none (Type const&);
 
-	virtual void
-	infoProperty (Type&);
+virtual void
+infoProperty (Type&);
 
-	virtual void
-	infoProperty (Type const&);
+virtual void
+infoProperty (Type const&);
 
-	virtual void
-	infoProperty_pre (Type&);
+virtual void
+infoProperty_pre (Type&);
 
-	virtual void
-	infoProperty_pre (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-	virtual void
-	infoProperty_next (Type&);
+virtual void
+infoProperty_next (Type&);
 
-	virtual void
-	infoProperty_next (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-	virtual void
-	infoProperty_post (Type&);
+virtual void
+infoProperty_post (Type&);
 
-	virtual void
-	infoProperty_post (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-	virtual void
-	infoProperty_none (Type&);
+virtual void
+infoProperty_none (Type&);
 
-	virtual void
-	infoProperty_none (Type const&);
+virtual void
+infoProperty_none (Type const&);
 
-	virtual void
-	post (Type&);
+virtual void
+post (Type&);
 
-	virtual void
-	post (Type const&);
-      };
-    }
-  }
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct DeploymentPlan : Traversal::DeploymentPlan,
-			      virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-	typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
-	DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct DeploymentPlan : Traversal::DeploymentPlan,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
+DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-	virtual void
-	traverse (Type &o)
-	{
+virtual void
+traverse (Type &o)
+{
 
-	  this->traverse (const_cast <Type const &> (o));
-	}
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-	virtual void
-	label (Type &o)
-	{
+virtual void
+label (Type &o)
+{
 
-	  this->label (const_cast <Type const &> (o));
-	}
+this->label (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	label (Type const&);
+virtual void
+label (Type const&);
 
-	virtual void
-	UUID (Type &o)
-	{
+virtual void
+UUID (Type &o)
+{
 
-	  this->UUID (const_cast <Type const &> (o));
-	}
+this->UUID (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	UUID (Type const&);
+virtual void
+UUID (Type const&);
 
-	virtual void
-	realizes (Type &o)
-	{
+virtual void
+realizes (Type &o)
+{
 
-	  this->realizes (const_cast <Type const &> (o));
-	}
+this->realizes (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	realizes (Type const&);
+virtual void
+realizes (Type const&);
 
-	virtual void
-	implementation_pre (Type &o)
-	{
+virtual void
+implementation_pre (Type &o)
+{
 
-	  this->implementation_pre (const_cast <Type const &> (o));
-	}
+this->implementation_pre (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	implementation_pre (Type const&);
+virtual void
+implementation_pre (Type const&);
 
-	virtual void
-	implementation_next (Type &o)
-	{
+virtual void
+implementation_next (Type &o)
+{
 
-	  this->implementation_next (const_cast <Type const &> (o));
-	}
+this->implementation_next (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	implementation_next (Type const&);
+virtual void
+implementation_next (Type const&);
 
-	virtual void
-	implementation_post (Type &o)
-	{
+virtual void
+implementation_post (Type &o)
+{
 
-	  this->implementation_post (const_cast <Type const &> (o));
-	}
+this->implementation_post (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	implementation_post (Type const&);
+virtual void
+implementation_post (Type const&);
 
-	virtual void
-	instance_pre (Type &o)
-	{
+virtual void
+instance_pre (Type &o)
+{
 
-	  this->instance_pre (const_cast <Type const &> (o));
-	}
+this->instance_pre (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	instance_pre (Type const&);
+virtual void
+instance_pre (Type const&);
 
-	virtual void
-	instance_next (Type &o)
-	{
+virtual void
+instance_next (Type &o)
+{
 
-	  this->instance_next (const_cast <Type const &> (o));
-	}
+this->instance_next (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	instance_next (Type const&);
+virtual void
+instance_next (Type const&);
 
-	virtual void
-	instance_post (Type &o)
-	{
+virtual void
+instance_post (Type &o)
+{
 
-	  this->instance_post (const_cast <Type const &> (o));
-	}
+this->instance_post (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	instance_post (Type const&);
+virtual void
+instance_post (Type const&);
 
-	virtual void
-	connection_pre (Type &o)
-	{
+virtual void
+connection_pre (Type &o)
+{
 
-	  this->connection_pre (const_cast <Type const &> (o));
-	}
+this->connection_pre (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	connection_pre (Type const&);
+virtual void
+connection_pre (Type const&);
 
-	virtual void
-	connection_next (Type &o)
-	{
+virtual void
+connection_next (Type &o)
+{
 
-	  this->connection_next (const_cast <Type const &> (o));
-	}
+this->connection_next (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	connection_next (Type const&);
+virtual void
+connection_next (Type const&);
 
-	virtual void
-	connection_post (Type &o)
-	{
+virtual void
+connection_post (Type &o)
+{
 
-	  this->connection_post (const_cast <Type const &> (o));
-	}
+this->connection_post (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	connection_post (Type const&);
+virtual void
+connection_post (Type const&);
 
-	virtual void
-	dependsOn_pre (Type &o)
-	{
+virtual void
+dependsOn_pre (Type &o)
+{
 
-	  this->dependsOn_pre (const_cast <Type const &> (o));
-	}
+this->dependsOn_pre (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	dependsOn_pre (Type const&);
+virtual void
+dependsOn_pre (Type const&);
 
-	virtual void
-	dependsOn_next (Type &o)
-	{
+virtual void
+dependsOn_next (Type &o)
+{
 
-	  this->dependsOn_next (const_cast <Type const &> (o));
-	}
+this->dependsOn_next (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	dependsOn_next (Type const&);
+virtual void
+dependsOn_next (Type const&);
 
-	virtual void
-	dependsOn_post (Type &o)
-	{
+virtual void
+dependsOn_post (Type &o)
+{
 
-	  this->dependsOn_post (const_cast <Type const &> (o));
-	}
+this->dependsOn_post (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	dependsOn_post (Type const&);
+virtual void
+dependsOn_post (Type const&);
 
-	virtual void
-	artifact_pre (Type &o)
-	{
+virtual void
+artifact_pre (Type &o)
+{
 
-	  this->artifact_pre (const_cast <Type const &> (o));
-	}
+this->artifact_pre (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	artifact_pre (Type const&);
+virtual void
+artifact_pre (Type const&);
 
-	virtual void
-	artifact_next (Type &o)
-	{
+virtual void
+artifact_next (Type &o)
+{
 
-	  this->artifact_next (const_cast <Type const &> (o));
-	}
+this->artifact_next (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	artifact_next (Type const&);
+virtual void
+artifact_next (Type const&);
 
-	virtual void
-	artifact_post (Type &o)
-	{
+virtual void
+artifact_post (Type &o)
+{
 
-	  this->artifact_post (const_cast <Type const &> (o));
-	}
+this->artifact_post (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	artifact_post (Type const&);
+virtual void
+artifact_post (Type const&);
 
-	virtual void
-	infoProperty_pre (Type &o)
-	{
+virtual void
+infoProperty_pre (Type &o)
+{
 
-	  this->infoProperty_pre (const_cast <Type const &> (o));
-	}
+this->infoProperty_pre (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	infoProperty_pre (Type const&);
+virtual void
+infoProperty_pre (Type const&);
 
-	virtual void
-	infoProperty_next (Type &o)
-	{
+virtual void
+infoProperty_next (Type &o)
+{
 
-	  this->infoProperty_next (const_cast <Type const &> (o));
-	}
+this->infoProperty_next (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	infoProperty_next (Type const&);
+virtual void
+infoProperty_next (Type const&);
 
-	virtual void
-	infoProperty_post (Type &o)
-	{
+virtual void
+infoProperty_post (Type &o)
+{
 
-	  this->infoProperty_post (const_cast <Type const &> (o));
-	}
+this->infoProperty_post (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	infoProperty_post (Type const&);
+virtual void
+infoProperty_post (Type const&);
 
-      protected:
-	DeploymentPlan ();
-      };
-    }
-  }
+protected:
+DeploymentPlan ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // CDP_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/test.cpp b/TAO/CIAO/tools/Config_Handlers/test.cpp
index 8c968d1c63f..ba951491409 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.hpp b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
index 09964cff90b..d828adf7ece 100644
--- a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
@@ -1,13 +1,13 @@
 /* $Id$
- * This code was generated by the XML Schema Compiler.
- *
- * Changes made to this code will most likely be overwritten
- * when the handlers are recompiled.
- *
- * If you find errors or feel that there are bugfixes to be made,
- * please contact the current XSC maintainer:
- *             Will Otte <wotte@dre.vanderbilt.edu>
- */
+* This code was generated by the XML Schema Compiler.
+*
+* Changes made to this code will most likely be overwritten
+* when the handlers are recompiled.
+*
+* If you find errors or feel that there are bugfixes to be made,
+* please contact the current XSC maintainer:
+*             Will Otte <wotte@dre.vanderbilt.edu>
+*/
 
 
 // Fix for Borland compilers, which seem to have a broken
@@ -24,10 +24,10 @@
 //
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class TopLevelPackageDescription;
-  }
+namespace Config_Handlers
+{
+class TopLevelPackageDescription;
+}
 }
 
 #include <memory>
@@ -38,131 +38,130 @@ namespace CIAO
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type
-    {
-      //@@ VC6 anathema
-      typedef ::XSCRT::Type Base__;
+namespace Config_Handlers
+{
+class XSC_XML_Handlers_Export TopLevelPackageDescription : public ::XSCRT::Type
+{
+//@@ VC6 anathema
+typedef ::XSCRT::Type Base__;
 
-      // package
-      //
-    public:
-      ::CIAO::Config_Handlers::PackageConfiguration const& package () const;
-      void package (::CIAO::Config_Handlers::PackageConfiguration const& );
+// package
+//
+public:
+::CIAO::Config_Handlers::PackageConfiguration const& package () const;
+void package (::CIAO::Config_Handlers::PackageConfiguration const& );
+
+protected:
+::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > package_;
 
-    protected:
-      ::std::auto_ptr< ::CIAO::Config_Handlers::PackageConfiguration > package_;
+public:
+TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__);
 
-    public:
-      TopLevelPackageDescription (::CIAO::Config_Handlers::PackageConfiguration const& package__);
+TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
+TopLevelPackageDescription (TopLevelPackageDescription const& s);
 
-      TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-      TopLevelPackageDescription (TopLevelPackageDescription const& s);
-      
-      ~TopLevelPackageDescription () {};
-      TopLevelPackageDescription&
-      operator= (TopLevelPackageDescription const& s);
+TopLevelPackageDescription&
+operator= (TopLevelPackageDescription const& s);
 
-    private:
-      char regulator__;
-    };
-  }
+private:
+char regulator__;
+};
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #include "XMLSchema/Traversal.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Traversal
-    {
-      struct XSC_XML_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
-      {
-	virtual void
-	traverse (Type&);
+namespace Config_Handlers
+{
+namespace Traversal
+{
+struct XSC_XML_Handlers_Export TopLevelPackageDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::TopLevelPackageDescription >
+{
+virtual void
+traverse (Type&);
 
-	virtual void
-	traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-	virtual void
-	pre (Type&);
+virtual void
+pre (Type&);
 
-	virtual void
-	pre (Type const&);
+virtual void
+pre (Type const&);
 
-	virtual void
-	package (Type&);
+virtual void
+package (Type&);
 
-	virtual void
-	package (Type const&);
+virtual void
+package (Type const&);
 
-	virtual void
-	post (Type&);
+virtual void
+post (Type&);
 
-	virtual void
-	post (Type const&);
-      };
-    }
-  }
+virtual void
+post (Type const&);
+};
+}
+}
 }
 
 #include "XMLSchema/Writer.hpp"
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-    namespace Writer
-    {
-      struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription,
-					  virtual ::XSCRT::Writer< ACE_TCHAR >
-      {
-	typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
-	TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
+namespace Config_Handlers
+{
+namespace Writer
+{
+struct TopLevelPackageDescription : Traversal::TopLevelPackageDescription,
+virtual ::XSCRT::Writer< ACE_TCHAR >
+{
+typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
+TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-	virtual void
-	traverse (Type &o)
-	{
+virtual void
+traverse (Type &o)
+{
 
-	  this->traverse (const_cast <Type const &> (o));
-	}
+this->traverse (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	traverse (Type const&);
+virtual void
+traverse (Type const&);
 
-	virtual void
-	package (Type &o)
-	{
+virtual void
+package (Type &o)
+{
 
-	  this->package (const_cast <Type const &> (o));
-	}
+this->package (const_cast <Type const &> (o));
+}
 
 
-	virtual void
-	package (Type const&);
+virtual void
+package (Type const&);
 
-      protected:
-	TopLevelPackageDescription ();
-      };
-    }
-  }
+protected:
+TopLevelPackageDescription ();
+};
+}
+}
 }
 
 namespace CIAO
 {
-  namespace Config_Handlers
-  {
-  }
+namespace Config_Handlers
+{
+}
 }
 
 #endif // TOPLEVEL_HPP
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bfcb0a4c4b5..7839a311a36 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,24 +1,3371 @@
-Wed Apr 26 19:44:36 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+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.
 
-        * tao/EndpointPolicy.mpc:
+Tue Mar  7 16:21:32 UTC 2006  Adam Mitz  <mitza@ociweb.com>
 
-          Added Pkgconfig_Files definition.
+        * 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.
 
-        * tao/EndpointPolicy/TAO_EndpointPolicy.pc.in:
+Tue Mar 07 11:11:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          New file, pkg-config *.pc template for TAO_EndpointPolicy
-          library.
+        * tests/Bug_2417_Regression/publisher_impl.cpp:
+          Fixed implicit conversion warnings
 
-Wed Apr 26 19:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Mar  7 10:16:50 UTC 2006  Don Sharp <Donald.Sharp@prismtech.com>
 
-        * tests/OBV/Simple/Client_i.h:
-          Fixed casing of include
+        * 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.
 
-Wed Apr 26 19:13:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+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:
@@ -26,907 +3373,10031 @@ Wed Apr 26 19:13:02 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
         * tao/params.i:
         * tao/params.cpp:
 
-          This change was of OCI by David.Gibbs@igindex.co.uk. He had
-          previously requested the addition of support for SO_KEEPALIVE
-          and as a result we found that the framework existed for
-          communicating a value of SO_DONTROUTE, so it was decided that we
-          go ahead and add the feature. I consider this change provisional
-          in that it isn't strictly required and so if someone strongly
-          objects to its existence it can be pulled. Otherwise it is
-          simply completing what someone else had started a while ago by
-          adding configuration values for socket options to IIOP protocol
-          properties definition.
+          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.
 
-Wed Apr 26 18:47:23 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+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>
 
-          Add an alternate connection timeout hook. This is necessary for
-          users of the Optimized Connect Endpoint Selector with its
-          timeout while also using CORBA messaging and the Connection
-          Timeout policy. Both of these connection timeouts are
-          dynamically loaded and one would override the other. This change
-          allows both to be loaded, and if both are initialized to nonzero
-          values, the lesser of the two timeouts is used. This results
-          from a bug originally reported to OCI by friedhelm.wolf@homag.de.
+        * 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:
 
-          Cleaned up the initializer to be more consistent with others.
+          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.
 
-        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
+        * tests/AlternateIIOP/svc.conf:
 
-          Fixed wihtespace in debug output.
+          The alternate IIOP test now uses the Optimized Connection
+          Endpoint Selector to speed up the selection of the correct endpoint.
 
-Wed Apr 26 16:42:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+Tue Dec 27 09:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * docs/Options.html:
+        * tao/FlResource_Loader.h:
+        * tao/TkResource_Loader.h:
+          Added missing versioning include. Thanks to
+          Ken Sedgwick <ken at bonsai dot com>
 
-          Adding text for the new commandline options used to control the
-          parallel connect feature.
+Tue Dec 27 09:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/Blocked_Connect_Strategy.h:
+        * 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/Client_Strategy_Factory.h:
+        * 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/Connect_Strategy.h:
+        * 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/Endpoint.h:
+        * 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/IIOP_Connection_Handler.h:
+        * 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_Connector.h:
+        * tao/IIOP_Connection_Handler.h:
         * tao/IIOP_Connector.cpp:
-        * tao/IIOP_Endpoint.h:
+        * tao/IIOP_Connector.h:
         * tao/IIOP_Endpoint.cpp:
-        * tao/IIOP_Profile.h:
+        * 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/Invocation_Endpoint_Selectors.h:
+        * 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.h:
         * tao/LF_Connect_Strategy.cpp:
+        * tao/LF_Connect_Strategy.h:
+        * tao/LF_Event.cpp:
         * tao/LF_Event.h:
-        * tao/LF_Multi_Event.h:
-        * tao/LF_Multi_Event.cpp:
+        * 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/MProfile.cpp:
+        * 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/Profile.h:
+        * 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_Transport_Resolver.h:
+        * tao/Profile.h:
+        * tao/Profile.i:
         * tao/Profile_Transport_Resolver.cpp:
-        * tao/Reactive_Connect_Strategy.h:
+        * 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_Connector.h:
+        * 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_Descriptor_Interface.cpp:
-        * tao/default_client.h:
+        * 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/params.cpp:
-        * tao/tao.mpc:
+        * tao/varbase.h:
 
-          These changes support a new technique for active connection
-          establishment when presented with a profile containing multiple
-          possible endpoints. This commit resolves bugzilla bug #2485.
-
-          The technique in question is "parallel connects" meaning
-          attempting to connect to many endpoints simultaniously. It was
-          conceived as a way to deal with timeouts when the Invocation
-          Endpoint Selector would first try to connect to one or more
-          unreachable endpoints. If those endpoints were defined as IP
-          addresses (not hostnames) or as resolvable hostnames that
-          pointed to unreachable IP addresses, the connection
-          establishment would take potentially several minutes to time out
-          and eventually encounter a reachable endpoint. In the case of
-          shared profiles (those using TAG_ALTERNATE_IIOP_ENDPOINT) this
-          delay impacts every single invocation.
-
-          This parallel connect feature (also referred to somewhat
-          inacurately as a strategy) avoids this by supplying all the
-          endpoints in a profile to the connector and letting it first
-          test to see if any are already cached and available, and if not,
-          to open connections to each and wait for a winner. When the
-          first connection completes, any pending connections are
-          terminated.
-
-          In order to minimize the use of pending connections, an iterator
-          traverses the list of endpoints creating new connections and
-          also checking any existing connections for completion. If the
-          first endpoint happens to be reachable and the server responds
-          quickly enough, the client may not open any more connections.
-
-          If the server does not respond immediately, a wait strategy is
-          entered. This wait strategy may be Reactive or Leader/Follower
-          based. In either case, a specal "multi event" type is used to
-          allow a single thread to wait on one of many connectors, and
-          then to clean up those that didn't finish in time. The parallel
-          connect feature is also available using blocking connects, but
-          the only advantage there is in checking the cache for all
-          endpoints in the profile, there is no performance gain during
-          actual connection establishment.
-
-          The parallel connect strategy differs from another endpoint
-          selection optimization, available in
-          tao/Strategies/Optimized_Connection_Endpoint_Selector.*. That
-          strategy works by examining all profiles simultaniously, this
-          feature still treats separate profiles separately. This profile
-          separation is necessary to support Load Balancing and Fault
-          Tolerence. Also, this feature requires additional support to be
-          built into protocol specific connectors (IIOP is currently the
-          only protocol supporting parallel connects) whereas the other
-          feature works regardless of the protocol.
-
-          As this is a new feature, it is disabled by default. Use the
-          -ORBUseParallelConnects option to enable its use. A second
-          option, -ORBParallelConnectDelay, is used to introduce a small
-          delay between the opening of new potential connections if the
-          server is particularly busy. This is useful to minimize the
-          impact on a busy server if more than one of the available
-          endpoints is reachable. Also, because this feature only focuses
-          on one profile at a time, the server must be run with
-          -ORBUseSharedProfiles enabled (it is disabled by default).
-
-        * tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc:
-        * tests/Parallel_Connect_Strategy/README:
-        * tests/Parallel_Connect_Strategy/Test.idl:
-        * tests/Parallel_Connect_Strategy/Test_i.h:
-        * tests/Parallel_Connect_Strategy/Test_i.cpp:
-        * tests/Parallel_Connect_Strategy/blocked.conf:
-        * tests/Parallel_Connect_Strategy/client.cpp:
-        * tests/Parallel_Connect_Strategy/reactive.conf:
-        * tests/Parallel_Connect_Strategy/run_test.pl:
-        * tests/Parallel_Connect_Strategy/server.cpp:
-
-          This is a new test for the parallel connect feature. It works by
-          having the server open two endpoints, one aliased to something
-          unreachable. The client then uses different wait strategies to
-          make invocations on the server and records the time for
-          each. These tests also include counter-examples in which
-          parallel connects are not used, and these take several minutes
-          to run. On my Linux machine the timeout period is about 3
-          minutes which causes the overall test to take about 9 minutes to
-          run.
-
-Wed Apr 26 16:30:56 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/PortableServer/POAManagerFactory.cpp:
-
-          Correct a bug found by the Borland compiler.
-
-Wed Apr 26 13:47:28 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/EndpointPolicy.mpc:
-        * tao/EndpointPolicy/EndpointPolicy.h:
-        * tao/EndpointPolicy/EndpointPolicy.pidl:
-        * tao/EndpointPolicy/EndpointPolicy.cpp:
-        * tao/EndpointPolicy/EndpointPolicyA.h:
-        * tao/EndpointPolicy/EndpointPolicyA.cpp:
-        * tao/EndpointPolicy/EndpointPolicyC.h:
-        * tao/EndpointPolicy/EndpointPolicyC.inl:
-        * tao/EndpointPolicy/EndpointPolicyC.cpp:
-        * tao/EndpointPolicy/EndpointPolicyType.pidl:
-        * tao/EndpointPolicy/EndpointPolicyTypeA.h:
-        * tao/EndpointPolicy/EndpointPolicyTypeA.cpp:
-        * tao/EndpointPolicy/EndpointPolicyTypeC.h:
-        * tao/EndpointPolicy/EndpointPolicyTypeC.cpp:
-        * tao/EndpointPolicy/EndpointPolicy_Export.h:
-        * tao/EndpointPolicy/EndpointPolicy_Factory.h:
-        * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
-        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h:
-        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp:
-        * tao/EndpointPolicy/EndpointPolicy_i.h:
-        * tao/EndpointPolicy/EndpointPolicy_i.cpp:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.h:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h:
-        * tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp:
-        * tao/EndpointPolicy/Endpoint_Value_Impl.h:
-        * tao/EndpointPolicy/IIOPEndpointValue.pidl:
-        * tao/EndpointPolicy/IIOPEndpointValueA.h:
-        * tao/EndpointPolicy/IIOPEndpointValueA.cpp:
-        * tao/EndpointPolicy/IIOPEndpointValueC.h:
-        * tao/EndpointPolicy/IIOPEndpointValueC.cpp:
-        * tao/EndpointPolicy/IIOPEndpointValue_i.h:
-        * tao/EndpointPolicy/IIOPEndpointValue_i.cpp:
-
-          The EndpointPolicy is a new, TAO-specific policy that is applied
-          to POAManagers via the POAManagerFactory. This commit resolves
-          Bugzilla bug #2484.
-
-          The Endpoint policy acts as a filter for constraining the final
-          endpoints or profiles listed in an IOR when it is created by a
-          POA associated with the POAManager containing the policy. The
-          EndpointPolicy value is a sequence, allow multiple endpoints to
-          be published.
-
-          The way this works is that the ORB is initialized with all the
-          -ORBEndpoint options it needs to provide access to all the
-          objects it will serve. Then POAManagers are created with
-          Endpoint policies that contain only the endpoints that are to be
-          used for its subset of objects. For instance, the ORB could
-          define one endpoint for insecure, internal-use-only objects, and
-          another for secure internet-facing objects. Using the Endpoint
-          Policy these different objects would only get one or the other
-          endpoint. Mechanically what happens is that first all Acceptors
-          are queried to construct an MProfile, then the resulting
-          profiles/endpoints are compared to entries in the policy, those
-          not matching are eliminated. It is possible that an endpoint
-          policy will exclude all the profiles, which would result in an
-          exception being raised at object reference construction time.
-
-          Endpoints are matched in their final form. This means that if an
-          IIOP Endpoint makes use of the hostname_in_ior attribute, that
-          is the name the policy will use to match.
-
-          Endpoint values are protocol specific. A value for IIOP is
-          provided, but new values must be defined to support other
-          protocols. The Endpoint value is a local object. New protocol
-          specific values do not have to be added to the
-          TAO_EndpointPolicy library, but they must specialize
-          EndpointPolicy::ValueBase and the implementation must derive
-          from TAO_Endpoint_Value_Impl.
+          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/IIOP_Endpoint.h:
-        * tao/IIOP_Endpoint.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.cpp:
-        * tao/Profile.h:
         * 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>
 
-          The profile contains the base endpoint as an attribute. This
-          caused a problem for the endpoint removal scheme mentioned
-          above. If a profile contains two or more endpoints, and the base
-          happens to be the one to be eliminated as a result of the
-          endpoint comparison, the only thing that could be done is to
-          copy the contents of the first alternate into the base, then
-          eliminate the duplicate.
+        * tests/Sequence_Unit_Tests/mock_reference.hpp:
+        * tests/Sequence_Unit_Tests/range_checking.hpp:
+          Small doxygen improvements
 
-        * tao/orbconf.h:
+Mon Oct 31 12:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Added a tag for the new policy.
-
-        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
-        * tests/POA/EndpointPolicy/Hello.h:
-        * tests/POA/EndpointPolicy/Hello.cpp:
-        * tests/POA/EndpointPolicy/README:
-        * tests/POA/EndpointPolicy/Test.idl:
-        * tests/POA/EndpointPolicy/client.cpp:
-        * tests/POA/EndpointPolicy/run_test.pl:
-        * tests/POA/EndpointPolicy/server.cpp:
-        * tests/POA/README:
-
-          A new test case for the endpoint policy. This test currently
-          fails due to an unresolved interaction with the sequence
-          code. The error appears to be related to memory corruption, but
-          the cause has not yet been determined. The error only manifests
-          when the multiple profiles portion of the test is being
-          run. This is where an unmodified IOR would contain two profiles,
-          each with one endpoint. The problem does not occur when a single
-          profile has two endpoints.
-
-Wed Apr 26 14:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/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.
 
-        * tests/Smart_Proxies/client.cpp:
-        * tests/Smart_Proxies/Benchmark/client.cpp:
-        * tests/Smart_Proxies/dtor/client.cpp:
-        * tests/Smart_Proxies/Policy/client.cpp:
-          Removed remarks about the KAI compiler, more compilers do
-          give these warnings and support for the KAI compilers
-          has been removed
+Mon Oct 31 11:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Apr 26 13:29:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+        * tests/Bug_2074_Regression/*:
+          Integrated regression for bug 2074. Thanks to Robert Hancock
+          <hancockr at shaw dot ca> for creating this test
 
-        * orbsvcs/examples/ORT/Server_IORInterceptor.h:
-        * orbsvcs/examples/ORT/Server_IORInterceptor.cpp:
+Sat Oct 29 13:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/client2.cpp:
+          Fixed compile error
 
-        * orbsvcs/orbsvcs/PortableGroup/GOA.h:
-        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h:
-        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp:
+Fri Oct 28 23:55:14 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/AnyTypeCode/PI_ForwardA.h:
+        * TAO_IDL/ast/ast_type.cpp:
 
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
-        * tao/CSD_Framework/CSD_POA.h:
-        * tao/CSD_Framework/CSD_POA.cpp:
+          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/IORInfo.h:
-        * tao/IORInterceptor/IORInfo.cpp:
-        * tao/IORInterceptor/IORInfoC.h:
-        * tao/IORInterceptor/IORInterceptorC.h:
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
         * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+          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/IORInterceptor_Adapter.h:
-        * tao/PI_Forward.pidl:
-        * tao/PI_ForwardC.h:
+        * tao/Makefile.am:
+          Updated
 
-        * tao/RTPortableServer/RT_POA.h:
-        * tao/RTPortableServer/RT_POA.cpp:
-        * tao/RTPortableServer/RT_Servant_Dispatcher.h:
-        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+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
 
-        * tests/ORT/ORT_test_IORInterceptor.h:
-        * tests/ORT/ORT_test_IORInterceptor.cpp:
+        * 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.
 
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp:
+          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!!!
 
-          These are more changes related to the POAManagerFactory. They
-          are coupled with my 13:10:59 utc checkin.
+        * 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 Apr 26 13:10:59 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+Wed Oct 26 13:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/PortableServer/Acceptor_Filter_Factory.h:
-        * tao/PortableServer/Acceptor_Filter_Factory.cpp:
-        * tao/PortableServer/Default_Acceptor_Filter.h:
-        * tao/PortableServer/Default_Servant_Dispatcher.h:
-        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
-        * tao/PortableServer/Object_Adapter.h:
-        * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/POAManager.h:
-        * tao/PortableServer/POAManager.i:
-        * tao/PortableServer/POAManager.pidl:
-        * tao/PortableServer/POAManager.cpp:
-        * tao/PortableServer/POAManagerC.h:
-        * tao/PortableServer/POAManagerFactory.h:
-        * tao/PortableServer/POAManagerFactory.cpp:
-        * tao/PortableServer/POAManagerFactory.pidl:
-        * tao/PortableServer/POAManagerFactoryC.h:
-        * tao/PortableServer/POAManagerFactoryC.cpp:
-        * tao/PortableServer/PortableServer.h:
-        * tao/PortableServer/PortableServer.pidl:
-        * tao/PortableServer/PortableServerC.h:
-        * tao/PortableServer/Regular_POA.h:
-        * tao/PortableServer/Regular_POA.cpp:
-        * tao/PortableServer/Root_POA.h:
-        * tao/PortableServer/Root_POA.cpp:
-        * tao/PortableServer/Servant_Dispatcher.h:
+        * tao/diffs/ServerRequestInterceptor.diff:
+        * tao/PI_Server/diffs/ServerRequestInterceptor.diff:
+          Moved this diff to the PI_Server directory, it belongs there
 
-          These files are new/updated to support the POAManagerFactory,
-          which was added to the CORBA 3.0.2 specification. The PMF is
-          used to allow for the explicit creation of POA Managers which
-          can then be supplied to POAs during POA creation. POA Managers
-          may now also carry policies which will influence all POAs
-          associated with it. This work builds on the effort originally
-          started by Johnny Willemsen back in the pre-1.4.8 era. This
-          commit resolves Bugzilla bug #1785.
+Wed Oct 26 09:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
-        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
-        * tests/POA/POAManagerFactory/run_test.pl:
+        * 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
 
-          This is a new test for the POAManagerFactory.
+Tue Oct 25 22:24:36 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Wed Apr 26 13:01:48 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+        * tao/LocateRequest_Invocation.cpp (invoke):
+        * tao/Synch_Invocation.cpp (remote_oneway, remote_twoway):
 
-        * tao/Valuetype/AbstractBase.cpp:
-        * tao/Valuetype/AbstractBase.h:
-          The _tao_marshal_v method is supposed to be const.
+          Changed OutputCDR_Auto_Reset to ACE_OutputCDR_Auto_Reset to
+          match corresponding changes made to ACE.
+
+Tue Oct 25 21:50:46 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * utils/wxNamingViewer/wxNamingViewer.cpp:
+        * utils/wxNamingViewer/wxNamingViewerFrame.cpp: Added some #include
+          files to get things working again on Linux.  Thanks to Matt
+          Gillen <mgillen@bbn.com> for these fixes.
+
+Tue Oct 25 08:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/CosEvent/Basic/Shutdown.cpp:
+          Fixed warning in MinGW build
+
+Tue Oct 25 07:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Current_Impl.cpp:
+          Implemented POA_Current::get_reference. This is the last item
+          of bugzilla bug 1917, which is now totally fixed
+
+Mon Oct 24 19:08:06 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/util/utl_scope.cpp:
+        * TAO_IDL/util/utl_string.cpp:
+
+          Added immediate exits when name clash errors are encountered,
+          since trying to continue parsing from these points can lead to a
+          crash. Thanks to Ian Zagorskih <ianzag@megasignal.com> for
+          reporting the problem. This fix closes [BUGID:2281].
+
+Mon Oct 24 18:39:31 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_interface_header.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/include/fe_interface_header.h:
+
+          For IDL types that are added to the IDL compiler's
+          AST via an FE_*Header class (interfaces, valuetypes,
+          eventtypes, components, and homes), modified the
+          creation of this class to pass in a scoped name
+          created on the heap instead of on the stack.
+          Memory allocated within this scoped name was being
+          freed in a different scope, and it's dangerous
+          to assume that the stack address would still be
+          valid. Also added a destroy() method to the
+          FE_InterfaceHeader class (base class to all the
+          others) that handles the destruction of the scoped
+          name member and its contents, if it is nonzero.
+          Thanks to Iliyan Jeliazkov <jeliazkov_i@ociweb.com>
+          for reporting the problem.
+
+Mon Oct 24 18:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CodecFactory/CodecFactory_impl.cpp:
+          Added validation whether the requested codesets are supported
 
-Wed Apr 26 13:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * 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.
 
-        * tests/POA/Bug_2511_Regression/*:
-          Added new regression for bug 2511. Thanks to Martin Cornelius
-          <Martin at Cornelius at smiths-heimann dot com> for creating
-          this regression
+Mon Oct 24 17:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Apr 26 12:20:51 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+        * tests/Codec/client.cpp:
+          Added missing return
 
-        * tests/AMI/ami_test.idl:
-        * tests/AMI/ami_test_i.cpp:
+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:
-          Reverting earlier test changes. They were causing problems on
-          some platforms and I don't have a clear enough memory of the
-          original motivation for the change.
+        * 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
 
-Wed Apr 26 11:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Oct 20 12:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
-          Fixed a bug in these tests, in the test code for element 0 of
-          a string sequence was set and after that the length was set to 1.
-          The setting of 0 is possible because the OMG doesn't define
-          exceptions for this so it is allowed, then setting the length to
-          1 does reinitialize element 0 so that we don't get old values.
-          This was not done with the old sequences, then just the old
-          value was returned and things worked then.
+        * docs/compiler.html:
+          Documented AMI behaviour and fixed some incorrect links
 
-Wed Apr 26 11:21:57 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+Thu Oct 20 12:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/Valuetype/ValueBase.cpp:
+        * docs/releasenotes/index.html:
+          Fixed html tag
 
-          Fix for errant removal of throw, this corrects the OBV/Factory
-          test.
+Thu Oct 20 10:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Apr 26 10:41:12 UTC 2006  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
 
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Added missing include of SystemException
+Thu Oct 20 09:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Apr 26 10:03:12 UTC 2006  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
 
-        * tests/OBV/Simple/*:
-          Added very simple OBV test
+Wed Oct 19 14:09:44 2005  Bala Natarajan  <bala_natarajan at symantec dot com>
 
-Wed Apr 26 09:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Messaging/AMH_Response_Handler.cpp:
 
-        * tests/Portable_Interceptors/Bug_2510_Regression:
-          New regression test, thanks to Martin Cornelius
-          <Martin at Cornelius at smiths-heimann dot com> for creating
-          this test. This bug is not fixed yet.
+          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 Apr 26 09:44:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
+Wed Oct 19 11:30:23 MST 2005  Yan Dai  <dai_y@ociweb.com>
 
-        * tao/Bounded_Sequence_CDR_T.h:
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Check in all marshal_sequence methods if we aren't trying to
-          marshal a nill sequence, this can happen when the user doesn't
-          initialize an out argument. In that case we throw a BAD_PARAM
-          exception as described in the C++ spec. This fixes bugzilla bug
-          1676.
+        * tao/CSD_Framework/CSD_Strategy_Base.h:
 
-Wed Apr 26 08:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Removed extra ";" from the POAManager forward declaration.
 
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
-        * tao/ObjRefTemplate/Default_ORTC.h:
-        * tao/Messaging/ExceptionHolderC.h:
-          Include the Valuetype_Adapter_Factory_Impl.h so that the
-          Valuetype library gets linked in a static build, this is
-          already updated earlier in the IDL compiler
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/PortableServer/Root_POA.cpp:
 
-Wed Apr 26 08:17:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
+          Removed the argument name from the csd hook interfaces instead
+          of using ACE_UNUSED_ARG.
 
-        * tests/Bug_1676_Regression/client.cpp:
-          Extended this test to explicitly test for BAD_PARAM exception
-          when the server not initializes an out argument
+        * docs/libraries.html:
 
-Wed Apr 26 07:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added CSD_Framework and CSD_ThreadPool library descriptions.
 
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
-          Removed invalid template export
+        * 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:
 
-Wed Apr 26 03:46:16 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+          Replaced deprecated RefCountServantBase with ServantBase.
 
-        * tao/Valuetype/AbstractBase.cpp:
+Wed Oct 19 10:01:03 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-          Fixed scoreboard detected warning.
+        * tao/Valuetype/Value_VarOut_T.cpp (operator=):
 
-Tue Apr 25 19:24:48 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+          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>.
 
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+Wed Oct 19 12:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Missed a patch from the earlier commit.
+        * tao/Messaging/ExceptionHolder_i.cpp:
+          Added todo that code could be simplified when missing valuetype
+          constructor is generated
+
+Wed Oct 19 10:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be_include/be_global.h:
+          Added define of TAO_HAS_DEPRECATED_EXCEPTION_HOLDER. This way
+          I can the new AMI support to the IDL compiler in the repo
+          and build it on multiple boxes by removing this define by hand.
+          At the moment the new AMI support is fully ready I will remove
+          this define and then it is up to the user to set it.
+
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+          Added support for the new AMI mapping, is enabled when
+          TAO_HAS_DEPRECATED_EXCEPTION_HOLDER is not defined, so by
+          default it is disabled at this moment
 
-Tue Apr 25 19:09:08 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+Wed Oct 19 09:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/examples/ORT/Server_IORInterceptor.h:
-        * orbsvcs/examples/ORT/Server_IORInterceptor.cpp:
+        * tao/Messaging/ExceptionHolder_i.{h,cpp}:
+          Added new Messaging::ExceptionHolder implementation, will be used
+          for the new AMI mapping
 
-        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp:
+        * tao/Makefile.am:
+          Added new files above
 
-        * orbsvcs/orbsvcs/PortableGroup/GOA.h:
-        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
-        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h:
-        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp:
+Wed Oct 19 08:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/AnyTypeCode/PI_ForwardA.h:
+        * 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
 
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
-        * tao/CSD_Framework/CSD_POA.h:
-        * tao/CSD_Framework/CSD_POA.cpp:
+Wed Oct 19 00:35:02 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/IIOP_Endpoint.h:
-        * tao/IIOP_Endpoint.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.cpp:
+        * configure.ac:
 
-        * tao/IORInterceptor/IORInfo.h:
-        * tao/IORInterceptor/IORInfo.cpp:
-        * tao/IORInterceptor/IORInfoC.h:
-        * tao/IORInterceptor/IORInterceptorC.h:
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
-        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+          Add default AM_CONDITIONAL for BUILD_WFMO.
 
-        * tao/IORInterceptor_Adapter.h:
-        * tao/PI_Forward.pidl:
-        * tao/PI_ForwardC.h:
+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/Default_Acceptor_Filter.h:
-        * tao/PortableServer/Default_Servant_Dispatcher.h:
-        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
-        * tao/PortableServer/Object_Adapter.h:
         * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/POAManager.h:
-        * tao/PortableServer/POAManager.i:
+        * tao/PortableServer/Object_Adapter.h:
         * tao/PortableServer/POAManager.cpp:
-        * tao/PortableServer/POAManager.pidl:
-        * tao/PortableServer/POAManagerC.h:
-        * tao/PortableServer/PortableServer.h:
-        * tao/PortableServer/PortableServer.pidl:
-        * tao/PortableServer/PortableServerC.h:
-        * tao/PortableServer/Regular_POA.h:
-        * tao/PortableServer/Regular_POA.cpp:
-        * tao/PortableServer/Root_POA.h:
-        * tao/PortableServer/Root_POA.cpp:
-        * tao/PortableServer/Servant_Dispatcher.h:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
 
-        * tao/Profile.h:
-        * tao/Profile.cpp:
+          Instrumented to call the hooks.
 
-        * tao/RTPortableServer/RT_POA.h:
-        * tao/RTPortableServer/RT_POA.cpp:
-        * tao/RTPortableServer/RT_Servant_Dispatcher.h:
-        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+        * tao/operation_details.h:
+        * tao/Service_Context.h:
+        * tao/Tagged_Profile.h:
+
+          Added friendship with CSD_FW_Server_Request_Wrapper to support
+          the TAO_ServerRequest clone in CSD library.
+
+        * tao/TAO_Server_Request.h:
+
+          - Changed the operation_details_ to be pointer to const
+          TAO_Operation_Details object instead of const pointer to const
+          TAO_Operation_Details object. This change is made to accommodate
+          the change of TAO_ServerRequest clone in the CSD library.
+          - Added friendship with CSD_FW_Server_Request_Wrapper to support
+          the TAO_ServerRequest clone in CSD library.
+
+        * tao/PortableServer/get_arg.h:
+
+          Made the get_in_arg template function check whether the
+          detail argument is nil. If the detail is not nil and the
+          argument list in detail is nil(collocated oneway case) then it
+          will demarshall the input CDR stream and get arguments. This
+          change is made to accommodate the changes in TAO_Operation_Details
+          clone that writes the argument list to the input CDR of the
+          TAO_ServerRequest object.
+
+        * tao/Intrusive_Ref_Count_Base_T.cpp:
+        * tao/Intrusive_Ref_Count_Base_T.h:
+        * tao/Intrusive_Ref_Count_Base_T.inl:
+        * tao/Intrusive_Ref_Count_Handle_T.cpp:
+        * tao/Intrusive_Ref_Count_Handle_T.h:
+        * tao/Intrusive_Ref_Count_Handle_T.inl:
+
+          These are two new classes that provide infrastructure-level support
+          for classes that need an "intrusive" reference counting mechanism.
+
+        * tao/CSD_Framework.mpc:
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp:
+        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h:
+        * tao/CSD_Framework/CSD_Framework.pidl:
+        * tao/CSD_Framework/CSD_Framework_Loader.cpp:
+        * tao/CSD_Framework/CSD_Framework_Loader.h:
+        * tao/CSD_Framework/CSD_FrameworkA.cpp:
+        * tao/CSD_Framework/CSD_FrameworkA.h:
+        * tao/CSD_Framework/CSD_FrameworkC.cpp:
+        * tao/CSD_Framework/CSD_FrameworkC.h:
+        * tao/CSD_Framework/CSD_FrameworkC.inl:
+        * tao/CSD_Framework/CSD_FW_Export.h:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl:
+        * tao/CSD_Framework/CSD_Object_Adapter.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter.h:
+        * tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp:
+        * tao/CSD_Framework/CSD_Object_Adapter_Factory.h:
+        * tao/CSD_Framework/CSD_ORBInitializer.cpp:
+        * tao/CSD_Framework/CSD_ORBInitializer.h:
+        * tao/CSD_Framework/CSD_POA.cpp:
+        * tao/CSD_Framework/CSD_POA.h:
+        * tao/CSD_Framework/CSD_POA.inl:
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Base.h:
+        * tao/CSD_Framework/CSD_Strategy_Base.inl:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.h:
+        * tao/CSD_Framework/CSD_Strategy_Proxy.inl:
+        * tao/CSD_Framework/CSD_Strategy_Repository.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Repository.h:
+        * tao/CSD_Framework/diffs/CSD_Framework.diff:
+
+          All of the files listed above are brand new and are used to build
+          the new CSD Framework library. This framework implements the base
+          classes for the concrete strategy implementation and implements
+          the service objects for CSD strategy static and dynamic loading
+          via the service configuration file.
+
+        * tao/CSD_ThreadPool.mpc:
+        * tao/CSD_ThreadPool/CSD_ThreadPool.cpp:
+        * tao/CSD_ThreadPool/CSD_ThreadPool.h:
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h:
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h:
+        * tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Export.h:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.h:
+        * tao/CSD_ThreadPool/CSD_TP_Queue.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h:
+        * tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Request.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.h:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.h:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl:
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Task.h:
+        * tao/CSD_ThreadPool/CSD_TP_Task.inl:
+
+          All of the files listed above are brand new and are used to build
+          the new CSD ThreadPool library.  Collectively, these classes
+          represent the reference-implementation for the CSD Strategy feature.
+
+        * examples/CSD_Strategy/README:
+        * examples/CSD_Strategy/ThreadPool/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
+        * examples/CSD_Strategy/ThreadPool/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool/README:
+        * examples/CSD_Strategy/ThreadPool/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool2/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
+        * examples/CSD_Strategy/ThreadPool2/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool2/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool2/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool2/FooServantList.cpp:
+        * examples/CSD_Strategy/ThreadPool2/FooServantList.h:
+        * examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool2/README:
+        * examples/CSD_Strategy/ThreadPool2/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool2/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool3/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+        * examples/CSD_Strategy/ThreadPool3/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool3/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool3/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool3/OrbTask.cpp:
+        * examples/CSD_Strategy/ThreadPool3/OrbTask.h:
+        * examples/CSD_Strategy/ThreadPool3/README:
+        * examples/CSD_Strategy/ThreadPool3/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool3/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool4/Callback.idl:
+        * examples/CSD_Strategy/ThreadPool4/Callback_i.cpp:
+        * examples/CSD_Strategy/ThreadPool4/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ClientTask.h:
+        * examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc:
+        * examples/CSD_Strategy/ThreadPool4/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool4/README:
+        * examples/CSD_Strategy/ThreadPool4/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool4/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool5/Callback.idl:
+        * examples/CSD_Strategy/ThreadPool5/Callback_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool5/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientTask.h:
+        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
+        * examples/CSD_Strategy/ThreadPool5/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.cpp:
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.h:
+        * examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool5/OrbTask.cpp:
+        * examples/CSD_Strategy/ThreadPool5/OrbTask.h:
+        * examples/CSD_Strategy/ThreadPool5/README:
+        * examples/CSD_Strategy/ThreadPool5/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool5/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ServerApp.h:
+        * examples/CSD_Strategy/ThreadPool6/client_main.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ClientApp.h:
+        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+        * examples/CSD_Strategy/ThreadPool6/Foo.idl:
+        * examples/CSD_Strategy/ThreadPool6/Foo_i.cpp:
+        * examples/CSD_Strategy/ThreadPool6/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp:
+        * examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h:
+        * examples/CSD_Strategy/ThreadPool6/README:
+        * examples/CSD_Strategy/ThreadPool6/run_test.pl:
+        * examples/CSD_Strategy/ThreadPool6/server_main.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool6/ServerApp.h:
+        * performance-tests/CSD_Strategy/TestApps/client_main.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ClientApp.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ClientApp.h:
+        * performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc:
+        * performance-tests/CSD_Strategy/TestApps/run_test.pl:
+        * performance-tests/CSD_Strategy/TestApps/server_main.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ServerApp.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ServerApp.h:
+        * performance-tests/CSD_Strategy/TestApps/README:
+        * performance-tests/CSD_Strategy/TestInf/AppHelper.cpp:
+        * performance-tests/CSD_Strategy/TestInf/AppHelper.h:
+        * performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp:
+        * performance-tests/CSD_Strategy/TestInf/AppShutdown.h:
+        * performance-tests/CSD_Strategy/TestInf/CancelledException.idl:
+        * performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp:
+        * performance-tests/CSD_Strategy/TestInf/ClientEngine.h:
+        * performance-tests/CSD_Strategy/TestInf/ClientTask.cpp:
+        * performance-tests/CSD_Strategy/TestInf/ClientTask.h:
+        * performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc:
+        * performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h:
+        * performance-tests/CSD_Strategy/TestInf/CustomException.idl:
+        * performance-tests/CSD_Strategy/TestInf/FooException.idl:
+        * performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp:
+        * performance-tests/CSD_Strategy/TestInf/OrbRunner.h:
+        * performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp:
+        * performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h:
+        * performance-tests/CSD_Strategy/TestInf/OrbTask.cpp:
+        * performance-tests/CSD_Strategy/TestInf/OrbTask.h:
+        * performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp:
+        * performance-tests/CSD_Strategy/TestInf/ServantList_T.h:
+        * performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp:
+        * performance-tests/CSD_Strategy/TestInf/TestAppBase.h:
+        * performance-tests/CSD_Strategy/TestInf/TestAppException.idl:
+        * performance-tests/CSD_Strategy/TestInf/TestAppMain.h:
+        * performance-tests/CSD_Strategy/TestInf/README:
+        * performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc:
+        * performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo.idl:
+        * performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp:
+        * performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo_i.cpp:
+        * performance-tests/CSD_Strategy/TestServant/Foo_i.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp:
+        * performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h:
+        * performance-tests/CSD_Strategy/TestServant/README:
+        * tests/CSD_Strategy_Tests/README:
+        * tests/CSD_Strategy_Tests/Broken/client_main.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.h:
+        * tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc:
+        * tests/CSD_Strategy_Tests/Broken/run_test.pl:
+        * tests/CSD_Strategy_Tests/Broken/server_main.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.h:
+        * tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h:
+        * tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/ClientTask.h:
+        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h:
+        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Common/CustomException.idl:
+        * tests/CSD_Strategy_Tests/TP_Common/FooException.idl:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/OrbTask.h:
+        * tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h:
+        * tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h:
+        * tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp:
+        * tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h:
+        * tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl:
+        * tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h:
+        * tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_4/README:
+        * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/README:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/README:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf:
+
+          All of the files above are part of the examples, tests and performance
+          tests added for the CSD feature.
+
+Tue Oct 18 13:23:21 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * docs/ec_options.html: Finally updated documentation to
+          include information about the "new" queue-full options.
+          See entry from "Thu Aug 25 11:00:47 2005  Chris Cleeland" for
+          more info.
+
+Tue Oct 18 10:31:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+
+          Updated TAO multicast service ID enumerator names to match
+          new names in tao/objectid.h.
+
+Tue Oct 18 09:34:53 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp (setup_multicast):
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp (init_new_naming):
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+          (init_multicast_server):
+
+          Updated TAO multicast service ID enumerator names to match
+          new names in tao/objectid.h.
+
+Tue Oct 18 09:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_global.cpp:
+          Removed duplicate space
+
+Tue Oct 18 08:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * orbsvcs/orbsvcs/AV/RTCP_Packet.cpp:
+          Fixed warnings in MinGW build
+
+Tue Oct 18 00:19:41 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/ORB_Core.cpp (init):
+
+          Corrected minor typo in previous commit.
+
+Tue Oct 18 00:08:30 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/SystemException.cpp:
+        * tao/SystemException.inl:
+
+          Moved concrete SystemException constructors out of line again.
+          The intended footprint decreases were unfortunately not seen
+          across all platforms.
+
+        * tao/ORB.h (resolve_service):
+
+          Removed unnecessary return type and emulated exception
+          parameter.
+
+        * tao/ORB.cpp (resolve_service):
+
+          Use snprintf() to simplify integer-to-string conversion and
+          string concatenation.  Thanks to Jiang Wei <jw dot tao at sduept
+          dot com> for providing a patch.
+
+          Optimized to only determine multicast port if multicast default
+          initial reference is enabled.
+
+          Removed unused "return_value" variable.
+
+          (resolve_initial_references):
+
+          Updated calls to resolve_service() to reflect new signature and
+          void return type.
+
+        * tao/ORB_Core.cpp (init):
+
+          Simplified code that sets Name Service default initial
+          reference.
+
+          Updated names of multicast-capable service IDs to match the new
+          names in tao/objectid.h.
+
+        * tao/objectid.h (TAO_MCAST_SERVICEID):
+
+          Addressed global namespace pollution by placing this enumeration
+          within the TAO namespace.  Also prepended each service ID
+          enumerator with "MCAST_" to further reduce potential internal
+          TAO namespace pollution.
+
+        * tao/params.h:
+        * tao/params.i:
+
+          TAO_MCAST_SERVICEID is now TAO::MCAST_SERVICEID, as changed in
+          tao/objectid.h.
+
+Tue Oct 18 06:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicInterface/DII_Invocation.h:
+          Added forward declaration of ParameterList
+
+Mon Oct 17 14:43:18 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated due to tao/Messaging/* refactor.
+
+Mon Oct 17 14:42:09 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/examples/Notify/Lanes/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/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/performance-tests/Filter/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
+
+          Regenerated due to notification_serv being added to notifytest
+          base project.
+
+Mon Oct 17 12:45:57 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * performance-tests/POA/Demux/Makefile.am:
+        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
+        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
+
+          Regenerated.
+
+        * performance-tests/POA/Demux/Demux.mpc:
+        * performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc:
+        * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc:
+
+          Add/tweak *_IDL projects for compiling *.idl files.
+
+Mon Oct 17 12:33:03 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/ec_typed_events_idl.mpb:
+
+          Set idlflags to be used when compiling Cos TypedEvent IDL files.
+          Reset idlflags so they won't be duplicated when compiling plain
+          CosEvent IDL files.
+
+Mon Oct 17 18:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Invocation_Base.h:
+          Removed some not needed forward declarations
+
+Mon Oct 17 09:52:05 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+
+          Enabled building "performance-tests" subdirectory.
+
+        * configure.ac:
+
+          Configure all Makefile.am's in performance-tests subdirectories.
+
+        * performance-tests/Makefile.am:
+        * performance-tests/Anyop/Makefile.am:
+        * performance-tests/Callback/Makefile.am:
+        * performance-tests/Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/Makefile.am:
+        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
+        * performance-tests/Latency/Makefile.am:
+        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Latency/AMI/Makefile.am:
+        * performance-tests/Latency/Collocation/Makefile.am:
+        * performance-tests/Latency/DII/Makefile.am:
+        * performance-tests/Latency/DSI/Makefile.am:
+        * performance-tests/Latency/Deferred/Makefile.am:
+        * performance-tests/Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Memory/Makefile.am:
+        * performance-tests/Memory/IORsize/Makefile.am:
+        * performance-tests/Memory/Single_Threaded/Makefile.am:
+        * performance-tests/POA/Makefile.am:
+        * performance-tests/POA/Create_Reference/Makefile.am:
+        * performance-tests/POA/Demux/Makefile.am:
+        * performance-tests/POA/Implicit_Activation/Makefile.am:
+        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
+        * performance-tests/Pluggable/Makefile.am:
+        * performance-tests/Protocols/Makefile.am:
+        * performance-tests/RTCorba/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am:
+        * performance-tests/RTCorba/Oneways/Makefile.am:
+        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
+        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
+        * performance-tests/Sequence_Latency/Makefile.am:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/AMI/Makefile.am:
+        * performance-tests/Sequence_Latency/DII/Makefile.am:
+        * performance-tests/Sequence_Latency/DSI/Makefile.am:
+        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
+        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Throughput/Makefile.am:
+
+          New files.
+
+        * performance-tests/Callback/Callback.mpc:
+        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
+        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
+        * performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc:
+        * performance-tests/Latency/AMI/AMI.mpc:
+        * performance-tests/Latency/DII/DII.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/Implicit_Activation/Implicit_Activation.mpc:
+        * performance-tests/Pluggable/Pluggable.mpc:
+        * performance-tests/Protocols/Protocols.mpc:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc:
+        * performance-tests/Sequence_Latency/AMI/ami.mpc:
+        * performance-tests/Sequence_Latency/DII/DII.mpc:
+        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
+        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+        * performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc:
+        * performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc:
+        * performance-tests/Throughput/Throughput.mpc:
+
+          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.
+
+Mon Oct 17 09:24:13 2005  Paul Calabrese  <calabrese_p@ociweb.com>
+
+        * docs/ec_options.html:
+
+          Rename the -q option's parameter from servant_name to ec_object_id.
+
+Mon Oct 17 13:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/orbconf.h:
-        * tao/params.cpp:
+        * tao/Messaging/ExceptionHolder*.*:
+        * tao/Messaging/OldExceptionHolder*.*:
+          Added also the new ExceptionHolder. Old and new are guarded with
+          TAO_HAS_DEPRECATED_EXCEPTION_HOLDER. This is enabled at this
+          moment until the new mapping is fully working, at that moment
+          we remove this define from orbconf.h and it is up to the user
+          to enable the old mapping
 
-        * tests/ORT/ORT_test_IORInterceptor.h:
-        * tests/ORT/ORT_test_IORInterceptor.cpp:
+Mon Oct 17 11:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/*:
+          Moved the ExceptionHolder to its own file (OldExceptionHolder)
+          the latest CORBA spec describe an updated ExceptionHolder
+          and this impacts the AMI generated but also user written
+          code. Working on this new spec but we will keep the old
+          mapping supported until x.5.1 has come out. By moving
+          this to its own file we can easier support the new one
 
-        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
-        * tests/POA/EndpointPolicy/Hello.h:
-        * tests/POA/EndpointPolicy/Hello.cpp:
-        * tests/POA/EndpointPolicy/README:
-        * tests/POA/EndpointPolicy/Test.idl:
-        * tests/POA/EndpointPolicy/client.cpp:
-        * tests/POA/EndpointPolicy/run_test.pl:
-        * tests/POA/EndpointPolicy/server.cpp:
+Mon Oct 17 11:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/POA/POAManagerFactory/POAManagerFactory.cpp:
-        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
-        * tests/POA/POAManagerFactory/run_test.pl:
+        * tao/Messaging/*:
+          Regenerated all files with the latest version of the idl
+          compiler.
 
-        * tests/POA/README:
+Mon Oct 17 10:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp:
+        * tao/PI/TAO_PI.pc.in:
+        * tao/PI_Server/TAO_PI_Server.pc.in:
+          Fixed incorrect libs. Thanks to Francesco Salvestrini
+          <f dot salvestrini at nextworks dot it> for reporting this.
+          This fixes bugzilla bug 2267
 
-Tue Apr 25 17:38:34 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+Mon Oct 17 10:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * tao/Messaging/ExceptionHolderC.h:
-        * tao/Messaging/ExceptionHolderC.cpp:
-        * tao/ObjRefTemplate/Default_ORTC.h:
-        * tao/ObjRefTemplate/Default_ORTC.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
-        * tao/Valuetype/AbstractBase.h:
-        * tao/Valuetype/AbstractBase.cpp:
-        * tao/Valuetype/StringValueC.h:
-        * tao/Valuetype/StringValueC.inl:
-        * tao/Valuetype/ValueBase.h:
-        * tao/Valuetype/ValueBase.cpp:
+        * orbsvcs/tests/CosEvent/Basic/Shutdown.cpp:
+          Fixed MinGW build warnings
 
-          These are further valuetype changes that are related to Bugzilla
-          #2162. The problem is that TAO assumes that a valuetype's
-          typecode is always encoded as 0x7FFFFF02 <repID> but that is not
-          compliant with the spec. It is also valid to encode a valuetype
-          typecode as 0x7FFFFF00 which indicates that the actual type of
-          the value matches the formal type for the argument for which the
-          value is a parameter.  TAO already had most of the hooks in
-          place to support this, but was missing a key bit of
-          functionality. This patch adds that functionality, the ability
-          to test that the formal type matches the actual type when
-          marshaling values.
-
-          Valuetypes encoded this way are substantially more efficient, if
-          the type can be implied then there is no need to carry the
-          actual type id.  Unfortunately to do so blindly would break
-          backwards compatibility with all previous versions of TAO.
-          For the time being, the effective code to cause TAO to marshal
-          values using the more efficient typecode is disabled using a new
-          compile-time flag, TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING,
-          which must be defined to give TAO the opportunity to use this
-          new technique. THIS FLAG BREAKS BACKWARDS COMPATIBILITY. It is
-          not a violation of the spec to always encode the valuetype's
-          type ID when marshaling, so TAO can continue being backwards
-          compatible and not be in violation of the spec. The only
-          violation comes when failing to unmarshal a value which is using
-          an implied type ID.
-
-          I would prefer to not have a compiler flag to guard the use of
-          optimized marshaling, but I don't know any other way to do it.
-          At the point where the decision is made, there is no reference
-          to an ORB Core so there is no easy way to set a dynamic option
-          that could be used to selectively control this optimization.
-
-Tue Apr 25 15:14:13 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-          Merging in truncatable valuetype support. This work was done on
-          an OCI controlled patch then brought in via patch. The premise
-          is to support the "truncatable" keyword for valuetypes as
-          defined in sections 3.9.1.3, 5.2.5.3 and 15.3.4.1 of the CORBA
-          3.0.3 specification. Practically, this means supporting the
-          marshaling of typecode lists and chunked values. Chunked values
-          requires the retention of state, namely nesting level, during
-          the marshaling. This was handled by creating a new ChunkInfo
-          type that is created on the stack during the marshaling of a
-          valuetype and is passed through all the intermediate marshal
-          methods. This commit resolves Bugzilla #2483
+Mon Oct 17 07:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+        * rules.tao.GNU:
+          Prevent building with emulated exceptions
 
-          Valueboxes by definition cannot be made truncatable, but they
-          derive from the same valuebase, thus they must support the same
-          signature for creating a list of repository ids. Otherwise these
-          are whitespace only changes.
+Mon Oct 17 07:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+        * orbsvcs/orbsvcs/Notify/Service.h:
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+          Service should be in CosNotification_Serv. Thanks for JT
+          for notificing this
 
-          These are changes for generating code that manages the chunkinfo
-          data as it passes through the value members.
+Sun Oct 16 12:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp:
+        * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
+          Fixed signed/unsigned warning
 
-          Whitespace changes.
+Sat Oct 15 00:42:36 2005  Steve Totten  <totten_s@ociweb.com>
 
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/idl.yy:
+        * orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp:
+        * orbsvcs/examples/CosEC/TypedSimple/Country.idl:
+        * orbsvcs/examples/CosEC/TypedSimple/Country.idl.for_ifr:
+        * orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp:
+        * orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp:
+        * orbsvcs/examples/CosEC/TypedSimple/run_test.pl:
 
-          Removed the warning about support for truncatables.
+          Merge changes from OCI TAO 1.4a to fix build errors for exceptions=0
+          builds, remove the hard-coded repository IDs and the unneeded pragma
+          prefix from this test, add various missing #includes for Windows
+          builds, disable use of IFR persistence, add a new test script for
+          this example, and make some changes to Consumer.cpp to make the
+          script reliable.  Thanks to Paul Calabrese <calabrese_p@ociweb.com>
+          and Chad Elliott <elliott_c@ociweb.com> for originating these
+          changes.
 
-        * tao/AnyTypeCode/skip.cpp:
+Fri Oct 14 09:35:33 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Fixed the type for the valuetag.
+        * orbsvcs/orbsvcs/Makefile.am:
 
-        * tao/Messaging/ExceptionHolderC.h:
-        * tao/Messaging/ExceptionHolderC.cpp:
-        * tao/ObjRefTemplate/Default_ORTC.h:
-        * tao/ObjRefTemplate/Default_ORTC.cpp:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
+          Regenerate.
 
-          These are the changes required by the truncatable support that
-          would ordinarily be generated by the IDL compiler.
+        * orbsvcs/orbsvcs/CosEvent.mpc:
 
-        * tao/Valuetype/AbstractBase.h:
-        * tao/Valuetype/AbstractBase.cpp:
-        * tao/Valuetype/StringValueC.h:
-        * tao/Valuetype/StringValueC.cpp:
-        * tao/Valuetype/ValueBase.h:
-        * tao/Valuetype/ValueBase.inl:
-        * tao/Valuetype/ValueBase.cpp:
-        * tao/Valuetype/Value_CORBA_methods.h:
+          Split out separate project for generating IDL files.
 
-          The changes for StringValue and AbstractBase are the same as the
-          generated code. The changes in ValueBase are those common to all
-          value types, used to determine how to marshal values if the
-          truncatable keyword was defined or not. This also includes the
-          definintion of the new ChunkInfo type.
+        * orbsvcs/orbsvcs/ec_typed_event.mpb:
 
-        * tests/AMI/ami_test.idl:
-        * tests/AMI/ami_test_i.cpp:
-        * tests/AMI/simple_client.cpp:
+          Remove IDL Files section from project, they've been moved
+          to ec_typed_event_idl.mpb.
 
-          Changes test misc. fixes for support of wchar data in exceptions.
+        * orbsvcs/orbsvcs/ec_typed_event_idl.mpb:
 
-        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
-        * tests/OBV/Truncatable/README:
-        * tests/OBV/Truncatable/Truncatable.idl:
-        * tests/OBV/Truncatable/TruncatableS_impl.h:
-        * tests/OBV/Truncatable/TruncatableS_impl.cpp:
-        * tests/OBV/Truncatable/client.cpp:
-        * tests/OBV/Truncatable/run_test.pl:
-        * tests/OBV/Truncatable/server.cpp:
+          New base project containing Typed Event IDL files.
 
-          A new test specific to validating the truncatable valuetypes.
-          Note this test is also added to the ace/bin/tao_orb_tests.lst.
+Fri Oct 14 11:25:17 2005  Paul Calabrese  <calabrese_p@ociweb.com>
 
-        * tests/Param_Test/svc.conf:
+          Merge some changes from OCI TAO 1.4a that are mostly
+          documentation.
 
-          Remove the explicit override of the wchar codeset for the
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/driver/drv_args.cpp:
 
-Tue Apr 25 14:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Move the documentation for the -g option from the front end
+          to the back end.  This causes it to not be in the help message
+          of other IDL processors (like tao_ifr) as it is specific to
+          tao_idl.
+          Add an error check to the processing of -t (avoids a core if
+          no argument is passed).
 
-        Reverted this change below, this change broke this test
+        * docs/interfacerepo/tao_ifr.html:
 
-        Fri Apr 21 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-        * orbsvcs/tests/Trading/TTest.idl:
-          Use the CORBA predefined sequence types
+          Document some missing options.
 
-Tue Apr 25 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/Event_Service/Event_Service.h:
+        * orbsvcs/Event_Service/Event_Service.cpp:
 
-        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
-          Added missing unbouded array unit test
+          Rename the servant_name variable and documentation to object_id.
 
-Tue Apr 25 11:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp:
 
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Offer_Database.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Trader.h
-        * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.{h,cpp}:
-          Fixed duplicate symbols when linking with vc7/vc8. The trading
-          service used the TAO_String_Hash_Key class to store strings
-          in hash maps, this class is derived from CORBA::String_var which
-          has been refactored to a template. This causes problems with
-          vc7/vc8 because the base template is exported from multiple
-          libraries. This has been resolved by usign CORBA::String_var
-          in the hash map and deliver an ACE_Hash, ACE_Equal_To and
-          ACE_Less_Then template specialization. This solves now the
-          link problems, the runtime issue that appeared after the
-          sequence merge has not been fixed yet. Also see bugzilla bug
-          2520 for more info.
-
-Tue Apr 25 08:46:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Fix the scope settings for kokyu scheduling.
 
-        * tao/ORB.cpp:
-          Removed runtime check of the sizes of the basic data types. We
-          now always use bool for CORBA::Boolean independent of the size
-          of bool, see also bugzilla 2515
+Fri Oct 14 14:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Apr 25 06:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/DynamicInterface/ExceptionList.cpp:
+          Use prefix increment/decrement and store the value after decrement
+          in a temporarily variable and use that check whether to delete
+          ourself to prevent a possible double deletion.
 
-        * tao/Object.{h,cpp}:
-          Made the signature of the static marshal method the same in the
-          definition and the implementation.
+Fri Oct 14 14:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Apr 24 19:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/tests/Notify/Basic/run_test.pl:
+          When the exe can't be spawned break directly instead of waiting
+          for a minute
 
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
-          Explicitly export the base template to fix duplicate symbol
-          errors with vc71/vc8
+Fri Oct 14 08:55:07 2005  Ciju John  <john_c@ociweb.com>
 
-Mon Apr 24 14:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Acceptor.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp:
 
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp:
-          Improved debug messages so that we can see if a string is empty
-          or not.
+        Added new IIOP specific option 'reuse_addr' which would be
+        provided to the -ORBEndpoint option to control socket level
+        option SO_REUSEADDR being set/unset.
 
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h:
-          Doxygen cleanup
+Fri Oct 14 12:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-          Improved debugging output to resolve bug that seems to be introduced
-          by the sequence changes, the flowspec sequence has length of 1 but
-          just an empty string as value
+        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+          64bit fixes
 
-Mon Apr 24 13:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Oct 14 09:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/params.cpp:
-          Small const improvement
+        From James Megquier <jmegq at radiance dot com>
 
-        * tao/ORB.{h,cpp}:
-          Updated CORBA::ORB::RequestSeq to CORBA::RequestSeq as the spec
-          describes. Fixes bugzilla bug 2512.
+        * orbsvcs/orbsvcs/Notify/Service.h:
+          This should be in the notification project, removed include of
+          PortableServer, just add some forward declarations, this is
+          an interface class, no need to pull in portableserver library
 
-Mon Apr 24 12:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+          Moved service to Notification project
 
-        * tao/ORB.cpp:
-          Added include of ObjectIdListC.h to resolve compile errors related
-          to this type with Sun Studio 10
+        * orbsvcs/orbsvcs/Notify/Property.h:
+          Added typedef for ULong property
 
-Mon Apr 24 11:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Oct 13 13:12:12 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        Reverted change below, set method is IDL generated.
+        * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc:
 
-        Mon Apr 24 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-        * orbsvcs/orbsvcs/Runtime_Scheduler.{h,cpp}:
-          Made the arguments of the set method a const reference, this fixes
-          the internal backend errors in the BCB2006 release builds.
+          Add synthetic dependencies for the gnuace build so that IDL-
+          generated files used by more than one project won't be compiled
+          multiple times simultaneously (with parallel builds), which may
+          result in corrupted object files.  Thanks to Simon Massey for
+          pointing out this problem in a scoreboard build.
 
-Mon Apr 24 11:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Oct 13 12:26:47 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
         * tao/ORB_Core.cpp:
-          When we can't get a valuetype adapter throw an internal corba
-          exception
 
-        * TAO_IDL/be/be_codegen.cpp:
-          Updated include generated for the valuetype library, makes sure
-          that the valuetype library gets linked into the executable when
-          building static.
+          Minor coding convention updates.  Class members outside of a
+          base member initializer list should be referenced with the
+          "this" pointer (e.g. this->client_request_interceptor_adapter_).
 
-Mon Apr 24 10:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Pseudo_VarOut_T.h:
 
-        * tests/Bug_1676_Regression/*:
-          Added regression for bug 1676 written by Kees van Marle. This bug
-          seems not to be fixed yet.
+          Added unimplemented copy constructor and assignment operator
+          that accept a TAO_Base_var parameter.  Prevents invalid
+          widening.
 
-Mon Apr 24 09:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Pseudo_VarOut_T.inl:
 
-        * orbsvcs/orbsvcs/Runtime_Scheduler.{h,cpp}:
-          Made the arguments of the set method a const reference, this fixes
-          the internal backend errors in the BCB2006 release builds.
+          Explicitly initialize TAO_Base_var in the copy constructor
+          base member initializer list.
 
-Mon Apr 24 06:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/SystemException.cpp:
+        * tao/SystemException.inl:
 
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl:
-          Removed some left over ACE_NESTED_CLASS usage
+          Inlined concrete system exception constructors and static
+          _tao_any_destructor() method.  Since they are small, a good
+          footprint decrease is achieved by doing so, especially since
+          only a few of the concrete SystemExceptions are used within
+          TAO.
 
-Sun Apr 23 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/UserException.cpp:
+        * tao/UserException.inl:
 
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
-          Removed some left over ACE_NESTED_CLASS usage
+          Likewise.
 
-Fri Apr 21 20:43:24 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Moved _tao_type() method of out of line.  Since it is virtual
+          inlining can cause RTTI related problems when using g++ 4.x's
+          "-fvisibility-inlines-hidden" feature.
 
-        * examples/Makefile.am:
-        * performance-tests/Makefile.am:
+        * tao/TSS_Resources.cpp:
 
-          Remove handful of subdirectories that have not yet been updated
-          to work with autoconf builds.
+          Do not use "this" pointer in base member initializer list.  It
+          is not guaranteed to be available until after base member
+          initialization is completed.
 
-Fri Apr 21 19:32:27 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/TSS_Resources.h:
 
-        * configure.ac:
+          Minor include directive reorganization.
 
-          Added orbsvcs/tests/Bug_2377_Regression/Makefile to
-          AC_CONFIG_FILES.
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
 
-        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
+          Cosmetic update.
 
-          New file.
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/PI/ClientRequestInterceptor_Factory_Impl.cpp:
 
-Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+          Corrected ACE_RCSID macro arguments.
+
+Thu Oct 13 12:03:05 2005  Steve Totten  <totten_s@ociweb.com>:
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
+
+          Applied several changes from OCI's TAO 1.4a release to fix problems
+          in the Typed Event Channel implementation.  The primary fixes are to
+          properly handle consumer/supplier disconnects when using typed event
+          channels, and to properly deal with unresponsive push consumers when
+          the reactive consumer control is used.  Also fixed some memory
+          leaks.  Most of these changes originated from Jonathon Astle
+          <jon@astle45.fsnet.co.uk> and Paul Calabrese
+          <calabrese_p@ociweb.com>.
+
+Thu Oct 13 10:06:22 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tests/Any/Recursive/client.cpp:
+
+          Added recursive union test case.
+
+Thu Oct 13 11:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        From James Megquier <jmegq at radiance dot com>
+        * orbsvcs/orbsvcs/Notify/Service.{h,cpp}:
+          Added destructor to fix runtime gcc4 problems. Fixes bugzilla
+          2262
+
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+        * orbsvcs/orbsvcs/Makefile.am:
+          Added new cpp file
+
+Wed Oct 12 19:26:48 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * docs/notification/reliability.html:
+
+          Fix library name in service config file examples.
+
+          Fix formatting of NotifyExt.inl excerpts.
+
+Wed Oct 12 12:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_Request_Muxing/server.cpp:
+          Run the orb 3 seconds instead of 1 and print out how many
+          messages we expect so that it is easy to see how many
+          messages we didn't receive.
+
+Wed Oct 12 10:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.{h,cpp,i}:
+        * tao/Transport_Queueing_Strategies.{h,cpp}:
+          Added new flush strategy. For asynchronous calls we now have
+          the following behaviour:
+          - Normal oneways are not explicitly buffered, but when send
+            returns EWOULDBLOCK we buffer the message and schedule for
+            output, we just send the data later and don't explicitly
+            flush things, we return control directly to the app
+          - Oneways with SYNC_WITH_TRANSPORT, SYNC_WITH_SERVER and
+            SYNC_WITH_TARGET, we don't explicitly buffer but when
+            send returns EWOULDBLOCK we buffer things, but we do
+            then explicitly flush things
+          - When SYNC_NONE is specified, this is the same as
+            TAO::SYNC_EAGER_BUFFERING and we do buffer then things
+            explicitly
+
+        * tests/Reliable_Oneways/client.cpp:
+          After doing all calls run the orb for 3 seconds, this way at
+          least all queues are flushed
+
+
+Wed Oct 12 09:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/UIOP_Transport.cpp:
+        * tao/Strategies/SCIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+          Remove not needed include of tao/Sync_Strategies.h
+
+Wed Oct 12 09:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Sync_Strategies.{h,cpp}:
+        * tao/Transport_Queueing_Strategies.{h,cpp}:
+          Renamed Sync_Strategies to Transport_Queueing_Strategies, this is
+          what it are, and there was already a todo that a rename should be
+          done. Also use bool instead of int where usable and there is no
+          need to export these classes.
+
+        * tao/Makefile.am:
+        * tao/tao.mpc:
+        * tao/ORB_Core.{h,cpp,i}:
+        * tao/Stub.{h,cpp}:
+        * tao/Transport.{h,cpp}:
+          Updated for change above, also updated these files to talk about
+          Transport Queueing Strategies
+
+Wed Oct 12 08:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rules.tao.GNU:
+          Just for some hours disabled no exception check, the performance
+          stats use no exceptions, if the stats are back to normal I will
+          enable this check again
+
+Wed Oct 12 08:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/performance-tests/RTEvent/lib/Servant_var.h:
+        * orbsvcs/examples/Notify/Federation/Gate/Gate.h:
+          Fixed fuzz check
+
+Wed Oct 12 08:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rules.tao.GNU:
+          Emulated exception macros are not maintained anymore, so it
+          is just not safe to use them, so when exceptions=0, we output
+          an error about this and refer to the NEWS file.
+
+Wed Oct 12 07:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/DIOP_Transport.cpp:
+        * tao/Strategies/SHMIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+          Remove not needed include of tao/Sync_Strategies.h
+
+Wed Oct 12 03:59:27 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp:
+
+          In the generated body of the _default() method for a
+          union, which sets the discriminator to its default
+          value (the _default() method is not generated unless
+          the discriminator can have a valid default value),
+          added a call to _reset(), which will free memory
+          allocated for the existing active member. The former
+          behavior, without the call to _reset(), was producing
+          a memory leak in many cases when _default() is called
+          on an instantiated union. Thanks to Georg Lohrer
+          <news@tropezien.de> for reporting the problem.
+
+        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
+
+          Minor change to generated code formatting.
+
+Tue Oct 11 22:23:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/IIOP_Connection_Handler.cpp:
+          Fixed the performance problem.
+          Simplifications sometimes become over-simplifications:-(
+
+Tue Oct 11 08:33:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/IIOP_Acceptor.cpp:
+          Fix to counter problems with IPv4-compatible IPv6 addresses.
+
+Tue Oct 11 01:24:45 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        From James Megquier <jmegq at radiance dot com>
+        * orbsvcs/orbsvcs/AV/AV_Core.h:
+        * orbsvcs/orbsvcs/Notify/Properties.h:
+        * orbsvcs/orbsvcs/Notify/RT_Properties.h:
+        * orbsvcs/tests/Notify/lib/LookupManager.h:
+
+          Declare exported (i.e. default visibility) singleton templates
+          prior to typedefs that reference  them.  Prevents g++ 4.0 from
+          silently making their visibility hidden.  [Bug 2260]
+
+Tue Oct 11 07:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI_Timeouts/timeout_client.cpp:
+          Added casts to unsigned long to silence compiler warnings
+
+Tue Oct 11 07:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Sync_Strategies.cpp:
+          Changed the default for flush for TAO_Transport_Sync_Strategy to
+          false. This means that when an application does oneway calls or
+          AMI calls, we only buffer at the moment the send block and we
+          schedule the transport for output but don't do a forced flush
+          at that moment. We just control to the app and send out the data
+          later when the socket is free again.
+
+Mon Oct 10 21:15:45 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/driver/drv_args.cpp:
+        * TAO_IDL/driver/drv_preproc.cpp:
+        * TAO_IDL/include/drv_extern.h:
+
+          Added some commonly used include paths to the list that is passed
+          by the IDL compiler to the preprocessor, and to its own
+          internal list of include paths. Some are necessary to find
+          canonical IDL files without requiring command line include
+          paths (the include path to find orb.idl was already added
+          internally in the IDL compiler), while others are paths to
+          files commonly included in applications. The current order
+          of include paths is:
+
+          1. $ACE_ROOT/TAO
+          2. $ACE_ROOT/TAO/tao
+          3. -I command line options
+          4. $ACE_ROOT/TAO/orbsvcs
+          5. $ACE_ROOT/TAO/CIAO
+          6. $ACE_ROOT/TAO/CIAO/ciao
+
+          The last 3 can be overridden by the user, by passing in alternate
+          paths ahead of these 3 on the command line, but this practice
+          is almost sure to cause link problems.
+
+Mon Oct 10 19:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Codeset/UTF16_BOM_Factory.cpp:
+        * tao/Codeset/UTF16_BOM_Translator.cpp:
+          Changed layout of some debug statements to have the same
+          formatting as the others in TAO
+
+Mon Oct 10 07:13:58 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+
+          Partially revert:
+          Sun Oct  9 14:14:01 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+          Add $(TAO_ROOT)/orbsvcs/IFR_Service back to includes definition
+          for TAO_IFR_EXE project.
+
+Mon Oct 10 13:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI_Timeouts/timeout_client.{h,cpp}:
+          Fixed 64bit conversion warnings
+
+Mon Oct 10 13:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable/server.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp:
+          Fixed 64bit conversion warningw
+
+Mon Oct 10 13:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_valuetype/arglist.cpp:
+          Fixed 64bit conversion warning
+
+        * tao/ORB_Core.cpp (init):
+          Fixed 64bit conversion warnings when setting sock_rcvbuf_size
+          and sock_sndbuf_size
+
+Mon Oct 10 11:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.cpp:
+          Added missing return
+
+Mon Oct 10 10:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_AMI/run_test.pl:
+          Perl script for running this test.
+
+        * tests/Big_AMI/README:
+          Short readme
+
+Mon Oct 10 10:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Quoter/Quoter.idl:
+          Fixed include
+
+Mon Oct 10 10:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp (_tao_decode):
+          Take over the version of the source cdr. For example the
+          (de)marshaling of a wstring is dependent on the GIOP version,
+          it can be that we get a 1.1 version to decode, by default the
+          version is 1.2 and when we don't take over the version number
+          we try to decode a 1.1 version streams as 1.2 version which
+          will fail. When we take over the version we correctly decode
+          the stream later as 1.1. Thanks to Lothar Werzinger
+          <lothar at tradescape dot biz> for reporting this issue
+          and supply a test case. This fixes the Codec test in our
+          daily builds.
+
+Mon Oct 10 06:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.{h,cpp}:
+          Refactored send_message_shared_i. This method contains now
+          just a switch to check for message_semantics and for asynchronous
+          calls it now calls the new method send_asynchronous_message_i
+
+Sun Oct  9 14:38:12 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/Quoter/Makefile.am:
+        * examples/Simulator/Event_Supplier/Makefile.am:
+        * orbsvcs/IFR_Service/Makefile.am:
+        * orbsvcs/examples/RtEC/Kokyu/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerate with recent *.mpc file changes.
+
+Sun Oct  9 14:14:01 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+
+          Removed includes definitions pointing to $(TAO_ROOT) and
+          $(TAO_ROOT)/orbsvcs/IFR_Service.  These are already
+          obtained from the base projects we derive from.
+
+          Set TAO_IDL_INCLUDE_DIR to $(includedir)/tao for automake
+          builds so end-user's won't have to set ACE_ROOT/TAO_ROOT
+          to run the installed executable.
+
+Sun Oct  9 08:16:17 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/examples/RtEC/Kokyu/RtECKokyu.mpc:
+        * orbsvcs/orbsvcs/FtRtEvent.mpc:
+
+          Removed includes definitions pointing to directories under
+          $(TAO_ROOT)/orbsvcs.  This appears no longer to be needed,
+          all headers are specified relative to $(TAO_ROOT)/orbsvcs.
+
+Sat Oct  8 18:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Codec/client.cpp:
+        * tests/Codec/test.idl:
+          Added a wstring to the struct we encode/decode, this fails at
+          this moment, working on a fix, but this at least demonstrates
+          the problem
+
+Sat Oct  8 08:18:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
+        * orbsvcs/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/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc:
+        * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/LoadMonitorCPU.mpc:
+
+          Remove includes definitions pointing to $(TAO_ROOT)/orbsvcs.
+          This is already obtained from the base projects we derive from.
+
+        * orbsvcs/tests/FT_App/FT_App.mpc:
+
+          Remove includes definitions pointing to $(TAO_ROOT).
+          This is already obtained from the base projects we derive from.
+
+Sat Oct  8 07:50:48 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/Simulator/Event_Supplier/Event_Supplier.mpc:
+        * examples/Quoter/Quoter.mpc:
+
+          Remove includes and idlflags definitions pointing to
+          ../../orbsvcs/orbsvcs.  This hasn't been right since we
+          normalized all orbsvcs header files to be included with
+          "orbsvcs/foo.h".  The correct settings of ../../orbsvcs is
+          already obtained from the base projects we derive from.
+
+Fri Oct  7 16:40:05 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp:
+
+          Another day, another emulated exception macro problem.
+
+Fri Oct  7 14:03:54 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * TAO_IDL/Makefile.am:
-        * docs/Makefile.am:
-        * docs/tutorials/Makefile.am:
-        * docs/tutorials/Quoter/Makefile.am:
         * docs/tutorials/Quoter/AMI/Makefile.am:
         * docs/tutorials/Quoter/Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/Naming_Service/Makefile.am:
         * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
         * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Client/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am:
-        * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Persistent/Makefile.am:
-        * docs/tutorials/Quoter/Simple/Server/Makefile.am:
         * docs/tutorials/Quoter/idl/Makefile.am:
-        * examples/Makefile.am:
-        * examples/AMH/Makefile.am:
         * examples/AMH/Sink_Server/Makefile.am:
-        * examples/AMI/Makefile.am:
         * examples/AMI/FL_Callback/Makefile.am:
-        * examples/Advanced/Makefile.am:
         * examples/Advanced/ch_3/Makefile.am:
         * examples/Buffered_AMI/Makefile.am:
         * examples/Buffered_Oneways/Makefile.am:
-        * examples/CSD_Strategy/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool4/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
         * examples/Callback_Quoter/Makefile.am:
-        * examples/Content_Server/Makefile.am:
         * examples/Content_Server/AMI_Iterator/Makefile.am:
         * examples/Content_Server/AMI_Observer/Makefile.am:
         * examples/Content_Server/SMI_Iterator/Makefile.am:
@@ -938,51 +13409,1430 @@ Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
         * examples/Load_Balancing/Makefile.am:
         * examples/Load_Balancing_persistent/Makefile.am:
         * examples/Logging/Makefile.am:
-        * examples/OBV/Makefile.am:
         * examples/OBV/Typed_Events/Makefile.am:
-        * examples/POA/Makefile.am:
-        * examples/POA/Adapter_Activator/Makefile.am:
         * examples/POA/DSI/Makefile.am:
         * examples/POA/Default_Servant/Makefile.am:
-        * examples/POA/Explicit_Activation/Makefile.am:
-        * examples/POA/Explicit_Activation/Alt_Resources/Makefile.am:
-        * examples/POA/FindPOA/Makefile.am:
         * examples/POA/Forwarding/Makefile.am:
         * examples/POA/Generic_Servant/Makefile.am:
-        * examples/POA/Loader/Makefile.am:
-        * examples/POA/NewPOA/Makefile.am:
-        * examples/POA/On_Demand_Activation/Makefile.am:
-        * examples/POA/On_Demand_Loading/Makefile.am:
-        * examples/POA/POA_BiDir/Makefile.am:
-        * examples/POA/Reference_Counted_Servant/Makefile.am:
-        * examples/POA/RootPOA/Makefile.am:
         * examples/POA/TIE/Makefile.am:
         * examples/Persistent_Grid/Makefile.am:
-        * examples/PluggableUDP/Makefile.am:
-        * examples/PluggableUDP/tests/Makefile.am:
         * examples/PluggableUDP/tests/Basic/Makefile.am:
         * examples/PluggableUDP/tests/Performance/Makefile.am:
         * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
         * examples/Quoter/Makefile.am:
-        * examples/RTCORBA/Makefile.am:
         * examples/RTCORBA/Activity/Makefile.am:
-        * examples/RTScheduling/Makefile.am:
         * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
         * examples/RTScheduling/MIF_Scheduler/Makefile.am:
-        * examples/Simple/Makefile.am:
         * examples/Simple/bank/Makefile.am:
         * examples/Simple/chat/Makefile.am:
         * examples/Simple/echo/Makefile.am:
         * examples/Simple/grid/Makefile.am:
         * examples/Simple/time/Makefile.am:
         * examples/Simple/time-date/Makefile.am:
-        * examples/Simulator/Makefile.am:
         * examples/Simulator/Event_Supplier/Makefile.am:
         * examples/TypeCode_Creation/Makefile.am:
         * examples/ior_corbaloc/Makefile.am:
         * examples/mfc/Makefile.am:
-        * interop-tests/Makefile.am:
         * interop-tests/wchar/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/examples/CosEC/Factory/Makefile.am:
+        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
+        * orbsvcs/examples/ImR/Advanced/Makefile.am:
+        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
+        * orbsvcs/examples/LoadBalancing/Makefile.am:
+        * orbsvcs/examples/ORT/Makefile.am:
+        * orbsvcs/examples/Security/Send_File/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
+        * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
+        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2248_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/InterfaceRepo/Application_Test/Makefile.am:
+        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
+        * orbsvcs/tests/Miop/McastHello/Makefile.am:
+        * orbsvcs/tests/Notify/Blocking/Makefile.am:
+        * orbsvcs/tests/Notify/Discarding/Makefile.am:
+        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
+        * orbsvcs/tests/Notify/Ordering/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/lib/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
+        * orbsvcs/tests/Redundant_Naming/Makefile.am:
+        * orbsvcs/tests/Security/BiDirectional/Makefile.am:
+        * orbsvcs/tests/Security/Big_Request/Makefile.am:
+        * orbsvcs/tests/Security/Callback/Makefile.am:
+        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
+        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
+        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
+        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
+        * orbsvcs/tests/Simple_Naming/Makefile.am:
+        * orbsvcs/tests/Trading/Makefile.am:
+        * orbsvcs/tests/ior_corbaname/Makefile.am:
+
+          Regenerate with recent MPC and base project changes.
+
+Fri Oct  7 07:11:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/LogActivator.h:
+
+          Changed header inclusion guard macro name to match file name.
+
+Fri Oct  7 07:07:28 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc:
+        * docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc:
+
+          Changed *idl project to inherit from anytypecode.
+
+Fri Oct  7 10:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Sync_Strategies.h:
+          Document must_flush argument
+
+Fri Oct  7 10:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_AMI/client.cpp:
+          Added a check that after sending the AMI requests we shouldn't
+          have received any reply at that moment. If so, we output an
+          error
+
+Fri Oct  7 07:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_Request_Muxing/Payload_Receiver.cpp:
+          Removed RefCountServantBase and made the count an Atomic_Op
+          to make sure it does get incremented correctly in a MT situation
+
+Thu Oct  6 10:03:16 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+
+          Enabled building "docs" subdirectory.
+
+        * docs/tutorials/Quoter/Naming_Service/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Client/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Persistent/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Server/Makefile.am:
+
+          Hand tweaks to _CPPFLAGS to find Stub/Skeleton headers in ../idl
+
+          directory.
+
+        * 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:
+
+          Regenerate.
+
+        * docs/tutorials/Quoter/AMI/Quoter_AMI.mpc:
+        * docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc:
+        * docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc:
+        * docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc:
+
+          Add "*idl" project for compiling *.idl files.
+
+Thu Oct  6 15:44:13 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h:
+
+          Yet another emulated exception fix.
+
+Thu Oct  6 10:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_AMI/*:
+          Added new test to test the behaviour of AMI when sending
+          large request. We shouldn't block in that case. Perl script
+          will follow but put the files now in cvs so that I can build
+          the server remotely and then test AMI between two hosts that
+          are connected using the internet. Testing things locally doesn't
+          show the issues I want to address
+
+Thu Oct  6 09:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI/ami_test_i.h:
+        * orbsvcs/tests/HTIOP/AMI/simple_client.cpp:
+        * orbsvcs/tests/HTIOP/AMI/ami_test_i.h:
+          Removed usage of TAO_HAS_AMI_EXCEPTIONS, seems something that has gone
+          a long time ago
+
+Thu Oct  6 08:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMI/ami_test_i.{h,cpp}:
+        * tests/AMI/client.cpp:
+        * tests/AMI/server.cpp:
+        * tests/AMI/simple_client.cpp:
+          Converted documentation to doxygen style
+
+Thu Oct  6 08:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Param_Test/client.cpp:
+          Fixed might be unitialized warning in MinGW build
+
+Wed Oct  5 13:54:00 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/Miop/McastHello/Makefile.am:
+
+          Regenerate.
+
+        * orbsvcs/tests/Miop/McastHello/McastHello.mpc:
+
+          Add "*idl" project for compiling *.idl files.
+
+Wed Oct  5 12:18:39 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * examples/POA/DSI/Database_i.h:
+
+          Include appropriate headers to address incomplete type
+          definition related compile-time errors.  Necessitated by header
+          dependency reductions in ACE.
+
+Wed Oct  5 17:28:52 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_native.cpp:
+        * TAO_IDL/ast/ast_operation.cpp:
+        * TAO_IDL/be/be_native.cpp:
+        * TAO_IDL/be_include/be_native.h:
+        * TAO_IDL/include/ast_native.h:
+
+          Implemented the handling of IDL native declarations in an
+          IDL operation exception list. Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for pointing out that, in the latest
+          version of the CORBA Messaging specification, the
+          ExceptionHolder valuetype contains an operation with this
+          use case.
+
+Wed Oct  5 11:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/AMH_Response_Handler.cpp:
+          Removed not needed return at end of method
+
+Wed Oct  5 11:23:27 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tao/CodecFactory.mpc:
+        * tao/DynamicAny.mpc:
+        * tao/IFR_Client.mpc:
+        * tao/IORManipulation.mpc:
+        * tao/PortableServer.mpc:
+        * tao/Strategies.mpc:
+        * tao/Valuetype.mpc:
+
+          Removed 'anytypecode' base project and substituted 'core_anytypecode'.
+          This removes a dependency on the IDL compiler that had crept in.
+
+Wed Oct  5 02:24:50 2005  Bala Natarajan  <bala_natarajan at symantec dot com>
+
+        * tests/Queued_Message_Test/Queued_Message_Test.cpp:
+
+          Fixed compilation errors introduced from Mon Oct  3 06:33:20
+          2005  Bala Natarajan  <bala_natarajan at symantec dot com>
+
+Tue Oct  4 15:15:02 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+        * orbsvcs/tests/Makefile.am:
+
+          Add Bug_2247_Regression and Bug_2248_Regression directories.
+
+        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
+
+          New files.
+
+        * orbsvcs/tests/ImplRepo/Makefile.am:
+        * orbsvcs/tests/ImplRepo/scale/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
+        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
+        * orbsvcs/tests/ImplRepo/ImplRepo.mpc:
+        * orbsvcs/tests/ImplRepo/scale/scaletest.mpc
+
+          Add "*idl" project for compiling *.idl files.
+
+Tue Oct  4 11:19:47 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tao/PortableServer/Creation_Time.inl:
+
+          Include "tao/orbconf.h" to pull in POA_NO_TIMESTAMP definition.
+          Addresses problems where comparison to this preprocessor
+          constant were made but no definition of it was available.
+
+Tue Oct  4 14:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Transport.cpp (send):
+          Make clear the number printed out in the send failure message is
+          errno.
+
+Tue Oct  4 14:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Big_Oneways/server.cpp:
+          Improved debug statement to make clear we are waiting on the
+          sessions to finish.
+
+Tue Oct  4 14:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.cpp (send_message_shared_i):
+          Get the flushing_strategy later in the method just before the
+          moment we need it.
+
+Tue Oct  4 13:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1476_Regression/client.cpp:
+          Added -c commandline argument to control how many client
+          tasks will be created. Makes it easier to debug
+
+Tue Oct  4 12:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1476_Regression/client.cpp:
+          Fixed bug in handling of -n commandline argument
+
+Tue Oct  4 12:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_1476_Regression/server.cpp:
+          Print an error when the server didn't receive any calls
+
+Tue Oct  4 13:01:42 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tests/Bug_2183_Regression/Hello.h:
+
+          Remove reference to deprecated RefCountServantBase.
+
+Tue Oct  4 12:57:09 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2248_Regression/tests.idl:
+
+          Swapped <> for "" in #includes to fix fuzz error.
+
+Tue Oct  4 11:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/fe/fe_tmplinst.cpp:
+          Removed, not needed anymore
+
+        * TAO_IDL/Makefile.am:
+          Removed file above
+
+        * TAO_IDL/be/be_helper.cpp
+        * TAO_IDL/be/be_tmplinst.cpp
+        * TAO_IDL/be_include/be_helper.h
+        * examples/RTCORBA/Activity/Activity.cpp
+        * examples/RTCORBA/Activity/Task_Stats.cpp
+        * examples/RTScheduling/Task_Stats.cpp
+        * examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+        * examples/RTScheduling/MIF_Scheduler/test.cpp
+        * orbsvcs/PSS/PSDL_Datastore.cpp
+        * orbsvcs/PSS/PSDL_Interface_Visitor.cpp
+        * orbsvcs/PSS/PSDL_Scope.cpp
+        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+        * orbsvcs/Trading_Service/Trading_Service.cpp
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+        * orbsvcs/orbsvcs/Notify/Properties.cpp
+        * orbsvcs/orbsvcs/Notify/RT_Properties.cpp
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+        * orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.cpp
+        * orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+        * orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+        * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
+        * orbsvcs/orbsvcs/Sched/Scheduler.cpp
+        * orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+        * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+        * orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+        * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+        * orbsvcs/orbsvcs/Trader/Trader.cpp
+        * orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
+        * orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+        * orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
+        * orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
+        * orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+        * orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
+        * orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+        * orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+        * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+        * orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+        * orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+        * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+        * orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+        * orbsvcs/tests/AVStreams/Latency/control.cpp
+        * orbsvcs/tests/AVStreams/Latency/ping.cpp
+        * orbsvcs/tests/AVStreams/Latency/pong.cpp
+        * orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+        * orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+        * orbsvcs/tests/AVStreams/Multicast/server.cpp
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+        * orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+        * orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+        * orbsvcs/tests/AVStreams/Pluggable/server.cpp
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+        * orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+        * orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+        * orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+        * orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+        * orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+        * orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp
+        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+        * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+        * orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+        * orbsvcs/tests/Event/Basic/BCast.cpp
+        * orbsvcs/tests/Event/Basic/Bitmask.cpp
+        * orbsvcs/tests/Event/Basic/Control.cpp
+        * orbsvcs/tests/Event/Basic/Disconnect.cpp
+        * orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+        * orbsvcs/tests/Event/Basic/Negation.cpp
+        * orbsvcs/tests/Event/Basic/Observer.cpp
+        * orbsvcs/tests/Event/Basic/Reconnect.cpp
+        * orbsvcs/tests/Event/Basic/Schedule.cpp
+        * orbsvcs/tests/Event/Basic/Shutdown.cpp
+        * orbsvcs/tests/Event/Basic/Timeout.cpp
+        * orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+        * orbsvcs/tests/Event/Performance/Connect.cpp
+        * orbsvcs/tests/Event/Performance/Inversion.cpp
+        * orbsvcs/tests/Event/Performance/Latency.cpp
+        * orbsvcs/tests/Event/Performance/Latency_Server.cpp
+        * orbsvcs/tests/Event/Performance/Throughput.cpp
+        * orbsvcs/tests/Event/lib/Consumer.cpp
+        * orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+        * orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+        * orbsvcs/tests/Event/lib/Supplier.cpp
+        * orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp
+        * orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
+        * orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp
+        * orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp
+        * orbsvcs/tests/FT_App/FT_Client.cpp
+        * orbsvcs/tests/FT_App/FT_Creator.cpp
+        * orbsvcs/tests/FT_App/FT_Replica.cpp
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+        * orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+        * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+        * orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+        * orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+        * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+        * orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
+        * orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
+        * orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Map.cpp
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.cpp
+        * orbsvcs/tests/Notify/Basic/Events.cpp
+        * orbsvcs/tests/Notify/Basic/Filter.cpp
+        * orbsvcs/tests/Notify/Basic/Sequence.cpp
+        * orbsvcs/tests/Notify/Basic/Simple.cpp
+        * orbsvcs/tests/Notify/Basic/Updates.cpp
+        * orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+        * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+        * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+        * orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+        * orbsvcs/tests/Notify/lib/Command_Builder.cpp
+        * orbsvcs/tests/Notify/lib/Driver.cpp
+        * orbsvcs/tests/Notify/lib/Factories_Define.cpp
+        * orbsvcs/tests/Notify/lib/LookupManager.cpp
+        * orbsvcs/tests/Notify/lib/Periodic_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/lib/Task_Stats.cpp
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+        * orbsvcs/tests/Trading/Offer_Exporter.cpp
+        * orbsvcs/tests/Trading/colocated_test.cpp
+        * performance-tests/Callback/client.cpp
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+        * performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+        * performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+        * performance-tests/POA/Demux/demux_test_server.cpp
+        * performance-tests/RTCorba/Thread_Pool/client.cpp
+        * tao/ORB_Table.cpp
+        * tao/TSS_Resources.cpp
+        * tao/Strategies/DIOP_Connector.cpp
+        * tao/Valuetype/ValueFactory_Map.cpp
+        * tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp
+        * tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp
+        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp
+        * tests/DynAny_Test/driver.cpp
+        * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
+        * tests/OctetSeq/OctetSeq.cpp
+        * tests/Param_Test/driver.cpp
+        * tests/Param_Test/helper.cpp
+        * tests/Param_Test/options.cpp
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+        * tests/RTCORBA/Collocation/Collocation.cpp
+          Zapped explicit templates
+
+Tue Oct  4 11:08:35 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2248_Regression/tests.idl:
+
+          Added missing file.
+
+        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
+        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h:
+
+          Correct errors.
+
+Tue Oct  4 10:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/POA/DSI/Database_i.cpp
+        * examples/RTCORBA/Activity/Activity.cpp
+        * examples/RTCORBA/Activity/Task_Stats.cpp
+        * examples/RTScheduling/Task_Stats.cpp
+        * examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+        * examples/RTScheduling/MIF_Scheduler/test.cpp
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp
+        * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+        * orbsvcs/Fault_Detector/Fault_Detector_Main.cpp
+        * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+        * orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp
+        * orbsvcs/IFR_Service/be_global.cpp
+        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+        * orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+        * orbsvcs/orbsvcs/AV/AV_Core.cpp
+        * orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
+        * orbsvcs/orbsvcs/AV/Policy.cpp
+        * orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+        * orbsvcs/orbsvcs/AV/RTCP.cpp
+        * orbsvcs/orbsvcs/AV/TCP.cpp
+        * orbsvcs/orbsvcs/AV/Transport.cpp
+        * orbsvcs/orbsvcs/AV/sfp.cpp
+        * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+        * orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+        * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_Filter.cpp
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+        * orbsvcs/orbsvcs/IFRService/Options.cpp
+        * 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
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+        * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+        * orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Log/Log_i.cpp
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
+        * orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+        * orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+        * orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
+        * orbsvcs/orbsvcs/Notify/Builder.cpp
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+        * orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
+        * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp
+        * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+        * orbsvcs/orbsvcs/Notify/Object.cpp
+        * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+        * orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+        * orbsvcs/orbsvcs/Notify/Random_File.cpp
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp:
+          Zapped explicit templates
+
+Mon Oct  3 23:43:08 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/FT_App/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
+        * orbsvcs/tests/IOR_MCast/Makefile.am:
+        * orbsvcs/tests/ior_corbaname/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/tests/FT_App/FT_App.mpc:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/GroupRef_Manipulation.mpc:
+        * orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc:
+        * orbsvcs/tests/IOR_MCast/IOR_MCast.mpc:
+        * orbsvcs/tests/ior_corbaname/ior_corbaname.mpc:
+
+          Add "*idl" project for compiling *.idl files.
+
+Mon Oct  3 19:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/tutorials/Quoter/Event_Service/Stock_i.cpp
+        * docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
+        * examples/Callback_Quoter/Notifier_i.cpp
+        * examples/Event_Comm/Event_Comm_i.cpp
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
+        * examples/Kokyu_dsrt_schedulers/utils.cpp
+        * examples/Load_Balancing/Load_Balancer_i.cpp
+        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+        * examples/Logging/Logger_i.cpp
+        * examples/OBV/Typed_Events/Client_i.cpp
+        * examples/OBV/Typed_Events/server.cpp
+        * examples/POA/On_Demand_Loading/Servant_Manager.cpp
+        * examples/Persistent_Grid/Grid_Client_i.cpp
+        * examples/Persistent_Grid/Persistent_Client_i.cpp
+        * examples/Persistent_Grid/server.cpp
+        * examples/PluggableUDP/tests/Basic/UDP_i.cpp
+        * examples/PluggableUDP/tests/Performance/UDP_i.cpp
+        * examples/RTScheduling/Starter.cpp
+        * examples/Simple/bank/AccountManager_i.cpp
+        * examples/Simple/bank/Bank_Client_i.cpp
+        * examples/Simple/bank/server.cpp
+        * examples/Simple/chat/Broadcaster_i.cpp
+        * examples/Simple/echo/Echo_Client_i.cpp
+        * examples/Simple/echo/server.cpp
+        * examples/Simple/grid/Grid_Client_i.cpp
+        * examples/Simple/grid/server.cpp
+        * examples/Simple/time/Time_Client_i.cpp
+        * examples/Simple/time/server.cpp
+        * examples/Simple/time-date/Time_Date.cpp
+        * examples/Simple/time-date/Time_Date_Client_i.cpp
+        * examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+        * examples/Simulator/Event_Supplier/Event_Sup.cpp
+        * examples/Simulator/Event_Supplier/Logging_Sup.cpp
+        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+        * orbsvcs/examples/CosEC/Simple/Consumer.cpp
+        * orbsvcs/examples/CosEC/Simple/Service.cpp
+        * orbsvcs/examples/CosEC/Simple/Supplier.cpp
+        * orbsvcs/examples/Log/Event/Event_Consumer.cpp
+        * orbsvcs/examples/Log/Event/Event_Supplier.cpp
+        * orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+        * orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+        * orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+        * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+        * orbsvcs/examples/Notify/Filter/Filter.cpp
+        * orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+        * orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+        * orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+        * orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+        * orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+        * orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+        * orbsvcs/examples/RtEC/Kokyu/Service.cpp
+        * orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+        * orbsvcs/examples/RtEC/MCast/Consumer.cpp
+        * orbsvcs/examples/RtEC/MCast/MCast.cpp
+        * orbsvcs/examples/RtEC/MCast/Supplier.cpp
+        * orbsvcs/examples/RtEC/Schedule/Service.cpp
+        * orbsvcs/examples/RtEC/Simple/Consumer.cpp
+        * orbsvcs/examples/RtEC/Simple/Service.cpp
+        * orbsvcs/examples/RtEC/Simple/Supplier.cpp
+          Zapped explicit templates
+
+Mon Oct  3 18:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp
+          Zapped explicit templates
+
+Mon Oct  3 18:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTPortableServer/RT_Policy_Validator.cpp:
+          Emulated exception fix
+
+        * tao/RTCORBA/Thread_Pool.{h,cpp}:
+          Renamed request_dynamic_thread to new_dynamic_thread.
+
+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:
+
+          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:
+
+          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:
+
+          Include appropriate headers to address incomplete type
+          definition related compile-time errors.  Necessitated by header
+          dependency reductions in ACE.
+
+Mon Oct  3 15:39:59 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
+        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h:
+        * orbsvcs/tests/Bug_2248_Regression/client.h:
+
+          Linux build errors.
+
+Mon Oct  3 06:54:16 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/examples/ImR/Advanced/Makefile.am:
+        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
+        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/examples/ImR/Advanced/Advanced.mpc:
+        * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Application_Controlled.mpc:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Infrastructure_Controlled.mpc:
+        * orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc:
+
+          Add "*idl" project for compiling *.idl files.
+
+Mon Oct  3 13:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTPortableServer/RT_Policy_Validator.cpp:
+          Updated for threadpool manager interfaces
+
+Mon Oct  3 12:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/Thread_Pool.{h,cpp,inl}:
+          Fixed deadlock that occured when a ThreadPool was being destructed
+          when the ORB is still running. At that moment we did a wait on
+          the thread pool wait the lock on the thread pool manager was still
+          hold which resulted in a deadlock. Now each Thread Pool lane has
+          its own lock to guard its state, the lock in the thread pool manager
+          is just to guard the map in the manager. This fixes bugzilla bug
+          #2235.
+          Thanks to Anders Olsson <Anders dot EPK dot Olsson at ericsson dot com>
+          for reporting this issue.
+
+        * tao/Makefile.am:
+          Added new Thread_Pool.inl
+
+Mon Oct  3 12:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/RTCORBA/Thread_Pool/test_i.cpp:
+          Use C++ cast instead of c-style cast
+
+Mon Oct  3 11:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/releasenotes/index.html:
+          Documented IPv6 status
+
+Mon Oct  3 06:33:20 2005  Bala Natarajan  <bala_natarajan at symantec dot com>
+
+        * tao/LF_Event.cpp (state_changed):
+        * tao/LF_Event.h:
+
+          There was strange problem that showed up during our testing
+          here. The problem happens only on peers that have server threads
+          waiting for requests,  effectively leaving some threads hanging
+          around LF waiting for the reply, when infact the reply was
+          received by the server thread -- sort of missed wakeups.
+
+          Problem: Server threads that wait for requests can process
+          replies (for requests initiated by client threads) since they
+          can get to the reactor right away and become leaders within the
+          reactor. What happens when a reply is received by a server
+          thread before a client thread adds itslf as a follower (in the
+          LF loop as a follower)? Disaster.
+
+          Context: Why disaster? The server thread, never bound by the
+          synchronization in the LF, would pick the reply. It would
+          check for the follower (without holding the LF lock), and since
+          the follower is still joining the follower list, the LF_Event
+          would not have a follower pointer. The server thread would then
+          simply exit state_changed () without waiting for a follower. The
+          client thread that becomes a follower will never get a wakeup
+          signal and continue to hang around blocking a resource.
+
+          Solution: Do wakeups only with the locks held. Grab LF lock
+          before thinking of doing wakeups, which would allow clients
+          languishing to set the follower pointer.
+
+          To implement the solution, all I did was to change the interface
+          of state_changed () to pass in a LF reference.
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+        * performance-tests/Latency/Thread_Pool/run_test.pl:
+        * tao/Asynch_Queued_Message.cpp:
+        * tao/Asynch_Queued_Message.h:
+        * tao/Connection_Handler.cpp:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/Queued_Message.cpp:
+        * tao/Queued_Message.h:
+        * tao/Synch_Queued_Message.cpp:
+        * tao/Synch_Queued_Message.h:
+        * tao/Synch_Reply_Dispatcher.cpp:
+        * tao/Transport.cpp:
+        * tao/Wait_On_Read.cpp:
+        * tao/Strategies/DIOP_Connection_Handler.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+
+          Changes that got propogated due to the interface change in
+          LF_Event.
+
+Mon Oct  3 11:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Handler.cpp (close_connection_eh):
+          Removed some asserts that triggered when a RTCorba ThreadLane
+          was destroyed from a thread not belonging to this ThreadLane,
+          now we just have a fallback when the reactor associated with the
+          event handler is zero. This fixes bugzilla bug #2244. Thanks to
+          Bala for validating my ideas.
+
+        * tao/Transport.{h,cpp,inl}:
+          Moved sent_byte_count and recv_buffer_size const and moved
+          them to the inline file
+
+Mon Oct  3 10:02:06 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tao/Synch_Invocation.cpp:
+
+          Don't reset the profiles upon a comm failure exception when
+          the FT service callback indicates a restart. This fixes bug #2248.
+
+          Thanks to Milan Cvetkovic for reporting the problem and providing
+          the regression test.
+
+        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
+        * orbsvcs/tests/Bug_2248_Regression/Client_i.h:
+        * orbsvcs/tests/Bug_2248_Regression/README:
+        * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h:
+        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h:
+        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/client.h:
+        * orbsvcs/tests/Bug_2248_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_2248_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/test.idl:
+        * orbsvcs/tests/Bug_2248_Regression/test_i.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/test_i.h:
+
+          Regression test for the above.
+
+Sun Oct  2 11:05:51 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_i.cpp (validate_capacity_alarm_thresholds):
+
+          Fixed out-of-range array element access that occured with single
+          element sequences.
+
+          Add note that the specification does not require theshold values
+          to be in order or unique.
+
+Sun Oct  2 22:22:55 IST 2005  Bala Natarajan  <bala_natarajan at symantec dot com>
+
+        * performance-tests/Latency/Thread_Per_Connection/run_test.pl:
+
+          Increased the timeout for the test to succeed on all platforms.
+
+Sun Oct  2 12:01:40 2005  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc:
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp:
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/run_test.pl:
+          Implemented bounded sequences of object references.
+
+        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp:
+          Fixed typos in unit test.
+
+        * tests/Sequence_Unit_Tests/object_reference_traits.hpp:
+        * tests/Sequence_Unit_Tests/object_reference_traits_base.hpp:
+          Refactor traits so it is possible to implement better unit
+          tests.
+
+        * tests/Sequence_Unit_Tests/string_traits_base.hpp:
+          Fixed comment
+
+        * tests/Sequence_Unit_Tests/testing_allocation_traits.hpp:
+          Fixed #include guards
+
+        * tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp:
+          Modified so we can better test object reference management in
+          the sequences.
+
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp:
+          Add more test cases
+
+Sat Oct  1 08:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/fe/fe_init.cpp:
+          Reverted WChar fixes, we have some problems in the idl compiler,
+          maybe they are caused by this
+
+Fri Sep 30 18:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Smart_Proxies/dtor/dtor.mpc:
+          Added anytypecode as base project to the client
+
+Fri Sep 30 12:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/params.cpp:
+          Fixed 64bit conversion warning
+
+Fri Sep 30 12:22:51 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
+
+          Add minimum_corba.
+
+        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
+
+          ACE_CHECK to ACE_CHECK_RETURN.
+
+Fri Sep 30 10:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Invocation_Base.{h,cpp}:
+          Set the invoke_status_ correctly when an exception has occured.
+          This fixes bugzilla bug 2247. Thanks to Simon McQueen
+          <sm@prismtech.com> for adding the regression for this test
+          to the repo and to Milan Cvetkovic
+          <milan dot cvetkovic at mpathix dot com> for creating the
+          regression
+
+Fri Sep 30 10:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/fe/fe_init.cpp:
+          WChar fix
+
+Fri Sep 30 09:10:00 2005  Simon Massey  <simon.massey@prismtech.com>
+
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+
+          This fixes Bugzilla 2249.
+          (Problems with  TAO_HAS_EXTENDED_FT_INTERCEPTORS  builds)
+
+Thu Sep 29 15:07:30 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
+
+          De-fuzzed simple cases ACE_CHECK/ACE_TRY_CHECK warnings.
+          I'll get to the remaining cases that need new temporary
+          variables, etc. in the next week.
+
+Thu Sep 29 17:25:39 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2247_Regression/test_i.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/test_i.h:
+
+          Fixing the inevitable emulated exception errors.
+
+Thu Sep 29 10:02:19 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:
+
+          De-fuzzed ACE_CHECK/ACE_TRY_CHECK warnings.  Thanks to Johnny
+          Willemsen for catching this and holding my feet to the fire.
+
+Thu Sep 29 09:12:24 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/SmartProxies/Smart_Proxies.h:
+
+          Removed the virtual from the inheritance list.  It is not
+          necessary.
+
+Thu Sep 29 14:29:17 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
+        * orbsvcs/tests/Bug_2247_Regression/Client_i.h:
+        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/Manager.h:
+        * orbsvcs/tests/Bug_2247_Regression/README:
+        * orbsvcs/tests/Bug_2247_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_2247_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/test.idl:
+        * orbsvcs/tests/Bug_2247_Regression/test_i.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/test_i.h:
+
+          Regression test added.
+
+Thu Sep 29 07:38:32 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Smart_Proxies/dtor/client.cpp:
+        * tests/Smart_Proxies/dtor/server.cpp:
+
+          Corrected build issues (include files, exception macros and
+          minimum corba related problems) and warnings from certain versions
+          of the GNU compiler about implicit conversion.
+
+Thu Sep 29 12:34:50 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tao/Makefile.am:
+
+          Removed WrongTransactionS.inl - file no longer in CVS.
+
+Thu Sep 29 09:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+        * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+        * orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+        * orbsvcs/tests/AVStreams/Multicast/server.cpp
+        * orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+        * tests/Big_Twoways/client.cpp
+        * tests/Two_Objects/Object_Factory_i.cpp
+          Fixed fuzz errors
+
+        * utils/catior/catior.cpp
+          Wchar fix
+
+Thu Sep 29 07:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Smart_Proxies/server.cpp:
+        * tests/Smart_Proxies/Benchmark/client.cpp:
+        * tests/Smart_Proxies/Benchmark/server.cpp:
+        * tests/Smart_Proxies/On_Demand/server.cpp:
+        * tests/Smart_Proxies/Policy/client.cpp:
+        * tests/Smart_Proxies/Policy/server.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+          Fixed fuzz errors
+
+Thu Sep 29 07:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+          Emulated exception fix
+
+Thu Sep 29 07:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connect_Strategy.h:
+        * tao/ORB.h:
+        * tao/PI_Server/Policy_Creator_T.h:
+          Layout and documentation changes
+
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+          Updated debug statement to have the same layout as the other messages
+
+        * tao/Stub.{h,cpp,i}:
+          Use an Atomic_Op for the refcount, removed some accessors that are
+          not needed and which violated the encapsulation principle. Made
+          some methods protected which don't need to be public, removed the
+          return value of the _incr_refcnt and _decr_refcnt methods, the
+          return value isn't something you can build logic on because it
+          can change again quickly. Also fixed a 64bit problem.
+
+        * tao/Valuetype/AbstractBase.cpp:
+          Removed (void) before calls of _incr_rfcnt/_decr_refcnt, they don't
+          return a value anymore.
+
+Thu Sep 29 07:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+        * orbsvcs/orbsvcs/Trader/Trader_Utils.{h,cpp}:
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp:
+          Fixed emulated exception fuzz errors. It seems the Trading service
+          is not really correct related to emulated exceptions, if someone
+          really wants to use it in that configuration some more work has
+          to be done.
+
+Thu Sep 29 06:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp:
+          Fixed emulated exception fuzz errors
+
+Wed Sep 28 20:05:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/IIOP_Acceptor.cpp:
+
+          Fixed compile error for Borland compiler.
+
+Wed Sep 28 18:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+          Fixed emulated exception errors
+
+Wed Sep 28 11:35:17 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        Committing the following changes on behalf of Wallace Zhang
+        <zhang_w@ociweb.com>.
+
+        * tao/SmartProxies/Smart_Proxies.h:
+
+          Let TAO_Smart_Proxy_Base inherit from
+          TAO_Local_RefCounted_Object to have a correct destruction of smart
+          proxies. This also fixed the problem that _non_existent() crashes
+          when using smart proxy
+
+        * tests/Smart_Proxies/dtor/.cvsignore:
+        * tests/Smart_Proxies/dtor/README:
+        * tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h:
+        * tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp:
+        * tests/Smart_Proxies/dtor/client.cpp:
+        * tests/Smart_Proxies/dtor/dtor.mpc:
+        * tests/Smart_Proxies/dtor/run_test.pl:
+        * tests/Smart_Proxies/dtor/server.cpp:
+        * tests/Smart_Proxies/dtor/test.idl:
+
+          Created a new test for Smart Proxy. This test is to detect
+          the destruction of smart proxies and a _non_existent()
+          crash.
+
+Wed Sep 28 15:21:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/Acceptor_Registry{.h .cpp}:
+        * tao/IIOP_Acceptor{.h .cpp .i}:
+
+          Added improvements for IPv6 support with Windows (circumventing
+          the problems coming from MS's single-stack implementation of
+          IPv4/IPv6).
+
+Fri Sep 23 13:11:31 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * tao/orbconf.h: Added a comment warning users about the
+          impact of setting huge values for the number of configured
+          handles.  Thanks to Jan.Zima@sofis.cz for motivating this.
+
+Wed Sep 28 14:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/IFRService/*S.{h,cpp,inl}:
+        * orbsvcs/orbsvcs/IFRService/*S_T.{h,cpp,inl}:
+          Regenerated with the latest version of the TAO_IDL compiler
+
+Wed Sep 28 14:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/POA/Demux/demux_test_server.cpp:
+          Fixed fuzz error
+
+Wed Sep 28 14:53:27 2005  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Bug_2137_Regression/client.cpp:
+
+          What kind of muppet makes 35 seperate mistakes with emulated
+          exception handling in one file ? That would be me.
+
+Wed Sep 28 14:35:26 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tao/WrongTransaction.pidl:
+
+          Changed generation instructions to include use of -SS.
+
+        * tao/WrongTransactionS.h:
+
+          Regenerated using -SS.
+
+        * tao/WrongTransactionS.inl:
+
+          Removed file.
+
+Tue Sep 27 18:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp:
+          Emulated exception fix
+
+Mon Sep 26 14:19:42 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+
+          Added "Log/LogStore.h" to Header_Files in the DsLogAdmin_Serv
+          project.
+
+Mon Sep 26 09:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+          Wchar fix
+
+        * orbsvcs/orbsvcs/RTEvent.mpc:
+        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
+          Added export files to the header section so that they get copied
+          on install
+
+Mon Sep 26 09:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Event_Service/Event_Service.cpp:
+          Corrected the way we check whether we should create a persistent POA
+          or not.
+
+Mon Sep 26 07:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
+          Added ACE_CHECK generation and fixed some layout issues
+
+Sun Sep 25 21:33:41 2005  Bala Natarajan  <bala_natarajan at symantec dot com>
+
+        * tao/Transport_Cache_Manager.cpp:
+
+          Cosmetic check, which seems to help some builds.
+
+Sat Sep 24 11:37:37 2005  Balachandran Natarajan  <bala_natarajan at symantec dot com>
+
+        * tao/default_client.cpp:
+
+          Changed the default value of use_cleanup_options_ switch to
+          false. This should address performance and thread_pool latency
+          test failures in our daily scoreboard.
+
+Fri Sep 23 12:17:29 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * tests/Bug_2222_Regression/test.cpp (main):
+
+          Removed unnecessary try/catch block that caused an "unused
+          ACE_TRY_LABEL" warning in emulated exception builds.  Thanks to
+          Simon Massey for pointing out the problem.
+
+Fri Sep 23 16:22:01 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/Any_Basic_Impl_T.cpp:
+
+          Added include of Any.h, similar to the other Any_*_Impl_T.cpp
+          files. The need for this include shows up only when enums
+          are seen in an IDL file, with no other IDL types to
+          pull in the include. Thanks to Jules Colding <colding@omesc.com>
+          for reporting the problem.
+
+Fri Sep 23 07:42:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/examples/Security/Send_File/Makefile.am:
+
+          Regenerate.
+
+        * orbsvcs/examples/Security/Send_File/Security_Send_File.mpc:
+
+          Add "*idl" project for compiling *.idl files.
+
+Fri Sep 23 07:07:33 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/examples/LoadBalancing/LoadBalancing.mpc:
+
+          Changed *idl project to inherit from anytypecode.
+
+Fri Sep 23 14:31:39 2005  Simon McQueen  <sm@prismtech.com>
+
+        * docs/Options.html:
+
+          Removed some text that had been put in the wrong place.
+
+Fri Sep 23 05:55:03 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/HTIOP/Hello/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/HTIOP/Hello/HTIOP_Hello.mpc:
+
+          Added "custom_only = 1" to *idl project.
+
+Fri Sep 23 11:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/Event.inl:
+          Emulated exception fix
+
+Fri Sep 23 11:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.{h,cpp}:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp:
+          Some wchar fixes
+
+Fri Sep 23 10:05:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/CallbackTest/Callback.cpp:
+        * tests/CallbackTest/server.cpp:
+        * tests/CallbackTest/client.cpp:
+
+          Fixed compile warnings.
+
+Thu Sep 22 23:55:22 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/HTIOP/AMI/Makefile.am:
+        * orbsvcs/tests/HTIOP/Hello/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc:
+        * orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.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 Sep 22 14:03:11 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Updated AC_CONFIG_FILES for the new directories.
+
+          Added BUILD_REPO, BUILD_THREADS, and BUILD_EC_TYPED_EVENTS
+          automake conditionals.  Explicitly set to false, true, and
+          true (at least for now).
+
+        * TAO_IDL/Makefile.am:
         * orbsvcs/Makefile.am:
         * orbsvcs/Concurrency_Service/Makefile.am:
         * orbsvcs/CosEvent_Service/Makefile.am:
@@ -997,6 +14847,7 @@ Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
         * orbsvcs/Fault_Notifier/Makefile.am:
         * orbsvcs/IFR_Service/Makefile.am:
         * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/LifeCycle_Service/Makefile.am:
         * orbsvcs/LoadBalancer/Makefile.am:
         * orbsvcs/Logging_Service/Makefile.am:
         * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
@@ -1009,46 +14860,7 @@ Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
         * orbsvcs/TAO_Service/Makefile.am:
         * orbsvcs/Time_Service/Makefile.am:
         * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/examples/Makefile.am:
-        * orbsvcs/examples/CosEC/Makefile.am:
-        * orbsvcs/examples/CosEC/Factory/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/Makefile.am:
         * orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am:
-        * orbsvcs/examples/CosEC/Simple/Makefile.am:
-        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
-        * orbsvcs/examples/FaultTolerance/Makefile.am:
-        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
-        * orbsvcs/examples/ImR/Makefile.am:
-        * orbsvcs/examples/ImR/Advanced/Makefile.am:
-        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
-        * orbsvcs/examples/LoadBalancing/Makefile.am:
-        * orbsvcs/examples/Log/Makefile.am:
-        * orbsvcs/examples/Log/Basic/Makefile.am:
-        * orbsvcs/examples/Log/Event/Makefile.am:
-        * orbsvcs/examples/Log/Notify/Makefile.am:
-        * orbsvcs/examples/Log/RTEvent/Makefile.am:
-        * orbsvcs/examples/Notify/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/Agent/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/Gate/Makefile.am:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am:
-        * orbsvcs/examples/Notify/Filter/Makefile.am:
-        * orbsvcs/examples/Notify/Lanes/Makefile.am:
-        * orbsvcs/examples/Notify/Subscribe/Makefile.am:
-        * orbsvcs/examples/Notify/ThreadPool/Makefile.am:
-        * orbsvcs/examples/ORT/Makefile.am:
-        * orbsvcs/examples/RtEC/Makefile.am:
-        * orbsvcs/examples/RtEC/IIOPGateway/Makefile.am:
-        * orbsvcs/examples/RtEC/Kokyu/Makefile.am:
-        * orbsvcs/examples/RtEC/MCast/Makefile.am:
-        * orbsvcs/examples/RtEC/Schedule/Makefile.am:
-        * orbsvcs/examples/RtEC/Simple/Makefile.am:
-        * orbsvcs/examples/Security/Makefile.am:
-        * orbsvcs/examples/Security/Send_File/Makefile.am:
         * orbsvcs/orbsvcs/Makefile.am:
         * orbsvcs/performance-tests/Makefile.am:
         * orbsvcs/performance-tests/LoadBalancing/Makefile.am:
@@ -1083,13 +14895,6 @@ Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
         * orbsvcs/tests/Bug_1393_Regression/Makefile.am:
         * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
         * orbsvcs/tests/Bug_1630_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2074_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2137_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
         * orbsvcs/tests/Concurrency/Makefile.am:
         * orbsvcs/tests/CosEvent/Makefile.am:
         * orbsvcs/tests/CosEvent/Basic/Makefile.am:
@@ -1114,40 +14919,168 @@ Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
         * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
         * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am:
         * orbsvcs/tests/FtRtEvent/Makefile.am:
-        * orbsvcs/tests/HTIOP/Makefile.am:
+        * tao/Makefile.am:
+        * utils/Makefile.am:
+        * utils/catior/Makefile.am:
+        * utils/nslist/Makefile.am:
+
+          Regenerated.
+
+        * docs/Makefile.am:
+        * docs/tutorials/Makefile.am:
+        * docs/tutorials/Quoter/AMI/Makefile.am:
+        * docs/tutorials/Quoter/Event_Service/Makefile.am:
+        * docs/tutorials/Quoter/Makefile.am:
+        * docs/tutorials/Quoter/Naming_Service/Makefile.am:
+        * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
+        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Client/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Persistent/Makefile.am:
+        * docs/tutorials/Quoter/Simple/Server/Makefile.am:
+        * docs/tutorials/Quoter/idl/Makefile.am:
+        * examples/AMH/Makefile.am:
+        * examples/AMH/Sink_Server/Makefile.am:
+        * examples/AMI/FL_Callback/Makefile.am:
+        * examples/AMI/Makefile.am:
+        * examples/Advanced/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/Makefile.am:
+        * examples/Content_Server/SMI_Iterator/Makefile.am:
+        * examples/Event_Comm/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
+        * examples/Load_Balancing/Makefile.am:
+        * examples/Load_Balancing_persistent/Makefile.am:
+        * examples/Logging/Makefile.am:
+        * examples/Makefile.am:
+        * examples/OBV/Makefile.am:
+        * examples/OBV/Typed_Events/Makefile.am:
+        * examples/POA/Adapter_Activator/Makefile.am:
+        * examples/POA/DSI/Makefile.am:
+        * examples/POA/Default_Servant/Makefile.am:
+        * examples/POA/Explicit_Activation/Alt_Resources/Makefile.am:
+        * examples/POA/Explicit_Activation/Makefile.am:
+        * examples/POA/FindPOA/Makefile.am:
+        * examples/POA/Forwarding/Makefile.am:
+        * examples/POA/Generic_Servant/Makefile.am:
+        * examples/POA/Loader/Makefile.am:
+        * examples/POA/Makefile.am:
+        * examples/POA/NewPOA/Makefile.am:
+        * examples/POA/On_Demand_Activation/Makefile.am:
+        * examples/POA/On_Demand_Loading/Makefile.am:
+        * examples/POA/POA_BiDir/Makefile.am:
+        * examples/POA/Reference_Counted_Servant/Makefile.am:
+        * examples/POA/RootPOA/Makefile.am:
+        * examples/POA/TIE/Makefile.am:
+        * examples/Persistent_Grid/Makefile.am:
+        * examples/PluggableUDP/Makefile.am:
+        * examples/PluggableUDP/tests/Basic/Makefile.am:
+        * examples/PluggableUDP/tests/Makefile.am:
+        * examples/PluggableUDP/tests/Performance/Makefile.am:
+        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
+        * examples/Quoter/Makefile.am:
+        * examples/RTCORBA/Activity/Makefile.am:
+        * examples/RTCORBA/Makefile.am:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
+        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
+        * examples/RTScheduling/Makefile.am:
+        * examples/Simple/Makefile.am:
+        * examples/Simple/bank/Makefile.am:
+        * examples/Simple/chat/Makefile.am:
+        * examples/Simple/echo/Makefile.am:
+        * examples/Simple/grid/Makefile.am:
+        * examples/Simple/time-date/Makefile.am:
+        * examples/Simple/time/Makefile.am:
+        * examples/Simulator/Event_Supplier/Makefile.am:
+        * examples/Simulator/Makefile.am:
+        * examples/TypeCode_Creation/Makefile.am:
+        * examples/ior_corbaloc/Makefile.am:
+        * examples/mfc/Makefile.am:
+        * interop-tests/Makefile.am:
+        * interop-tests/wchar/Makefile.am:
+        * orbsvcs/examples/CosEC/Factory/Makefile.am:
+        * orbsvcs/examples/CosEC/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/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/Makefile.am:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am:
+        * orbsvcs/examples/CosEC/Simple/Makefile.am:
+        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
+        * orbsvcs/examples/FaultTolerance/Makefile.am:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
+        * orbsvcs/examples/ImR/Advanced/Makefile.am:
+        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
+        * orbsvcs/examples/ImR/Makefile.am:
+        * orbsvcs/examples/LoadBalancing/Makefile.am:
+        * orbsvcs/examples/Log/Basic/Makefile.am:
+        * orbsvcs/examples/Log/Event/Makefile.am:
+        * orbsvcs/examples/Log/Makefile.am:
+        * orbsvcs/examples/Log/Notify/Makefile.am:
+        * orbsvcs/examples/Log/RTEvent/Makefile.am:
+        * orbsvcs/examples/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/Agent/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/Gate/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/Makefile.am:
+        * orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am:
+        * orbsvcs/examples/Notify/Filter/Makefile.am:
+        * orbsvcs/examples/Notify/Lanes/Makefile.am:
+        * orbsvcs/examples/Notify/Makefile.am:
+        * orbsvcs/examples/Notify/Subscribe/Makefile.am:
+        * orbsvcs/examples/Notify/ThreadPool/Makefile.am:
+        * orbsvcs/examples/ORT/Makefile.am:
+        * orbsvcs/examples/RtEC/IIOPGateway/Makefile.am:
+        * orbsvcs/examples/RtEC/Kokyu/Makefile.am:
+        * orbsvcs/examples/RtEC/MCast/Makefile.am:
+        * orbsvcs/examples/RtEC/Makefile.am:
+        * orbsvcs/examples/RtEC/Schedule/Makefile.am:
+        * orbsvcs/examples/RtEC/Simple/Makefile.am:
+        * orbsvcs/examples/Security/Makefile.am:
+        * orbsvcs/examples/Security/Send_File/Makefile.am:
+        * orbsvcs/tests/Bug_2137_Regression/Makefile.am:
         * orbsvcs/tests/HTIOP/AMI/Makefile.am:
         * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
         * orbsvcs/tests/HTIOP/Hello/Makefile.am:
+        * orbsvcs/tests/HTIOP/Makefile.am:
         * orbsvcs/tests/IOR_MCast/Makefile.am:
         * orbsvcs/tests/ImplRepo/Makefile.am:
         * orbsvcs/tests/ImplRepo/NameService/Makefile.am:
         * orbsvcs/tests/ImplRepo/scale/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Makefile.am:
         * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
         * orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am:
         * orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am:
         * orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/Makefile.am:
         * orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am:
         * orbsvcs/tests/Interoperable_Naming/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am:
         * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
         * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.am:
         * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am:
         * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile.am:
-        * orbsvcs/tests/Log/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/Makefile.am:
         * orbsvcs/tests/Log/Basic_Log_Test/Makefile.am:
+        * orbsvcs/tests/Log/Makefile.am:
         * orbsvcs/tests/Miop/Makefile.am:
         * orbsvcs/tests/Miop/McastHello/Makefile.am:
-        * orbsvcs/tests/Notify/Makefile.am:
         * orbsvcs/tests/Notify/Basic/Makefile.am:
         * orbsvcs/tests/Notify/Blocking/Makefile.am:
         * orbsvcs/tests/Notify/Destroy/Makefile.am:
         * orbsvcs/tests/Notify/Discarding/Makefile.am:
         * orbsvcs/tests/Notify/Driver/Makefile.am:
         * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
+        * orbsvcs/tests/Notify/Makefile.am:
         * orbsvcs/tests/Notify/Ordering/Makefile.am:
         * orbsvcs/tests/Notify/PluggableTopology/Makefile.am:
         * orbsvcs/tests/Notify/RT_lib/Makefile.am:
@@ -1159,21 +15092,21 @@ Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
         * orbsvcs/tests/Notify/Test_Filter/Makefile.am:
         * orbsvcs/tests/Notify/XML_Persistence/Makefile.am:
         * orbsvcs/tests/Notify/lib/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Makefile.am:
         * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Makefile.am:
         * orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am:
         * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
         * orbsvcs/tests/Property/Makefile.am:
         * orbsvcs/tests/Redundant_Naming/Makefile.am:
         * orbsvcs/tests/Sched/Makefile.am:
         * orbsvcs/tests/Sched_Conf/Makefile.am:
-        * orbsvcs/tests/Security/Makefile.am:
         * orbsvcs/tests/Security/BiDirectional/Makefile.am:
         * orbsvcs/tests/Security/Big_Request/Makefile.am:
         * orbsvcs/tests/Security/Callback/Makefile.am:
         * orbsvcs/tests/Security/Crash_Test/Makefile.am:
         * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
         * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
+        * orbsvcs/tests/Security/Makefile.am:
         * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
         * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
         * orbsvcs/tests/Simple_Naming/Makefile.am:
@@ -1181,1213 +15114,5659 @@ Fri Apr 21 14:07:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
         * orbsvcs/tests/Trading/Makefile.am:
         * orbsvcs/tests/ior_corbaname/Makefile.am:
         * orbsvcs/tests/tests_svc_loader/Makefile.am:
-        * performance-tests/Makefile.am:
-        * performance-tests/Anyop/Makefile.am:
-        * performance-tests/CSD_Strategy/Makefile.am:
-        * performance-tests/CSD_Strategy/TestApps/Makefile.am:
-        * performance-tests/CSD_Strategy/TestInf/Makefile.am:
-        * performance-tests/CSD_Strategy/TestServant/Makefile.am:
-        * performance-tests/Callback/Makefile.am:
-        * performance-tests/Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/Makefile.am:
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
-        * performance-tests/Latency/Makefile.am:
-        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Latency/AMI/Makefile.am:
-        * performance-tests/Latency/Collocation/Makefile.am:
-        * performance-tests/Latency/DII/Makefile.am:
-        * performance-tests/Latency/DSI/Makefile.am:
-        * performance-tests/Latency/Deferred/Makefile.am:
-        * performance-tests/Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Memory/Makefile.am:
-        * performance-tests/Memory/IORsize/Makefile.am:
-        * performance-tests/Memory/Single_Threaded/Makefile.am:
-        * performance-tests/POA/Makefile.am:
-        * performance-tests/POA/Create_Reference/Makefile.am:
-        * performance-tests/POA/Demux/Makefile.am:
-        * performance-tests/POA/Implicit_Activation/Makefile.am:
-        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
-        * performance-tests/Pluggable/Makefile.am:
-        * performance-tests/Protocols/Makefile.am:
-        * performance-tests/RTCorba/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am:
-        * performance-tests/RTCorba/Oneways/Makefile.am:
-        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
-        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
-        * performance-tests/Sequence_Latency/Makefile.am:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/AMI/Makefile.am:
-        * performance-tests/Sequence_Latency/DII/Makefile.am:
-        * performance-tests/Sequence_Latency/DSI/Makefile.am:
-        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
-        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Throughput/Makefile.am:
+
+          Added.
+
+        * examples/AMI/FL_Callback/FL_Callback.mpc:
+        * examples/Advanced/ch_3/Advanced_ch_3.mpc:
+        * orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc:
+        * orbsvcs/examples/LoadBalancing/LoadBalancing.mpc:
+        * orbsvcs/examples/ORT/ORT.mpc:
+        * orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
+        * orbsvcs/tests/Notify/Blocking/Blocking.mpc:
+        * orbsvcs/tests/Notify/Discarding/Discarding.mpc:
+        * orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc:
+        * orbsvcs/tests/Notify/Ordering/Ordering.mpc:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc:
+        * orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc:
+        * orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
+        * orbsvcs/tests/Security/Big_Request/Big_Request.mpc:
+        * orbsvcs/tests/Security/Callback/Callback.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:
+        * performance-tests/Sequence_Latency/DII/DII.mpc:
+        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
+        * performance-tests/Sequence_Latency/Deferred/Deferred.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 Sep 22 15:12:12 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl:
+
+          Modified valuetype declartion used as a primary key to
+          conform to the CCM spec section 61.7.2.1 listing
+          constraints on primary key types.
+
+Thu Sep 22 08:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/POA/Loader/Server_Manager.cpp:
+        * examples/Quoter/Factory_Finder.cpp:
+        * tao/ImR_Client/ImplRepoC.*:
+        * tao/ImR_Client/ImplRepoS.*:
+        * tao/ImR_Client/ServerObjectC.*:
+        * tao/ImR_Client/ServerObjectS.*:
+        * tao/PortableServer/POA_Policy_Set.cpp:
+        * tao/PortableServer/Root_POA.inl:
+        * tests/AMH_Oneway/client.cpp:
+        * tests/POA/Default_Servant/Default_Servant.cpp:
+        * tests/RTScheduling/Thread_Cancel/test.cpp:
+        * utils/nslist/nsdel.cpp:
+          Emulated exceptions fixes
+
+        * tests/RTScheduling/Thread_Cancel/Thread_Cancel.mpc:
+          Removed empty lines
+
+        * tao/Codeset/Codeset_Manager_i.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.cpp:
+          Wchar fixes
+
+Thu Sep 22 08:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/POA/DSI/Server.cpp:
+          Emulated exceptions fixes
+
+        * tao/IIOP_Endpoint.cpp:
+        * tao/MCAST_Parser.cpp:
+        * tao/ORB_Core.cpp:
+          Wchar fixes
+
+Thu Sep 22 08:13:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/CallbackTest/Service.cpp:
+        * tests/CallbackTest/server.cpp:
+
+          Fixed compile errors.
+
+Wed Sep 21 08:06:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/CallbackTest/Callback.{h,cpp}:
+
+          Fixed compile errors.
+
+Tue Sep 20 17:23:37 2005  Arvind S. Krishna  <arvindk@doc.dre.vanderbilt.edu>
+
+        * tao/Connection_Handler.inl:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/PortableServer/Servant_Base.cpp:
+
+          Added hooks in the source file to enable aggressive
+          specialization of request processing in certain conditions.
+
+Tue Sep 20 21:18:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/IPV6/run_test.pl:
+
+          Added a test.
+
+Tue Sep 20 15:13:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/CallbackTest/CallbackTest.mpc:
+        * tests/CallbackTest/Callback{.h .cpp}:
+        * tests/CallbackTest/Test.idl:
+        * tests/CallbackTest/Service{.h .cpp}:
+        * tests/CallbackTest/client.cpp:
+        * tests/CallbackTest/server.cpp:
+        * tests/CallbackTest/run_test.pl:
+        * tests/CallbackTest/run_test_ipv6.pl:
+        * tests/CallbackTest/run_test_mixed_ip.pl:
+        * tests/CallbackTest/README:
+
+          Added new test.
+
+Tue Sep 20 08:39:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
+
+          Added IPV6 specific testscript.
+
+Tue Sep 20 08:32:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp:
+
+          Added some traces to be able to see testresult.
+
+        * orbsvcs/tests/IOR_MCast/run_test_ipv6.pl:
+
+          Added IPV6 specific testscript.
+
+Tue Sep 20 08:26:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/BiDirectional/run_test_ipv6.pl:
+
+          Added IPV6 specific testscript.
+
+Tue Sep 20 08:23:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/Invocation_Endpoint_Selectors.cpp:
+
+          Improvements for IPv6 support.
+
+Mon Sep 19 20:46:14 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp:
+
+          Removed run-time assertions.  They generally shouldn't be used
+          in infrastructure code. Favor returning and checking error
+          conditions and/or throwing exceptions instead.
+
+Mon Sep 19 16:14:09 2005  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp: Fixed the
+          initialization of the event_channel_ and typed_event_channel_
+          data members.  Thanks to Lukas Gruetzmacher
+          <gruetzmacher@ais-dresden.de> for reporting this and suggesting
+          the fix.
+
+Mon Sep 19 16:11:12 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_home.cpp:
+
+          Added missing check for null before enqueueing a primary
+          key valuetype into the queue to be checked after parsing.
+          If there is no primary key specified, we don't want to
+          enqueue a 0, since the queue will then be non-empty but
+          have no usable value to dequeue.
+
+Mon Sep 19 14:50:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * tests/Bug_2234_Regression/server.cpp:
+
+        Eliminate unused exception macros.
+
+Mon Sep 19 11:45:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
+
+        Corrected the correction due to non-standard MSVC name,
+        Thanks to Martin J.N. Corino for the correct interpretation.
+
+Mon Sep 19 10:15:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
+
+        Corrected typo at line 7 (#include "strstrea.h")
+
+Mon Sep 19 08:50:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * tests/Bug_2234_Regression/run_test.pl:
+
+        Forced commit for chmod permissions.
+
+Mon Sep 19 08:00:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * tests/Bug_2234_Regression/server.cpp:
+
+        Incorrect emulated exception call for init_orb.
+
+Fri Sep 16 15:12:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * test/IPV6/Hello.mpc:
+
+          Removed and replaced by:
+
+        * test/IPV6/IPV6_Hello.mpc:
+
+          Because MPC can't work with identically named .mpc files
+          even in separate directories:-(
+
+Fri Sep 16 12:45:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * tests/Bug_2234_Regression/server.cpp:
+
+        Emulated exception incorrect macro used line 681.
+
+Fri Sep 16 10:55:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * test/IPV6/Hello.mpc:
+        * test/IPV6/Hello{.h .cpp}:
+        * test/IPV6/client.cpp:
+        * test/IPV6/server.cpp:
+        * test/IPV6/Test.idl:
+        * test/IPV6/run_test.pl:
+        * test/IPV6/README:
+
+          Added new IPV6 specific test.
+
+Fri Sep 16 08:53:55 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp(lookup_cookie):
+
+          Changed creation of scoped name to use the member
+          UTL_Identifier for the "Components" module name,
+          instead of creating a new identifier.
+
+        * TAO_IDL/include/utl_err.h:
+        * TAO_IDL/util/utl_err.cpp:
+
+          - Changed existing error enum value from EIDL_ILLEGAL_VALUETYPE
+            to the more informative EIDL_ILLEGAL_BOXED_TYPE, which is
+            what this enum value is used to express.
+
+          - Added new error enum value EIDL_ILLEGAL_PRIMARY_KEY, to be
+            used in the check for illegal primary key described below.
+
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp:
+
+          Changed usage of EIDL_ILLEGAL_VALUETYPE to
+          EIDL_ILLEGAL_BOXED_TYPE.
+
+        * TAO_IDL/tao_idl.cpp:
+        * TAO_IDL/ast/ast_home.cpp:
+        * TAO_IDL/ast/ast_structure.cpp:
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/ast/ast_union.cpp:
+        * TAO_IDL/ast/ast_valuetype.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/include/ast_type.h:
+        * TAO_IDL/include/ast_union.h:
+        * TAO_IDL/include/ast_valuetype.h:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/util/utl_global.cpp:
+
+          Added check for illegal usage of a valuetype as a primary key.
+          The CCM spec puts several constraints on valuetypes that are
+          used as primary keys, and making sure these constaints are
+          satisfied requires checking the valuetype's inheritance
+          graph, as well as recursively checking its members. Valuetypes
+          used as primary keys are place in a list, and the list is
+          checked after all parsing has finished, so that we can be
+          sure all forward declared structs and unions have been
+          fully defined.
+
+Thu Sep 15 15:54:24 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
         * tao/Makefile.am:
-        * utils/Makefile.am:
-        * utils/catior/Makefile.am:
-        * utils/nslist/Makefile.am:
 
-          Regenerate with latest MPC and *.mpc/*.mpb changes.
+          Regenerated.
 
-Fri Apr 21 09:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/tao.mpc:
 
-        * tao/Transport_Connector.cpp:
-          Removed the fix for bug 2417, according to the test stats things
-          didn't got fixed.
+          Added WrongTransactionS.h to Header_Files.
 
-Fri Apr 21 08:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Sep 15 15:25:06 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/String_Traits_Base_T.h:
-          Disabled the warning when wchar_t is not a native type. This
-          makes the vxworks logs unreadable.
+        * orbsvcs/orbsvcs/Makefile.am:
 
-Fri Apr 21 08:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Regenerated.
 
-        * orbsvcs/tests/Trading/TTest.idl:
-          Use the CORBA predefined sequence types
+        * orbsvcs/orbsvcs/CosNaming_Serv.mpc:
 
-Fri Apr 21 07:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added Naming/nsconf.h to Header_Files.
 
-        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl:
-        * orbsvcs/orbsvcs/Notify/ETCL_Filter.h:
-        * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
-        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
-        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
-        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
-        * tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp:
-          Removed usage of ACE_NESTED_CLASS
+Thu Sep 15 14:04:28 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-Thu Apr 20 14:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+          (dispatch):
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+          (dispatch):
+
+          Removed unnecessary exception specification.  It prevented user
+          exceptions from being propagated to the caller.  Thanks to David
+          Carlton <david dot carlton at sun dot com> for reporting the
+          problem and to Johnny Willemsen for suggesting a fix.
+
+Thu Sep 15 12:42:34 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated.
+
+Thu Sep 15 14:16:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * tests/Bug_2234_Regression/server.cpp:
+
+        Emulated exception incorrect macro used line 118/156.
+
+Wed Sep 14 10:34:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * tests/Bug_2234_Regression/server.cpp:
+
+        Correct another minor fussy compiler gripe.
+
+Wed Sep 14 09:45:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * tests/Bug_2234_Regression/client.cpp:
+        * tests/Bug_2234_Regression/server.cpp:
+
+        Correct minor fussy compiler gripes for some gcc platforms.
+
+Wed Sep 14 08:41:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
+
+        Fixed compile error.
+
+Tue Sep 13 11:43:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * examples/Advanced/ch_3/client.cpp:
+        * examples/Advanced/ch_3/server.cpp:
+        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
+        * tests/Bug_1639_Regression/struct_client.cpp:
+
+        Fixed for environments defining ACE_USES_OLD_IOSTREAMS
+        (which unfortunately is the case for Windows x64 at the
+        moment due to shortcomings in the Platform SDK).
+
+Tue Sep 13 10:30:00 UTC 2005  Simon Massey  <sma@prismtech.com>
+
+        * tao/AnyTypeCode/Any.cpp:
+
+        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+
+        * tests/Bug_2234_Regression/Bug_2234_Regression.mpc:
+        * tests/Bug_2234_Regression/Test.idl:
+        * tests/Bug_2234_Regression/client.cpp:
+        * tests/Bug_2234_Regression/run_test.pl:
+        * tests/Bug_2234_Regression/server.cpp:
+
+        This fixes bug 2234.
+        The Portiable Interception call to arguments() attempts to create
+        a read-only copy of all arguments passed into the current method.
+        Unfortunatly during the call to receive_request() the "out" args
+        of variable length types have not yet been allocated by the server
+        and so are NULL pointers. A deep copy was being attempted which
+        de-referenced these NULLs causing a crash. Explicit NULL checks
+        are now performed for these types and a NULL pointer to the type
+        is placed into the arg list instead.
+
+Tue Sep 13 10:18:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Portable_Interceptors/Bug_1559/run_test.pl:
+        * tests/Portable_Interceptors/Dynamic/run_test.pl:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl:
+        * tests/RTCORBA/Persistent_IOR/run_test.pl:
+
+        Removed '-ORBObjRefStyle url' switch because it causes problems with IPv6
+        builds and is not essential to the tests.
+
+        * tests/Hang_Shutdown/server.cpp:
+        * tests/Hang_Shutdown/client.cpp:
+
+        Adjusted test timeouts because they were a little too tight for
+        Windows/IPv6 environment.
+
+Mon Sep 12 11:52:22 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerate.
+
+Mon Sep 12 11:34:13 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tao/orb.idl:
+
+          Had left fix commented out in Fri Sep  9 11:08:40 2005  Simon McQueen.
+
+Fri Sep  9 22:00:24 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_array.cpp:
+        * TAO_IDL/ast/ast_field.cpp:
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/ast/ast_sequence.cpp:
+        * TAO_IDL/ast/ast_structure.cpp:
+        * TAO_IDL/ast/ast_type.cpp:
+        * TAO_IDL/ast/ast_typedef.cpp:
+        * TAO_IDL/ast/ast_union.cpp:
+        * TAO_IDL/ast/ast_valuetype.cpp:
+        * TAO_IDL/include/ast_array.h:
+        * TAO_IDL/include/ast_field.h:
+        * TAO_IDL/include/ast_interface.h:
+        * TAO_IDL/include/ast_sequence.h:
+        * TAO_IDL/include/ast_structure.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:
+
+          - Added virtual legal_for_primary_key() method to AST_Type
+            plus overrides for derived node classes AST_Sruct,
+            AST_Union, AST_Array, AST_Sequence, AST_Typedef,
+            AST_Interface, and AST_Valuetype. The override in
+            AST_Valuetype is empty at this time, but when finished,
+            the method will be called on a valuetype when it is used
+            as a primary key of a component. The method will check
+            the various constraints put on valuetypes used as
+            primary keys by the CCM spec. It will, among other
+            things, be called recursively on the valuetype's members.
+
+          - Made some accessor methods, such as base_type() and
+            field_type(), const.
+
+Fri Sep  9 11:08:40 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tao/orb.idl:
+
+          Add include of WrongTransaction.pidl.
+
+        * tao/WrongTransaction.pidl:
+
+          Update generation instructions.
+
+        * tao/WrongTransactionS.h:
+        * tao/WrongTransactionS.inl:
+
+          Add these new 'handcrafted' files. These changes fix
+          bug #1813.
+
+        * tests/Bug_1813_Regression/Bug_1813_Regession.mpc:
+        * tests/Bug_1813_Regression/Test.idl:
+        * tests/Bug_1813_Regression/test.cpp:
+
+          Regression test for the above.
+
+Fri Sep  9 10:28:11 2005  Simon McQueen  <sm@prismtech.com>
+
+        * tao/orb.idl:
+
+          Add ValueFactory to CORBA module. Fixes bug #1812.
+
+        * tests/Bug_1812_Regression/Bug_1812_Regession.mpc:
+        * tests/Bug_1812_Regression/Test.idl:
+        * tests/Bug_1812_Regression/test.cpp:
+
+          Regression test for the above.
+
+Thu Sep  8 16:39:10 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/extra_core.mpb:
         * tao/tao.mpc:
-          Moved ServicesC.cpp to tao.mpc
 
-Thu Apr 20 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added AnyTypeCode_Adapter.h and Any_Insert_Policy_T.h
+          to list of Header_Files.
 
-        * tao/Bounded_Sequence_CDR_T.h:
-        * tao/Unbounded_Sequence_CDR_T.h:
-          Include orbconf.h instead of one of the sequence header files
+Wed Sep  7 15:54:08 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-Thu Apr 20 13:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/Makefile.am:
 
-        * tao/Asynch_Reply_Dispatcher_Base.{h,cpp}:
-        * tao/ObjectKey_Table.cpp:
-        * tao/Refcounted_ObjectKey.{h,cpp,inl}:
-          Made the refcounts CORBA::ULong and only return the refcount
-          from the incr/decr methods when really needed, using the refcount
-          form external is always tricky. Fixes bugzilla bug 2505.
+          Regenerated.
 
-Thu Apr 20 12:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Sep  7 11:47:35 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 
-        Integrated ondemand branch to cvs head. This makes an ondemand write
-        possible. The user specified maximum is at this moment not a hard
-        maximum, it is more an indication how large the GIOP fragments
-        should become, we can send out smaller and larger fragments if needed.
+        * tao/IIOP_Acceptor.cpp:
 
-        * tao/tests/Ondemand_Write/*:
-          New test
+          Marker modified for the specializations to work properly.
 
-        Mon Apr  3 12:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Sep  6 15:54:57 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * tao/On_Demand_Fragmentation_Strategy.cpp:
-          Print the debug message after we padded it so that sizes do match
-          in the logs
+        * tests/Bug_2222_Regression/test.cpp:
 
-        * tao/GIOP_Message_Base.cpp:
-          For fragments also retrieve the request/reply id
+          Fixed unused argument warnings.
 
-        * tests/Ondemand_Write:
-          Simple test for ondemand write, needs now inspection of output to
-          check if things work ok
+        * tests/DynAny_Test/test_dynany.cpp:
+        * tests/DynAny_Test/test_dynunion.cpp:
 
-        Mon Apr  3 07:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          More include directive reordering to address g++ 3.4 order of
+          parsing template related errors.
 
-        * tao/CDR.h:
-          Commented out write_octet_array decleration, there is no
-          implementation yet.
+Tue Sep  6 15:40:17 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        Thu Mar 30 13:02:18 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+        * TAO_IDL/be/be_codegen.cpp (gen_stub_src_includes):
 
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
-          Added the missing transport parameter to the TAO_GIOP_Message_Base
-          constructor.
+          Reordered include directives to address CORBA::AbstractBase
+          order of parsing related template compile-time errors with g++
+          3.4 or better and some HP compilers.
 
-        Thu Mar 30 12:41:17 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+Tue Sep  6 17:26:39 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 
-        * tao/CDR.cpp:
-        * tao/On_Demand_Fragmentation_Strategy.cpp:
+        * tao/Endpoint.h
 
-          Fixed checks for return values.
+          Accidentally committed a file with the instrumented
+          code. Reverted this and updated the markers.
 
-        Wed Mar 22 20:13:22 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
+Tue Sep  6 16:12:04 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 
-        * tao/Messaging/Asynch_Invocation.cpp (remote_invocation):
+        * tao/Connection_Handler.cpp:
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Connector.h:
+        * tao/IIOP_Endpoint.h:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Profile.h:
+        * tao/Transport.h:
+        * tao/Transport_Acceptor.h:
 
-          Added missing GIOP fragmentation support.
+          The markers in these files accidentally includes the destructor
+          which conflicts with the base class.
 
-        Wed Mar 22 13:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Sep  6 13:29:04 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
 
-        * tao/ORB_Core.h:
-          Fixed warning of the Intel compiler
+        * tao/IIOP_Endpoint.h:
+        * tao/IIOP_Profile.h:
+        * tao/Transport_Acceptor.h:
+        * tao/Profile.h:
 
-        Wed Mar 22 01:33:47 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Updated marker names as there was a mismatch in the code based
+          and the specialization files.
+
+Tue Sep  6 10:33:09 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/examples/ORT/Gateway_i.h:
+
+          Added "AnyTypeCode_methods.h" include directive as a temporary
+          work around for g++ 3.4 or better and some HP compiler order of
+          parsing template related issues.
+
+Tue Sep  6 11:32:31 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
+
+        * tao/Connection_Handler.h:
+        * tao/Connection_Handler.cpp:
+        * tao/IIOP_Connection_Handler.h:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/Transport.h:
+        * tao/Transport.cpp:
+        * tao/IIOP_Transport.h:
+        * tao/IIOP_Transport.cpp:
+        * tao/Endpoint.h:
+        * tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Endpoint.h:
+        * tao/Profile.h:
+        * tao/IIOP_Profile.h:
+        * tao/Profile.cpp:
+        * tao/IIOP_Profile.h:
+        * tao/Transport_Acceptor.h:
+        * tao/Traport_Acceptor.cpp:
+        * tao/IIOP_Acceptor.h:
+        * tao/IIOP_Connector.h:
+        * tao/IIOP_Connector.cpp:
+        * tao/Transport_Connector.h:
+        * tao/Transport_Connector.cpp:
+
+          Added markers within the Pluggable protocols frameworks for
+          specializing the implementation with a concrete protocol
+          implementation, e.g., iiop.
+
+Mon Sep  5 12:11:28 2005  Simon McQueen  <sm@prismtech.com>
+
+        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
+
+          Only omit generating the copy, dup, alloc & free operations
+          if the typedef is imported. This fixes bugzilla #2222.
+
+        * tests/Bug_2222_Regression/Bug_2222_Regression.mpc:
+        * tests/Bug_2222_Regression/TestCase.idl:
+        * tests/Bug_2222_Regression/TestType.idl:
+        * tests/Bug_2222_Regression/test.cpp:
+
+          Regression test for the above.
+
+Fri Sep 02 13:21:30 2005  Gary Maxey  <gary.maxey@hp.com>
+
+        * performance-tests/Callback/Callback_i.cpp:
+        * performance-tests/Latency/DII/client.cpp:
+        * performance-tests/Latency/Deferred/client.cpp:
+        * performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp:
+        * performance-tests/Latency/Thread_Pool/Client_Task.cpp:
+        * performance-tests/POA/Demux/demux_test_client.cpp:
+        * performance-tests/Sequence_Latency/DII/client.cpp:
+        * performance-tests/Sequence_Latency/Deferred/client.cpp:
+        * performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp:
+          Used ACE_hrtime_t and ACE_HRTIME_TO_U64 macro for platform
+          independence.
+
+Fri Sep  2 12:51:23 2005  Ciju John  <john_c@ociweb.com>
+
+        * tests/Big_Request_Muxing/Payload_Receiver.h:
+        * tests/Big_Request_Muxing/Payload_Receiver.cpp
+        * tests/Big_Request_Muxing/run_test.pl
+        * tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+        * tests/Big_Request_Muxing/Client_Task.cpp
+
+        Added AnyTypeCode includes. Removed msvc checks. VxWorks fixes.
+
+Fri Sep  2 11:05:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/MCAST_Parser.cpp:
+          Small change concerning IPv6 multicast support.
+
+Fri Sep  2 09:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Array_VarOut_T.inl:
+          Reverted a C++ cast back to a c-style cast, vc6 can't handle
+          the C++ cast. Added a remark that we can use a C++ cast when
+          vc6 has been dropped
+
+Thu Sep  1 16:56:12 2005  Ciju John  <john_c@ociweb.com>
+
+        * tests/Big_Request_Muxing/*
+          Brought in OCI modified tests.
+
+        Wed Jul 13 09:57:17 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Big_Request_Muxing/run_test.pl:
+
+          Added a separator between tests to aid in debugging.
+
+        Tue Jul  5 07:31:33 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Big_Request_Muxing/server.cpp:
+
+          Added includes for inline=0 builds.
+
+        Wed Jun 29 14:35:36 2005  Justin Michel  <michel_j@ociweb.com>
+
+        * tests/Big_Request_Muxing/client.cpp:
+        * tests/Big_Request_Muxing/run_test.pl:
+        * tests/Big_Request_Muxing/server.cpp:
+
+          This test was destroying the orb before the orb was
+          finished sending requests. The test still fails intermittently,
+          because sometimes events are lost. I tried changing SYNC_NONE to
+          SYNC_WITH_TRANSPORT, but this didn't help. This may be a real
+          TAO bug. I changed the run_test.pl to run more iterations so
+          that the bug should happen more often.
+
+        Tue Jun 28 08:46:29 2005  Justin Michel  <michel_j@ociweb.com>
+
+        * tests/Big_Request_Muxing/Client_Task.cpp:
+        * tests/Big_Request_Muxing/Payload_Receiver.h:
+        * tests/Big_Request_Muxing/Payload_Receiver.cpp:
+        * tests/Big_Request_Muxing/client.cpp:
+        * tests/Big_Request_Muxing/run_test.pl:
+        * tests/Big_Request_Muxing/server.cpp:
+
+          Changed the way the test works so that it prints an
+          error if too many messages are received. Added a -e parameter
+          when starting the server in the run_test.pl to expect the
+          correct number of events when running multiple clients. Added
+          additional debugging output. Changed the default number of
+          events from 12000 to 1200 to make the test run faster.
+
+        Mon Jun 27 12:15:31 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Big_Request_Muxing/client.cpp:
+
+          This test was changed a while back to decrease the
+          amount of time it takes to run.  However, a time value of 2
+          miniutes was overlooked (and was causing problems during test
+          shutdown).  I have changed it to be 10 seconds.
+
+        Sat Jun 25 14:30:34 2005  Justin Michel  <michel_j@ociweb.com>
+
+        * tests/Big_Request_Muxing/Client_Task.h:
+        * tests/Big_Request_Muxing/Client_Task.cpp:
+        * tests/Big_Request_Muxing/Payload_Receiver.h:
+        * tests/Big_Request_Muxing/Payload_Receiver.cpp:
+        * tests/Big_Request_Muxing/Test.idl:
+        * tests/Big_Request_Muxing/client.cpp:
+        * tests/Big_Request_Muxing/run_test.pl:
+        * tests/Big_Request_Muxing/server.cpp:
+
+          Changed the processes in this test to actually wait for
+          the test to complete instead of simply running for two minutes.
+
+Thu Sep  1 19:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Event_Service/Event_Service.{h,cpp}:
+          Restored -n to the original behaviour, it is the name that will
+          be used to register to the naming service. With the new option
+          -x we can indicate that the event service shouldn't register
+          with the naming service. This is just as the other orbsvcs,
+          thanks to JT for indicating this.
+
+        * docs/ec_options.html:
+          Updated
+
+Thu Sep  1 16:54:53 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_interface_strategy.cpp:
+
+          Fixed typo in comment.
+
+        * TAO_IDL/be/be_interface.cpp (gen_stub_ctor):
+
+          Fixed order of generated base class stub constructor calls
+          when the interface has both concrete and abstract parents.
+
+        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp (visit_interface):
+        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+
+          Disabled all AMH-related code generation for interfaces that
+          have an abstract ancestor. The AMH_-prefixed
+          classes have an inheritance structure that reflects that of
+          the corresponding IDL interfaces. This poses a problem
+          when the interface has an abstract ancestor, since no skeleton
+          code is generated for abstract interfaces.
+
+        * tests/IDL_Test/fwd.idl:
+
+          Just after an interface with a concrete and an abstract parent,
+          added another interface with the same parents in reverse order.
+          This change is to test the order of generated base class stub
+          constructor calls in the stub inline file.
+
+Thu Sep 01 08:30:31 2005  Gary Maxey  <gary.maxey@hp.com>
+
+        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
+          Add extra underscore in generated names to help reduce conflicts
+          with user supplied names.
+
+Thu Sep  1 14:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Event_Service/Event_Service.{h,cpp}:
+          Made it possible to just pass -n to indicate that no service
+          name should be used. At that moment the Event_Service will not
+          register itself with the naming service. If also the default
+          scheduling service option (none) is used, then the naming
+          service is not used at all. This is usefull for systems where
+          the Event_Service is with the option to write the IOR to file,
+          then the user doesn't need the naming service.
+
+        * docs/ec_options.html:
+          Documentated the commandline options of the Event_Service executable
+
+Thu Sep  1 10:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/MCAST_Parser.cpp:
+        * tao/params.cpp:
+        * tao/Transport_Connector.cpp:
+          Fixed 64bit conversion warnings
+
+Thu Sep  1 09:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.{h,cpp}:
+          Fixed gcc4 compile errors
+
+Thu Sep  1 08:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_interface.cpp:
+          Fixed variable not used warning
+
+Thu Sep  1 07:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/CDR.cpp:
-        * tao/CDR.h:
-        * tao/CDR.i:
-        * tao/GIOP_Message_Base.cpp:
-        * tao/GIOP_Message_Base.h:
-        * tao/GIOP_Message_Generator_Parser.h:
-        * tao/GIOP_Message_Generator_Parser_10.cpp:
-        * tao/GIOP_Message_Generator_Parser_10.h:
-        * tao/GIOP_Message_Generator_Parser_12.cpp:
-        * tao/GIOP_Message_Generator_Parser_12.h:
-        * tao/GIOP_Message_Lite.cpp:
-        * tao/GIOP_Message_Lite.h:
-        * tao/ORB_Core.cpp:
-        * tao/On_Demand_Fragmentation_Strategy.cpp:
-        * tao/Pluggable_Messaging.h:
-        * tao/Remote_Invocation.cpp:
-        * tao/Synch_Invocation.cpp:
-        * tao/TAO_Server_Request.cpp:
         * tao/default_resource.cpp:
-        * tao/PortableServer/Upcall_Wrapper.cpp:
+          Use the new ACE_REMOVE_SERVICE_DIRECTIVE macro to remove the
+          TAO_CodeSet. Thanks to Lothar Werzinger <lothar at xcerla dot com>
+          for reporting this. This fixes bugzilla bug 2227
+
+Wed Aug 31 21:49:41 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Added remaining code necessary to send fragments through the
-          underlying transport.
+        * tests/IDL_Test/fwd.idl:
 
-          Added missing outgoing GIOP reply fragment support.
+          Added simple test case to reproduce the situation described
+          below in
 
-        Tue Mar 21 22:18:45 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
+          Wed Aug 31 21:19:41 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>.
+
+Wed Aug 31 21:19:41 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+
+          Removed some unnecessary code.
+
+        * TAO_IDL/be/be_interface.cpp (redefine):
+
+          Changed the method to handle the use case where an interface
+          with one or more abstract parents has been forward declared,
+          then fully defined. The IDL compiler maintains an internal
+          queue of interfaces with mixed (abstract and concrete)
+          parentage, in order to generate overloads of CORBA::release()
+          and CORBA::is_nil(). The process of full definition after
+          forward declaration ends up deleting the node that has
+          been put in the queue (just after redefine() returns), so
+          we now update the queue inside the redefine() method. Thanks
+          to Paul Friberg <p.friberg@isti.com> for providing the
+          sample IDL that uncovered the bug.
+
+Wed Aug 31 18:24:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
         * docs/Options.html:
+          Corrected description of option ORBUseSharedProfiles which in
+          reality is 'ORBUseSharedProfile' (without the 's') and by
+          is *disabled* instead of enabled!
 
-          Document new "-ORBMaxMessageSize" ORB option.
+Wed Aug 31 11:53:51 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        Tue Mar 21 15:16:43 UTC 2006  Ossama Othman  <ossama@dre.vanderbilt.edu>
+        * tests/Any/Recursive/NonRecursive.idl:
+        * tests/Any/Recursive/RecursiveHello.mpc:
 
-        * tao/GIOP_Message_Base.cpp (set_giop_flags):
+          New IDL containing non-recursive structures that triggered the
+          TAO_IDL recursive type false positive problem described in bug
+          2225.  This IDL will be used to prevent such problems from being
+          reintroduced.  Thanks to Bruce MacDonald
+          <brucemac at netcomuk dot co dot uk> for supplying this IDL.
 
-          Cast CDR stream buffer to an array of octets.
+Wed Aug 31 10:53:06 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * tao/GIOP_Message_Base.h (set_giop_flags):
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp:
 
-          Added missing method declaration.
+          Fixed false positive recursion detection by using Jeff's existing
+          type-specific in_recursion() method.  Thanks to Jeff for
+          explaining how to use that method.  [Bug 2225]
 
-        * tao/Resource_Factory.h (fragmentation_strategy):
-        * tao/default_resource.cpp:
-        * tao/default_resource.h:
+Wed Aug 31 13:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Made factory method name consistent with existing naming
-          convention, i.e. create_fragmentation_strategy().
+        * tao/AnyTypeCode/TypeCode.h:
+          Export the unaliased_kind method
 
-          Corrected return value.  It should have been
-          auto_ptr<TAO_GIOP_Fragmentation_Strategy>, not
-          TAO_GIOP_Fragmentation_Strategy *.
+Wed Aug 31 13:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/IIOP_Transport.cpp:
+        * tao/BooleanSeqC.{h,cpp}:
+        * tao/CharSeqC.{h,cpp}:
+        * tao/DoubleSeqC.{h,cpp}:
+        * tao/FloatSeqC.{h,cpp}:
+        * tao/AnyTypeCode/BooleanSeqA.{h,cpp}:
+        * tao/AnyTypeCode/CharSeqA.{h,cpp}:
+        * tao/AnyTypeCode/DoubleSeqA.{h,cpp}:
+        * tao/AnyTypeCode/FloatSeqA.{h,cpp}:
+          Regenerated
+
+Wed Aug 31 12:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode.{h,cpp,inl}:
+          Moved unaliased_kind to the cpp file, it uses a TypeCode_var
+          which requires again the TypeCode_methods which causes issues
+          with GCC4
+
+Wed Aug 31 12:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/corba.h:
+          Removed include of AnyTypeCode/TypeCode.h
+
+        * tao/Exception.h:
+          Removed _tc_exception_type
+
+        * tao/Exception_Data.h:
+          Added forward declaration CORBA::TypeCode_ptr
+
+        * tao/Profile.h:
+          Removed not needed forward declarations
+
+Wed Aug 31 11:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/IFR_Service/be_global.h:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h:
+          Fixed GCC4 error
+
+        * tao/TypeCode.cpp:
+          Removed this file, it shouldn't be in the archive anymore
+
+        * tao/Environment.i (_nil):
+          Use a static cast instead of a c-style cast
+
+        * tao/Object.{cpp,i} (is_nil):
+          Use true/false instead of 1/0
+
+        * tao/AnyTypeCode/TC_Constants_Forward.h:
+          Added forward declaration of TypeCode
+
+Wed Aug 31 11:21:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/IFR_Service/IFR_Service.h:
+          Fixed GCC4 error
+
+        * tao/ULongSeq.pidl:
+          Updated regeneration instructions
+
+        * tao/ULongSeqC.{h,cpp}:
+        * tao/AnyTypeCode/ULongSeqA.{h,cpp}:
+          Regenerated without patching.
+
+Wed Aug 31 10:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/WStringSeq.pidl:
+        * tao/WCharSeq.pidl:
+          Updated regeneration instructions
+
+        * tao/WStringSeqC.{h,cpp}:
+        * tao/WCharSeqC.{h,cpp}:
+        * tao/AnyTypeCode/WStringSeqA.{h,cpp}:
+        * tao/AnyTypeCode/WCharSeqA.{h,cpp}:
+          Regenerated without patching.
+
+Wed Aug 31 10:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Notify_Service/Notify_Server.cpp
+        * orbsvcs/Notify_Service/Notify_Service.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+        * orbsvcs/tests/Notify/Driver/main.cpp
+        * orbsvcs/tests/Time/Client_i.cpp
+        * tao/AnyTypeCode/append.cpp
+        * tao/DynamicAny/DynStruct_i.cpp
+        * tao/DynamicAny/DynUnion_i.cpp
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+        * tao/PortableServer/Default_Servant_Dispatcher.cpp
+        * tao/PortableServer/LifespanStrategyPersistent.cpp
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp
+        * tao/RTCORBA/RT_Endpoint_Utils.cpp
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+        * tests/Exposed_Policies/Policy_Verifier.cpp
+        * tests/MProfile_Connection_Timeout/client.cpp
+        * tests/NestedUpcall/MT_Client_Test/server.cpp
+        * tests/NestedUpcall/Triangle_Test/server_B.cpp
+        * tests/ORT/ServerRequestInterceptor.cpp
+        * tests/Policies/Manipulation.cpp
+        * tests/Portable_Interceptors/Benchmark/client.cpp
+          Fixed emulated exception fuzz errors
+
+Wed Aug 31 09:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:
+          Replaced deprecated ACE cast macro
+
+Wed Aug 31 09:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+          Reordered includes to fix vc71 link warnings
+
+Tue Aug 30 17:05:11 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+Tue Aug 30 16:30:30 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Notify_Service/Notify_Service.cpp (shutdown):
+
+          Removed code that abuses ._retn() to release orb, poa,
+          naming context, etc.  This may have been done because
+          the driver class was previously a file-scope static,
+          but now that it's allocated on the stack within main()
+          we can let the destructor release these variables.
+
+Tue Aug 30 16:09:53 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Notify_Service/Notify_Server.cpp:
+
+          Removed extraneous ACE_DEBUG().
+
+Tue Aug 30 15:56:49 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Notify_Service/Notify_Server.cpp:
+
+          Changed to add support for clean shutdown with SIGINT/SIGTERM
+          using the Service_Shutdown class from the Svc_Utils library.
+
+Tue Aug 30 12:42:18 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp:
+
+          Removed inclusion of .i files to complete my earlier commit.
+
+Tue Aug 30 11:22:51 2005  Steve Totten  <totten_s@ociweb.com>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+        * tests/IDL_Test/array_only.idl:
+          Added a test for the IDL compiler to make sure code generated for
+          an IDL file that contains nothing but an array definition will
+          compile correctly.  Thanks to Yevgen Galchenko for supplying the
+          test case.
+
+Tue Aug 30 10:03:24 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:
+
+          Fixed errors in Fuzz build and use of deprecated ACE cast macros
+
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.i:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.i:
+
+          Removed these b/c they're empty and fix a fuzz build.
+
+Tue Aug 30 14:43:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * docs/Options.html:
+          Added docu for new IPv6 specific options (ORBPreferIPV6Interfaces and
+          ORBConnectIPV6Only).
+
+Tue Aug 30 14:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+        * examples/RTCORBA/Activity/Activity.cpp
+        * examples/RTCORBA/Activity/Task_Stats.cpp
+        * orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+        * orbsvcs/Event_Service/Event_Service.cpp
+        * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+        * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+        * 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/Naming_Service/Naming_Server.cpp
+        * orbsvcs/Naming_Service/Naming_Service.cpp
+        * orbsvcs/Notify_Service/Notify_Server.cpp
+        * orbsvcs/Notify_Service/Notify_Service.cpp
+        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+        * orbsvcs/Time_Service/Clerk_i.cpp
+        * orbsvcs/Time_Service/Server_i.cpp
+        * orbsvcs/Trading_Service/Trading_Service.cpp
+        * orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+        * orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+        * orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+        * orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp
+        * orbsvcs/orbsvcs/Sched/Scheduler.cpp
+        * orbsvcs/orbsvcs/Trader/Trader.cpp
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
+        * orbsvcs/tests/FtRtEvent/consumer.cpp
+        * orbsvcs/tests/FtRtEvent/supplier.cpp
+        * orbsvcs/tests/Notify/Destroy/main.cpp
+        * orbsvcs/tests/Notify/Driver/main.cpp
+        * orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+        * orbsvcs/tests/Notify/lib/Command.cpp
+        * orbsvcs/tests/Notify/lib/Driver.cpp
+        * orbsvcs/tests/Redundant_Naming/client.cpp
+        * tao/CORBALOC_Parser.cpp
+        * tao/IIOP_Connection_Handler.cpp
+        * tao/IIOP_Profile.cpp
+        * tao/MCAST_Parser.cpp
+        * tao/ORB_Core.cpp
+        * tao/default_client.cpp
+        * tests/MProfile_Connection_Timeout/client.cpp
+          Replaced ACE_LIB_TEXT with ACE_TEXT. ACE_LIB_TEXT is only for in the
+          ACE lib itself.
+
+Tue Aug 30 14:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
+          Fixed export macro
+
+Tue Aug 30 06:42:46 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp:
+
+          Fix emulated exception builds.
+
+Tue Aug 30 13:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Param_Test/server.cpp:
+        * tests/Param_Test/except.cpp:
+        * tests/Faults/test_i.cpp:
+        * tests/Faults/ping.cpp:
+        * tests/AMI_Timeouts/timeout_client.cpp:
+        * tests/InterOp-Naming/Server_i.cpp:
+        * tests/Bug_1476_Regression/Client_Task.cpp:
+        * tests/Bug_1482_Regression/Reply_Handler.cpp:
+        * tests/Big_Oneways/Session.cpp:
+          Fixed emulated exception fuzz errors
+
+Tue Aug 30 13:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PolicyS.cpp:
+          Regenerated this file and merged some of the changes caused by that,
+          especially the include order
+
+Tue Aug 30 12:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/util/utl_global.cpp:
+          Fixed hasspace implementation, if an empty string was passed the
+          function would loop forever. Also a space as second last character
+          in the string wasn't detected
+
+Tue Aug 30 10:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Time_Service/Server_i.cpp:
+          Fixed compilation problem with emulated exceptions
+
+Tue Aug 30 09:12:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/CORBALOC_Parser.cpp:
+        * IIOP_Acceptor.cpp:
+        * IIOP_Connection_Handler.cpp:
+        * IIOP_Connector.cpp:
+        * IIOP_Endpoint{.h .cpp. i}:
+        * IIOP_Profile.cpp:
+        * IIOP_Transport.cpp:
+        * Invocation_Endpoint_Selectors.cpp:
+        * MCAST_Parser.cpp:
+        * orbconf.h:
+        * ORB_Core.cpp:
+        * params{ .h .cpp}:
+        * orbsvcs/orbsvcs/IOR_Multicast.cpp:
+
+          Added IPv6 support for TAO.
+
+Tue Aug 30 06:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+          Fixed pragma once is obsolete warning
+
+Tue Aug 30 01:20:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp (queue_full_action):
+
+          Fixed "'*/' found outside of comment" warning.
+
+Mon Aug 29 18:39:29 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/AV/AV_Core.h:
+        * orbsvcs/orbsvcs/AV/Policy.cpp::
+        * orbsvcs/orbsvcs/AV/Protocol_Factory.h::
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h::
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h::
+        * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h::
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h::
+        * 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_Pulling_Strategy.cpp::
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp::
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h::
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h::
+        * orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp::
+        * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp::
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp::
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp:
+        * orbsvcs/orbsvcs/Log/LogActivator.h:
+        * orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h:
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp:
+        * orbsvcs/orbsvcs/Notify/Builder.h:
+        * orbsvcs/orbsvcs/Notify/POA_Helper.h:
+        * orbsvcs/orbsvcs/Notify/Properties.h:
+        * orbsvcs/orbsvcs/Notify/Timer.h:
+        * orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h:
+        * 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_Profile.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp:
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.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.
+
+Mon Aug 29 18:45:49 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
+
+        * tao/Wait_On_Read.cpp:
+        * tao/Wait_Strategy.cpp:
+
+          Added makers that aid in specializing the wait strategy
+          implementation in TAO.
+
+Mon Aug 29 14:08:42 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
+
+        * tao/GIOP_Message_Base.h:
+        * tao/Strategies/UIOP_Transport.cpp:
         * tao/Strategies/DIOP_Transport.cpp:
-        * tao/Strategies/SCIOP_Transport.cpp:
         * tao/Strategies/SHMIOP_Transport.cpp:
-        * tao/Strategies/UIOP_Transport.cpp:
-        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
 
-          The TAO_GIOP_Message_Base constructor now accepts a pointer to
-          TAO_Transport parameter.  Updated constructor call accordingly.
+          Added markers that aid in specializing TAO's pluggable messaging
+          implementation with either GIOP or GIOP_Lite when the type of
+          messaging object is known a priori.
+
+Mon Aug 29 12:08:16 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp:
+
+          Changed to clarify error message output when service
+          initialization fails.
+
+Mon Aug 29 09:03:55 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
+
+        * tao/default_resource.cpp:
+        * tao/Strategies/advanced_resource.cpp:
+
+          Added markers within the code to specialize TAO components with
+          concrete implementations. This commit relates to the commit on
+          Sun Aug 28 14:25:07 2005 Arvind S. Krishna
+          <arvindk@dre.vanderbilt.edu> on specializing middleware
+          components. The motivation here is added for sake of clarity.
+
+          As a part of the Feature Oriented Customizer (FOCUS) tool being
+          developed in my research, we are trying to specialize framework
+          implementation and strategies within middleware with concrete
+          counterparts when their implementation/type is known a priori.
+          FOCUS provides an XML based transformation engine, where the
+          specialization transformations are captured in XML file and a
+          weaver specializes the code.
+
+          To help in this transformation process, this commit adds markers
+          within the source code. These markers are added as special
+          comments. For example, //@@
+          REACTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK represents a hook
+          where forward declarations and include files are added by the
+          weaver. As these markers are comments therefore should not
+          affect normal applications in *any* manner. Additionally,
+          applications that use multiple reactor implementations not be
+          affected/do not need any change. Currently, these
+          specializations are targeted for TAO middleware, where
+          applications know the target reactor a priori and want to
+          leverage the specialization to improve performance.
+
+Mon Aug 29 13:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Time_Service/Server_i.cpp:
+          Fixed emulated exception fuzz errors
+
+Mon Aug 29 13:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/LoadBalancer/LoadManager.cpp:
+          Fixed emulated exception fuzz errors
+
+Mon Aug 29 13:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/default_client.cpp:
+          Corrected argument initialisation order to silence GNU warnings
+
+Sun Aug 28 13:36:19 2005  Arvind S. Krishna  <arvindk@dre.vanderbilt.edu>
+
+        * tao/orbconf.h:
+
+          Updated the TAO_NULL_LOCK_REACTOR typedef to conform to the
+          following Reactor change: Fri Aug 26 18:01:31 2005  Steve Huston
+          <shuston@riverace.com>. In particular, updated
+          ACE_Select_Reactor_Token_T to ACE_Reactor_Token_T in the typedef
+          for ACE_Select_Reactor.
+
+Sat Aug 27 13:32:55 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/driver/drv_args.cpp:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/util/utl_global.cpp:
+
+          Fixed the command line parsing to preserve the literal
+          quotes if they are used in an include path that has a space,
+          so the path is passed to the preprocessor with the literal
+          quotes following '-I'. Since the string is also added to
+          the IDL compiler's list of include paths this way, the
+          literal quotes must also be stripped off when using the
+          include path to form a full path for validation of
+          included files. This fix closes [BUGID:2219]. Thanks to
+          Dorian Hileaga <hdorianh@hotmail.com> for reporting the
+          problem.
+
+Sat Aug 27 11:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/Forwarder.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+        * orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+          Fixed emulated exception errors
+
+Sat Aug 27 10:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+          Added missing semi colon
+
+Fri Aug 26 23:48:25 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        Fix for bug
+
+        http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2224
+
+        * tao/Client_Strategy_Factory.cpp:
+        * tao/Client_Strategy_Factory.h:
+        * tao/default_client.cpp:
+        * tao/default_client.h:
+
+          New strategy ORBConnectionHandlerCleanup .
+
+        * tao/Connection_Handler.cpp:
+
+          Use the id for deregistration instead of the handle.
+
+        * tao/Transport_Cache_Manager.cpp:
+        * tao/Wait_On_Read.cpp:
+
+          Do the registration and deregistration. One could possibly think
+          of doing a suspend and resume instead of
+          registration/deregistration. Our reactor interfaces do not
+          provide a way to add a handler in a suspended mode. Doing a
+          registration and then calling suspend () could provide a window
+          of time where a thread could be dispatched. Hence the decision to
+          use registration/deregistration combo.
+
+Fri Aug 26 14:07:57 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
+
+          Fix the "export" class used in the ACE_FACTORY_DEFINE for the
+          TAO_EC_Simple_Queue_Full_Action.  Hopefully this fixes the
+          internal compiler error on mingw compilers.
+
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:
+
+          Fix problems for no-exception builds.
+
+Fri Aug 26 18:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicInterface/Server_Request.cpp:
+          Fixed fuzz error
+
+Fri Aug 26 18:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CORBALOC_Parser.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/Messaging/Asynch_Invocation.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+          Fixed fuzz errors
+
+Fri Aug 26 11:42:29 2005  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Codeset/Codeset_Manager_i.cpp:
+          The codeset manager was doing the wrong thing when no codeset
+          information was available. The "default" codeset should be used
+          in that case, not the "fallback" codeset, which is only to be
+          used when codeset information is available, but no other codeset
+          will do.
+
+        * tao/Codeset/UTF8_Latin1_Translator.cpp:
+          This translator was not correctly appending the NUL to the end
+          of outbound strings.
+
+Fri Aug 26 11:33:07 2005  Justin Michel  <michel_j@ociweb.com>
+
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.h:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
 
         * tao/CDR.h:
         * tao/CDR.i:
-        * tao/CDR.cpp:
+        * tao/LocateRequest_Invocation.cpp:
+        * tao/Synch_Invocation.cpp:
+        * tao/orbconf.h:
 
-          Added missing fragmentation-enabling constructor and
-          fragmentation flag accessors.
+          Add a new compile-time setting to TAO that controls whether output
+        CDRs are reset() after a request is sent. Enabling this feature greatly
+        reduces memory usage in some situations such as event services that
+        occasionally send large messages. However, it also currently exposes
+        (or introduces) a multi-threading bug introducing deadlocks or infinite
+        loops. One (of several) test that can show the problem is
+        TAO/orbsvcs/tests/Notify/Basic/run_test.pl notify.mt.conf.
 
-          Removed legacy initial implementa code.  Addresses build
-          errors.
+          Add a new constructor for input CDR that allows specifying a ACE_Lock* which
+        will be used to protect the ACE_Data_Block used in the CDR. This will be
+        used by the Any impl above. The current implementation uses a global mutex
+        to protect all instances, because the internals of the Any impl will
+        be copied around, and there's no way to give ownership of the lock to the
+        actual ACE_Data_Block that uses it.
 
-        * tao/GIOP_Fragmentation_Strategy.h (TAO_GIOP_Fragmentation_Strategy):
+Fri Aug 26 06:33:04 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-          Export to allow users to provide their own implementation
-          through the resource factory.
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
 
-          (fragment):
+          Regenerated.
 
-          Return an "int" instead of "void".  Allows the error status of
-          the underlying transport send to be propagated up the stack.
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h:
 
-        * tao/Null_Fragmentation_Strategy.h (fragment):
-        * tao/Null_Fragmentation_Strategy.cpp (fragment):
-        * tao/On_Demand_Fragmentation_Strategy.h (fragment):
-        * tao/On_Demand_Fragmentation_Strategy.cpp (fragment):
+          Changed to add support for the thread pool concurrency model.  A
+          new "-t" command line parameter is used to specify the number of
+          threads in the pool.
 
-          Likewise.
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp:
 
-        * tao/operation_details.cpp (marshal_args):
+          Changed to add support for clean shutdown with SIGINT/SIGTERM
+          using the Service_Shutdown class from the Svc_Utils library.
 
-          Mark the CDR as having no other fragments to send after all
-          arguments have been marshaled, not before the last one is
-          marshaled.
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp:
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h:
 
-        * ORB_Core.h (fragmentation_Strategy):
+          Split main() out into new file Basic_Logging_Server.cpp.
 
-          Added missing transport parameter.
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h:
 
-          Removed const qualifier.  The resource_factory() accessor isn't
-          a const method.
+          Split main() out into new file Event_Logging_Server.cpp.
 
-        * ORB_Core.cpp (fragmentation_strategy):
+Fri Aug 26 13:45:10 2005  Simon McQueen  <sm@prismtech.com>
 
-          Likewise.
+        * tests/Portable_Interceptors/PolicyFactory/server.cpp:
+        * tests/OBV/Supports/Supports_Test_impl.cpp:
+        * tests/OBV/Supports/client.cpp:
+        * tests/Big_Twoways/Session.cpp:
+        * tests/NestedUpcall/Triangle_Test/server_B.cpp:
+        * tests/NestedUpcall/MT_Client_Test/server.cpp:
+        * tests/Bug_1551_Regression/Reply_Handler.cpp:
+        * tests/InterOp-Naming/Server_i.cpp:
 
-        * params.h:
-        * params.i:
-        * params.cpp:
+          Chipping away at the fuzz errors.
 
-          Added missing max_message_size attribute.
+Fri Aug 26 13:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Fri Mar 17 10:59:02 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Acceptor_Registry.cpp:
+        * tao/default_server.h:
+        * tao/PortableServer/PortableServer_WFunctions.cpp:
+        * tao/Strategies/DIOP_Acceptor.cpp:
+          Fixed 64bit conversion warnings
 
-        * tao/Resource_Factory.h:
-          Added missing include of Basic_Types and added forward declarations
+Fri Aug 26 12:30:47 2005  Simon McQueen  <sm@prismtech.com>
 
-        * tao/On_Demand_Fragmentation_Strategy.h:
-          Fixed copy constructor/assignment operators
+        * tao/AnyTypeCode.mpc:
 
-        * tao/CDR.h:
-          Removed do_fragmentation method, there is no implementation, added
-          fragment_stream
+          Removed ServicesA.cpp from unconditional compilation list.
+          ServicesC.cpp does not get built in min corba builds.
 
-        * tao/CDR.i:
-          Fixed typo
+        * tao/extra_anytypecode.mpb:
 
-        * tao/default_resource.cpp:
-          Added missing includes and updated signature of
-          create_fragmentation_strategy to match header file
+          Create feature template to include ServicesA.cpp only if not
+          a min corba build.
 
-        Fri Mar 17 07:48:02 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Aug 26 10:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          Updated code after update from Ossama Othman
+        * tao/ORB_Core.cpp:
+          Removed handling of ORBGlobalCollocation, it is deprecated for some
+          time. Also removed handling of ORBCollocation==YES, this is now
+          ORBCollocation==global.
 
-        * tao/On_Demand_Fragmentation_Strategy.{h,cpp}:
-          New files
+Fri Aug 26 09:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/default_resource.{h,cpp}:
-          Added create_fragmentation_strategy
+        * 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/be/be_visitor_exception/exception_ctor.cpp
+        * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
+        * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
+        * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
+        * TAO_IDL/include/utl_err.h
+        * TAO_IDL/util/utl_err.cpp
+        * docs/compiler.html
+          When the -St option is used to suppress typecodes, we now
+          also suppress the type codes of user exceptions. There is no
+          requirement for this from the orb, the only functionality the
+          user looses is the ability to retrieve which exceptions an
+          operation throws using interceptors.
+
+        * tao/Adapter_Factory.cpp
+        * tao/BiDir_Adapter.cpp
+        * tao/CORBALOC_Parser.cpp
+        * tao/Cleanup_Func_Registry.cpp
+        * tao/DLL_Parser.cpp
+        * tao/Endpoint_Selector_Factory.cpp
+        * tao/Environment.cpp
+        * tao/Exclusive_TMS.cpp
+        * tao/FILE_Parser.cpp
+        * tao/IFR_Client_Adapter.cpp
+        * tao/IOR_Parser.cpp
+        * tao/LF_Follower.cpp
+        * tao/Leader_Follower.cpp
+        * tao/MCAST_Parser.cpp
+        * tao/Muxed_TMS.cpp
+        * tao/ORB.cpp
+        * tao/ORB_Core.cpp
+        * tao/ORB_Table.cpp
+        * tao/Resource_Factory.cpp
+        * tao/Stub.cpp
+        * tao/Stub_Factory.cpp
+        * tao/TSS_Resources.cpp
+        * tao/Transport_Cache_Manager.cpp
+        * tao/default_resource.cpp
+        * tao/Codeset/Codeset_Manager_i.cpp
+        * tao/Codeset/UTF16_BOM_Factory.cpp
+        * tao/Codeset/UTF8_Latin1_Factory.cpp
+        * tao/DynamicAny/DynAnyFactory.cpp
+        * tao/DynamicAny/DynUnion_i.cpp
+        * tao/DynamicInterface/ExceptionList.cpp
+        * tao/DynamicInterface/Request.cpp
+        * tao/IORManipulation/IORManipulation.cpp
+        * tao/Messaging/Asynch_Invocation.cpp
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+        * tao/PortableServer/Active_Object_Map.cpp
+        * tao/PortableServer/ImR_Client_Adapter.cpp
+        * tao/PortableServer/LifespanStrategyPersistent.cpp
+        * tao/PortableServer/LifespanStrategyTransient.cpp
+        * tao/PortableServer/Object_Adapter.cpp
+        * tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+        * tao/PortableServer/Root_POA.cpp
+        * tao/PortableServer/Root_POA.inl
+        * tao/RTCORBA/RT_Mutex.cpp
+        * tao/RTCORBA/RT_ORB.cpp
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp
+        * tao/RTCORBA/Thread_Pool.cpp
+        * tao/RTScheduling/Current.cpp
+        * tao/Strategies/DIOP_Connection_Handler.cpp
+        * tao/Strategies/DIOP_Connector.cpp
+        * tao/Strategies/SCIOP_Acceptor.cpp
+        * tao/Strategies/SCIOP_Connection_Handler.cpp
+        * tao/Strategies/SCIOP_Connector.cpp
+        * tao/Strategies/SHMIOP_Acceptor.cpp
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp
+        * tao/Strategies/SHMIOP_Connector.cpp
+        * tao/Strategies/UIOP_Acceptor.cpp
+        * tao/Strategies/UIOP_Connection_Handler.cpp
+        * tao/Strategies/UIOP_Connector.cpp
+        * tao/Strategies/advanced_resource.cpp
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+        * tao/Valuetype/AbstractBase.cpp
+        * tao/Valuetype/StringValueC.cpp
+        * tao/Valuetype/ValueFactory_Map.cpp
+          Fixed emulated exception fuzz errors and removed explicit
+          template instantiations
+
+Thu Aug 25 17:15:27 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tao/GIOP_Fragmentation_Strategy.h:
-          Doxygen improvements
+        * orbsvcs/orbsvcs/Makefile.am:
 
-        * tao/Resource_Factory.h:
-          Added pure virtual fragmentation_strategy method
+          Regenerated.
 
-        * tao/ORB_Core.{h,cpp}:
-          Added fragmentation_strategy accessor method
+Thu Aug 25 16:43:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/GIOP_Message_Base.{h,cpp}:
-          Added TAO_Transport to the constructor arguments
+        * tao/AnyTypeCode/Any_Array_Impl_T.cpp:
+
+          Added include of Any.h, similar to Any_Dual_Impl_T.cpp, needed
+          when compiling code generated for arrays and not passing -Sa
+          or -St to the IDL compiler.
+
+Thu Aug 25 11:00:47 2005  Chris Cleeland  <cleeland_c@ociweb.com>
+
+          This does two things in the Real Time Event Service:
+
+          1. Added a new dispatching strategy--Thread Per Consumer.  This
+          strategy is similar to the MT dispatching strategy in that it
+          separates the thread that receives the push() from a supplier
+          from the thread that does the eventual push() to the
+          consumer(s), but it differs from MT in that MT has a pool of
+          threads pulling from a single queue and ultimately potentially
+          servicing every consumer, whereas TPC has a queue for *each*
+          consumer and, thus, a single thread dedicated to pushing to that
+          consumer.  This insures that a badly-behaved consumer CANNOT
+          have an adverse effect on the channel or supplier.
 
-        * tao/GIOP_Message_Base.cpp:
-          Added come comments
+          2. It adds a means by which an application can specify what the
+          RTEC should do if the TAO_EC_Queue fills up.  This behavior is
+          encapsulated in a derivation of an ACE_Service_Object, called
+          TAO_EC_Queue_Full_Service_Object.  The RTEC looks for a service
+          object of a particular name (default in macro
+          TAO_EC_DEFAULT_QUEUE_FULL_SERVICE_OBJECT_NAME)
 
-        * tao/True_Fragmentation_Strategy.{h,cpp}:
-          Removed again, replaced by On_Demand so far as I can tell
+        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
 
-        * tao/tao.mpc:
-          Added new files
+          Updated to build new files that are part of the TPC strategy.
 
-        Thu Mar 16 07:48:02 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
 
-          Integrated first set of code from Ossama Othman
+          Added new data member to hold the name of the service object
+          used for queue full behavior.
 
-        * tao/GIOP_Fragmentation_Strategy.{h,cpp}:
-        * tao/Null_Fragmentation_Strategy.{h,cpp}:
-        * tao/True_Fragmentation_Strategy.{h,cpp}:
-          New files
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.i:
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
 
-        * tao/operation_details.cpp:
-          When marshaling the last argument put this information on the
-          cdr_stream
+          Added new option, -ECQueueFullServiceObject, that can be used to
+          specify the name/tag in the svc.conf file through which the RTEC
+          should look for a queue full service object.
 
-        * tao/GIOP_Message_Base.cpp:
-          Some refactoring
+        * orbsvcs/orbsvcs/Event/EC_Defaults.h:
 
-        * tao/CDR.{h,cpp,i}:
-          Call fragment_stream as part of the streaming calls
+          Added default service object name/tag,
+          TAO_EC_DEFAULT_QUEUE_FULL_SERVICE_OBJECT_NAME.
 
-Thu Apr 20 11:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i:
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
 
-        * orbsvcs/orbsvcs/sfp.idl:
-          Use CORBA::OctetSeq and CORBA::ULongSeq
+          Added the TAO_EC_Simple_Queue_Full_Action service object
+          implementation into here, since only the TAO_EC_Dispatching_Task
+          needs to know about it.  This default implementation has only
+          two choices of behavior: "wait" for not-full condition (the default) or
+          "discard" silently.  Specification of the desired behavior is by
+          putting the word "wait" or "discard" as the first argument in this
+          object's svc.conf arg vector.
 
-        * tao/Strategies/SCIOP_Profile.cpp:
-          Fixed compile error
+        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i:
 
-Thu Apr 20 08:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Created new macros, TAO_EC_QUEUE_LWM and TAO_EC_QUEUE_HWM, that
+          can be used to specify the low-water and high-water marks for
+          the TAO_EC_Queue.  Previously, these were hard-coded values.
 
-        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp:
-          Fixed compile error
+        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp:
 
-Thu Apr 20 07:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Modifications to CTORs to allow passing of a service object
+          pointer from the factory down through the dispatching strategy
+          down to the dispatching task itself.
 
-        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h:
-          Fixed template instantiation
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp:
 
-Wed Apr 19 18:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Minor modifications to pass the service object to the
+          dispatching strategy.
 
-        * tao/UShortSeqC.h:
-        * tao/OctetSeqC.h:
-          Do an explicit export of the base template
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.i:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.i:
+        * orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i:
+        * orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:
 
-Wed Apr 19 16:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Rather than cluttering the EC_Default_Factory with yet another
+          dispatch strategy, this derives from the EC_Default_Factory and
+          replaces certain behaviors with its own.  Thus, in order to use
+          this new strategy you will have to replace the call in your code
+          for TAO_EC_Default_Factory::init_svcs() with
+          TAO_EC_TPC_Factory::init_svcs().
 
-        * tao/Messaging/ExceptionHolderC.{h,cpp}:
-          Added constructor that accepts all values as generated now by the
-          IDL compiler
+        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h: Moved event_channel_,
+          consumer_, and refcount_ into "protected" section so subclasses
+          can have access.
 
-        * tao/Messaging/ExceptionHolder_i.cpp:
-          Use the new constructor
+        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h: Moved event_channel_
+          into "protected" section so subclasses can have access.
 
-Wed Apr 19 14:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Thu Aug 25 07:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/Exception.h:
-          Made the copy constructor public again, vc7.1 complains when
-          it is protected. Made a todo in this file again, have to retest
-          this later.
+        * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp:
+          Fixed small bug
 
-Wed Apr 19 13:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Aug 24 21:57:37 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp:
-        * examples/Advanced/ch_12/icp.cpp:
-        * examples/Advanced/ch_21/icp.cpp:
-        * examples/Advanced/ch_18/icp.cpp:
-        * examples/Advanced/ch_8_and_10/icp.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/params_dup.h:
-          Removed workarounds for vc6
+        * configure.ac: Copied in updated copyright paragraph from COPYING.
 
-Wed Apr 19 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Aug 24 18:12:16 2005  Simon McQueen  <sm@prismtech.com>
 
-        * tao/Valuetype/AbstractBase.cpp:
-          Use true/false, const improvements
+        * TAO_IDL/util/utl_global.cpp:
 
-        * tao/Valuetype/AbstractBase.cpp:
-          Use C++ cast instead of C cast
+          Avoid recording duplicate file names in ::add_to_included_idl_files.
+          This fixes bug #2221.
 
-Wed Apr 19 13:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Aug 24 11:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/AnyTypeCode/Any_Unknown_IDL_Type.h:
-          Removed not needed forward declarations
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+          Reordered includes to fix gcc4 build problems
 
-        * tao/AnyTypeCode/Any.cpp:
-        * tao/AnyTypeCode/Any_Impl.cpp:
-        * tao/BiDir_GIOP/BiDirPolicy_Validator.cpp:
-          Use false/true instead of 0/1 for bool
+Wed Aug 24 10:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/PortableServer/Object_Adapter.h:
-          Don't export poa_name_iterator and iteratable_poa_name
+        * tests/Portable_Interceptors/Dynamic/server_interceptor.cpp:
+        * tests/Portable_Interceptors/Dynamic/client_interceptor.cpp:
+        * tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp:
+          Explicitly include the AnyTypeCode_Adapter_Impl.h. These tests
+          use the functionality to get the method arguments as Any and
+          for this we now need the AnyTypeCode adapter. Fixes test failures
+          in the static builds.
 
-        * tao/PortableServer/Object_Adapter.cpp:
-          Use true/false and when the object adapter can't be found
-          throw a OBJECT_NOT_EXIST with minor code 2
+        * tao/PI/PI.cpp:
+          Also do the process directive for the PICurrent Loader
 
-Wed Apr 19 12:56:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/PI/PICurrent_Loader.{h,cpp}:
+          No static initializer needed here, this is in the PI file
 
-        * tao/Transport_Timer.h:
-          No need to export this class from the TAO lib
+        * tests/Portable_Interceptors/PICurrent/server.cpp:
+          Fixed static runtime error
 
-        * tao/ORB.h:
-          Use false for the default of the shutdown method
+Wed Aug 24 09:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Apr 19 12:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        On the client side we passed the typecode of the user exceptions to the
+        invocation adapter, but this is only needed when interceptors are being
+        used.
 
-        * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc:
-          Made these projects dependent on each other to make sure
-          that they don't build in parallel and generate the same idl
-          file twice at the same moment. Thanks to Chad Elliot for the
-          info how to do this the easiest
+        * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp:
+          Generate a TAO_HAS_INTERCEPTORS==1 around the passing of the typecode
+          of the user exception
 
-Wed Apr 19 12:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+          Removed generation of an environment variable in the client side
+          code which was not needed
 
-        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
-          Generate doxygen documentation style and use true instead of 1
+        * tao/Exception_Data.h
+        * tao/PI/ClientRequestInfo.cpp
+          Only store and use the typecode of an user exception when
+          interceptors are enabled
 
-        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
-          Generate true for boolean instead of 1
+        * tao/ImR_Client/ImplRepo.pidl:
+        * tao/ImR_Client/ServerObject.pidl:
+          Updated regeneration instructions to not use -GA
 
-        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
-          Generate also argument names in the header file so that doxygen
-          can parse IDL generated code
+        * tao/ImR_Client/ImplRepoA.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/ServerObjectA.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
+          Regenerated
 
-Wed Apr 19 12:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/ImR_Client/ImplRepoA.cpp
+        * tao/ImR_Client/ServerObjectA.cpp
+          Removed
 
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.{h,cpp,i}:
-        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.{h,i}:
-          Use bool and prefix increment/decrement
+        * tao/Makefile.am:
+          Updated
 
-Wed Apr 19 11:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Aug 23 18:09:07 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        * tests/Big_Oneways/run_test.pl:
-        * tests/Hello/run_test.pl:
-        * performance-tests/Throughput/run_test.pl:
-          Check the return value of spawn, speedsup the builds when no
-          executable is build
+        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_1630_Regression/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/Common/Makefile.am:
 
-        * performance-tests/Throughput/Receiver.cpp:
-          Prefix increment
+          Regenerated.
 
-        * performance-tests/Throughput/Receiver_Factory.cpp:
-          Initialise pointer with 0
+        * orbsvcs/tests/Event/Mcast/Common/ECMcastTests_lib.mpc:
 
-        * performance-tests/Throughput/Throughput.mpc:
-          Simplified
+          Removed nonexistant ectest_export.h file from Header_Files
+          section.
 
-Wed Apr 19 11:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Aug 23 15:54:52 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        Integrated iioptbranch. This fixes bugzilla 2467
+        * TAO_IDL/be/be_codegen.cpp (gen_stub_hdr_includes):
 
-        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
-        No need to include IIOP files, just use the base classes
+          Another round of generated include directive reording to address
+          template related order of parsing issues in g++ 3.4.x or better.
 
-        Wed Mar 29 08:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/Any_Insert_Policy_T.h (any_insert):
 
-        * tao/default_resource.cpp
-        * tao/IIOP_Acceptor.cpp
-        * tao/IIOP_Acceptor.h
-        * tao/IIOP_Acceptor.i
-        * tao/IIOP_Connection_Handler.cpp
-        * tao/IIOP_Connection_Handler.h
-        * tao/IIOP_Connector.cpp
-        * tao/IIOP_Connector.h
-        * tao/IIOP_Endpoint.cpp
-        * tao/IIOP_Endpoint.h
-        * tao/IIOP_Endpoint.i
-        * tao/IIOP_Factory.cpp
-        * tao/IIOP_Factory.h
-        * tao/IIOP_Lite_Factory.cpp
-        * tao/IIOP_Lite_Factory.h
-        * tao/IIOP_Profile.cpp
-        * tao/IIOP_Profile.h
-        * tao/IIOP_Transport.cpp
-        * tao/IIOP_Transport.h
-        * tao/orbconf.h
-        * tao/TAO_Internal.cpp
-        Added TAO_HAS_IIOP. This is default set to 1 but can be overridden
-        in the config.h file to 0 meaning we don't support IIOP. This is
-        usefull for embedded systems that support one of the other
-        pluggable protocols and don't need IIOP support at all. With
-        TAO_HAS_IIOP set to 0 not everything will compile, just the
-        core libs itself.
-
-Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Integrated sequpdate3 branch. Thanks to Carlos O'Ryan for the initial
-        work for this new sequence implementation which I merged to cvs head
-        and finished
-
-        This fixes the following bugzilla entries:
-        2492 - Simplify TAO_Seq_Out_T
-        2493 - Simplify _reset method on union generated code
-        2352 - Valuefactory operations not safe
-        2353 - Valuefactories stored per process instead of per orb
-        2349 - ORB::destroy() should throw BAD_INV_ORDER if called during a
-        2315 - Reimplement (w)string_var/_out as templates
-        1989 - Footprint reduction issue, split Sequence files
-        2273 - Deprecate old AMI support
-        2300 - Simplify serialize/deserialize of sequences
-        2299 - Reimplement string/wstring managers as templates
-        1936 - Unnecessary usage of virtual functions in sequence implementation
-        1673 - operator[] of sequence<string> returns TAO_SeqElem_String_Manager
-        instead of TAO_String_Manager. Thanks to Mark Paulus <mark dot paulus
-        at mci dot com> for reporting this one.
-        1930 - Assignment operator for sequences is not exception safe.
-        1931 - The length() member function for sequences is not exception-safe.
-        1933 - Incomplete implementation of freebuf() for reference types.
-        1934 - const version of operator[] for string sequences allows assignment
-        1938 - Possible incorrect duplication in sequences of references
-        1928 - Assignment from T_mgr to sequence elements does not duplicate
-        2417 - Double delete on Transport when using oneways with sync_none
-        Thanks to Jan Ohlenburg <jan dot ohlenburg at fit dot fraunhofer dot de>
-        for reporting this.
-        2355 - oneway op. with timeout crashes client due to server termination
-        Thans to Jan Zima <jan dot zima at sofis dot cz> for reporting this.
-
-        Also did several const changes throughout the code
-
-        Fri Apr  7 08:03:12 UTC 2006  Kees van Marle  <kvmarle@remedy.nl>
-
-        * tao/Valuetype_Adapter_Factory.{h,cpp}:
-        New files, value type adapter factory
+          Made these methods non-virtual.  All binding is done at
+          compile-time so there is no need make them virtual.  Also
+          addresses "class with virtual funtions but no virtual
+          destructor" g++ 4.0 warnings.
 
-        * tao/tao.mpc:
-        Added new files
+        * tao/IFR_Client/IFR_ComponentsC.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
 
-        * tao/Valuetype/Valuetype_Adapter_Factory_Impl.h:
-        Value type adapter factory implementation
+          More g++ 3.4.x or better order of parsing related template
+          error fixes.
 
-        * tao/Valuetype/ValueFactory_Map.{h,cpp}:
-        Map isn't a singleton anymore and guard access with a mutex
+Tue Aug 23 10:43:07 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * tao/Valuetype/Valuetype_Adapter_Impl.{h,cpp}:
-        The value type adapter isn't loaded with service configurator
-        anymore, the value type factory is now the one we load on demand
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h:
+        * tao/IORManipulation/IORA.cpp:
+        * tao/ImR_Client/ImplRepoA.cpp:
+        * tao/ImR_Client/ImplRepoS.cpp:
+        * tao/ImR_Client/ServerObjectA.cpp:
+        * tao/ImR_Client/ServerObjectS.cpp:
+        * tao/ObjRefTemplate/Default_ORTA.cpp:
+        * tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp:
+        * tao/RTCORBA/RTCORBAA.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.h:
+        * tao/RTCORBA/rtcorba_export.h:
+        * tao/RTCORBA/rtcorba_typedefs.h:
+        * tao/RTPortableServer/RTPortableServerA.cpp:
+        * tao/RTScheduling/RTSchedulerC.h:
+        * tao/Strategies/sciop_endpointsC.cpp:
+        * tao/Strategies/uiop_endpointsC.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactoryA.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactoryC.h:
+        * tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+        * tao/Utils/RIR_Narrow.h:
 
+          Reordered include directives to make sure all necessary
+          non-dependent names are parsed before the templates that use
+          them.  In the case of the "*A.h" files, this is a temporary
+          work-around until TAO_IDL is updated.  Addresses g++ 3.4.x or
+          better compile-time errors.
+
+Tue Aug 23 14:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+          Fixed possible unitialized warning
+
+Tue Aug 23 13:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+          Added include of Any.h
+
+Tue Aug 23 13:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Abstract_Servant_Base.h:
+        * tao/PortableServer/Servant_Base.{h,cpp}:
+          Changed the type of the operation name length to size_t to fix
+          64bit conversion warnings
+
+Tue Aug 23 12:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp:
+        * tao/Abstract_Servant_Base.h:
+        * tao/CORBA_String.cpp:
+        * tao/Invocation_Adapter.{h,inl}:
         * tao/ORB.cpp:
-        Updated the value type methods to use the new ORB_Core method
-        to get the valuetype adapter, is the ORB_Core can't get the
-        adapter it will throw already the internal exception
+        * tao/ServerRequestInterceptor_Adapter.h:
+        * tao/operation_details.{h,i}:
+        * tao/Domain/DomainS.cpp:
+        * tao/DynamicInterface/DII_Invocation_Adapter.{h,cpp}:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+        * tao/ImR_Client/ImplRepoS.cpp:
+        * tao/ImR_Client/ServerObjectS.cpp:
+        * tao/Messaging/Asynch_Invocation_Adapter.{h,cpp}:
+        * tao/Messaging/MessagingS.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.{h,cpp}:
+        * tao/PI_Server/ServerRequestInfo.{h,inl}:
+        * tao/PortableServer/PolicyS.cpp:
+        * tao/PortableServer/Upcall_Wrapper.{h,cpp}:
+        * tao/Valuetype/AbstractBase_Invocation_Adapter.{h,cpp}:
+          Fixed several 64bit conversion warnings. The size of the
+          exception list is now a CORBA::ULong, the length of the operation
+          name is size_t.
 
-        * tao/ORB_Core.{h,cpp,i}:
-        Get the value type adapter factory with svc conf instead of the
-        adapter itself. Create a unique instance per orb.
+Tue Aug 23 10:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
+        * tao/DynamicInterface/Request.cpp:
+          Fixed 64bit conversion warnings and removed some not needed
+          const casts
+
+Tue Aug 23 10:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Fixed_Array_SArgument_T.{h,cpp}:
+          Fixed compilation issues with vc6
+
+Tue Aug 23 07:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc:
+          Added anytypecode
+
+Mon Aug 22 23:03:02 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h:
+
+          Changed the event_log_factory_ member variable from a
+          TAO_EventLogFactory_i to a pointer to a TAO_EventLogFactory_i.
+          This delays execution of the constructor, which avoids the ORB
+          being constructed implicitly, which in turn allows any -ORB...
+          command line arguments to be parsed and removed from the argc/
+          argv vector in Event_Logging_Service::init_ORB().
+
+Mon Aug 22 21:33:37 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          Another round of generated include directive reording to address
+          template related order of parsing issues in g++ 3.4.x or better.
+
+        * tao/Typecode_typesC.h:
+        * tao/ParameterModeC.h
+
+          Removed unnecessary include directives.  They were causing
+          headers to be included that prematurely caused some templates to
+          be parsed before all non-dependent names were parsed.  Addresses
+          g++ 3.4.x or better compile-time errors.
+
+        * tao/AnyTypeCode/BooleanSeqA.h:
+        * tao/AnyTypeCode/BoundsA.h:
+        * tao/AnyTypeCode/CONV_FRAMEA.h:
+        * tao/AnyTypeCode/CharSeqA.h:
+        * tao/AnyTypeCode/CurrentA.h:
+        * tao/AnyTypeCode/DomainA.h:
+        * tao/AnyTypeCode/DoubleSeqA.h:
+        * tao/AnyTypeCode/DynamicC.h:
+        * tao/AnyTypeCode/Dynamic_ParameterC.h:
+        * tao/AnyTypeCode/FloatSeqA.h:
+        * tao/AnyTypeCode/GIOPA.h:
+        * tao/AnyTypeCode/IIOPA.h:
+        * tao/AnyTypeCode/IIOP_EndpointsA.h:
+        * tao/AnyTypeCode/IOPA.h:
+        * tao/AnyTypeCode/IOP_IORA.h:
+        * tao/AnyTypeCode/LongDoubleSeqA.h:
+        * tao/AnyTypeCode/LongLongSeqA.h:
+        * tao/AnyTypeCode/LongSeqA.h:
+        * tao/AnyTypeCode/Messaging_PolicyValueA.h:
+        * tao/AnyTypeCode/NVList.h:
+        * tao/AnyTypeCode/ObjectIdListA.h:
+        * tao/AnyTypeCode/OctetSeqA.h:
+        * tao/AnyTypeCode/PI_ForwardA.h:
+        * tao/AnyTypeCode/ParameterModeA.h:
+        * tao/AnyTypeCode/PolicyA.h:
+        * tao/AnyTypeCode/Policy_ForwardA.h:
+        * tao/AnyTypeCode/PortableInterceptorA.h:
+        * tao/AnyTypeCode/ServicesA.h:
+        * tao/AnyTypeCode/ShortSeqA.h:
+        * tao/AnyTypeCode/StringSeqA.h:
+        * tao/AnyTypeCode/SystemExceptionA.h:
+        * tao/AnyTypeCode/TAOA.h:
+        * tao/AnyTypeCode/TimeBaseA.h:
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+        * tao/AnyTypeCode/ULongLongSeqA.h:
+        * tao/AnyTypeCode/ULongSeqA.h:
+        * tao/AnyTypeCode/UShortSeqA.h:
+        * tao/AnyTypeCode/ValueModifierA.h:
+        * tao/AnyTypeCode/VisibilityA.h:
+        * tao/AnyTypeCode/WCharSeqA.h:
+        * tao/AnyTypeCode/WStringSeqA.h:
+        * tao/AnyTypeCode/WrongTransactionA.h:
+        * tao/AnyTypeCode/orb_typesA.h
+        * tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * tao/CodecFactory/CDR_Encaps_Codec.cpp:
+        * tao/CodecFactory/CDR_Encaps_Codec.h:
+        * tao/CodecFactory/CodecFactory.h:
+        * tao/CodecFactory/CodecFactory_impl.cpp:
+        * tao/CodecFactory/CodecFactory_impl.h:
+        * tao/CodecFactory/IOP_CodecC.h:
+        * tao/CodecFactory/IOP_Codec_includeC.h:
+        * tao/Domain/DomainS.h:
+        * tao/DynamicAny/DynamicAny.h:
+        * tao/DynamicAny/DynamicAnyC.h:
+        * tao/DynamicInterface/Context.h:
+        * tao/DynamicInterface/DII_Arguments.cpp:
+        * tao/DynamicInterface/DII_Invocation.cpp:
+        * tao/DynamicInterface/ExceptionList.h:
+        * tao/IFR_Client/IFR_BaseC.h:
+        * tao/IFR_Client/IFR_BasicC.h:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+        * tao/IFR_Client/IFR_ComponentsC.cpp:
+        * tao/IFR_Client/IFR_ExtendedC.cpp:
+        * tao/IFR_Client/IFR_ExtendedC.h:
+        * tao/Messaging/MessagingA.cpp:
+        * tao/Messaging/MessagingS.cpp:
+        * tao/Messaging/Messaging_No_ImplA.cpp:
+        * tao/Messaging/Messaging_RT_PolicyA.cpp:
+        * tao/Messaging/Messaging_SyncScope_PolicyA.cpp:
+        * tao/Messaging/PollableC.cpp:
+        * tao/Messaging/TAO_ExtA.cpp:
+        * tao/PI/ClientRequestInfo.h:
+        * tao/PI/ClientRequestInfoC.h:
+        * tao/PI/ClientRequestInterceptorA.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
+        * tao/PI/InterceptorA.cpp:
+        * tao/PI/Interceptor_List_T.cpp:
+        * tao/PI/InvalidSlotA.cpp:
+        * tao/PI/ORBInitInfoC.h:
+        * tao/PI/ORBInitializerA.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.h:
+        * tao/PI/PI.h:
+        * tao/PI/PICurrent.h:
+        * tao/PI/PICurrentA.cpp:
+        * tao/PI/PICurrent_Impl.h:
+        * tao/PI/PIForwardRequestA.cpp:
+        * tao/PI/PolicyFactoryC.h:
+        * tao/PI/RequestInfoC.h:
+        * tao/PI_Server/ServerInterceptorAdapter.h:
+        * tao/PI_Server/ServerRequestInfoC.h:
+        * tao/PI_Server/ServerRequestInterceptorC.h:
+        * tao/PortableServer/AdapterActivatorA.cpp:
+        * tao/PortableServer/ForwardRequestA.cpp:
+        * tao/PortableServer/IdAssignmentPolicyA.cpp:
+        * tao/PortableServer/IdUniquenessPolicyA.cpp:
+        * tao/PortableServer/ImplicitActivationPolicyA.cpp:
+        * tao/PortableServer/LifespanPolicyA.cpp:
+        * tao/PortableServer/POAManagerC.cpp:
+        * tao/PortableServer/PS_CurrentA.cpp:
+        * tao/PortableServer/PS_ForwardA.cpp:
+        * tao/PortableServer/PolicyS.cpp:
+        * tao/PortableServer/PortableServerA.cpp:
+        * tao/PortableServer/RequestProcessingPolicyA.cpp:
+        * tao/PortableServer/ServantActivatorA.cpp:
+        * tao/PortableServer/ServantLocatorA.cpp:
+        * tao/PortableServer/ServantManagerA.cpp:
+        * tao/PortableServer/ServantRetentionPolicyA.cpp:
+        * tao/PortableServer/ThreadPolicyA.cpp:
+        * tao/Valuetype/StringValueC.cpp:
+        * tao/Valuetype/ValueBase.cpp:
+
+          Reordered include directives to make sure all necessary
+          non-dependent names are parsed before the templates that use
+          them.  In the case of the "*A.h" files, this is a temporary
+          work-around until TAO_IDL is updated.  Addresses g++ 3.4.x or
+          better compile-time errors.
+
+Mon Aug 22 21:05:36 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp (gen_stub_hdr_includes):
+
+          Reordered generated include directives so that Any/TypeCode
+          include directives are placed before ones from the ORB core to
+          make sure some things are parsed before some templates
+          (e.g. TAO_Pseudo_{Var,Out}_T).  Addresses issues with compilers
+          that require all necessary non-dependent names be parsed prior
+          to parsing templates that may use them (e.g. GNU g++ 3.4.x or
+          better).
+
+          Removed duplicate "TypeCode.h" include directive generation.
+
+        * tao/AnyTypeCode/AnySeqC.h:
         * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+        * tao/AnyTypeCode/BooleanSeqA.h:
+        * tao/AnyTypeCode/TypeCode.h:
         * tao/AnyTypeCode/append.cpp:
-        * tao/AnyTypeCode/skip.cpp:
-        Changed the way we get the valuetype adapter
 
-        Store the value type factories per orb and made things thread safe.
-        This fixes bugzilla bugs 2352 and 23253.
+          Reordered include directives to force non-dependent names used
+          as template arguments to be parsed before the templates in
+          question.  Addresses issues with compilers that require all
+          necessary non-dependent names be parsed prior to parsing
+          templates that may use them (e.g. GNU g++ 3.4.x or  better).
 
-        Thu Apr  6 09:17:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/AnyTypeCode/Any_Impl.h:
 
-        * tao/Transport_Connector.cpp:
-        Applied fix of bug 2417, let us see what the results are in the
-        branch build
+          Removed unnecessary "Any.h" include directive.
 
-        Thu Apr  6 09:08:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Aug 22 15:46:29 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
-        * examples/POA/FindPOA/FindPOA.cpp:
-        * tests/Bug_2349_Regression/client.cpp:
-        * tests/Bug_2349_Regression/foo.idl:
-        * tests/Bug_2349_Regression/server.cpp:
-        Improved tests
+        * tao/ORB.h:
+
+          Reordered include directives to work around g++ 4.0.x internal
+          compiler error.
+
+Mon Aug 22 12:58:11 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Concurrency_Service/Makefile.am:
+        * orbsvcs/CosEvent_Service/Makefile.am:
+        * orbsvcs/Dump_Schedule/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
+        * orbsvcs/FT_ReplicationManager/Makefile.am:
+        * orbsvcs/Fault_Detector/Makefile.am:
+        * orbsvcs/Fault_Notifier/Makefile.am:
+        * orbsvcs/IFR_Service/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/LifeCycle_Service/Makefile.am:
+        * orbsvcs/LoadBalancer/Makefile.am:
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+        * orbsvcs/Naming_Service/Makefile.am:
+        * orbsvcs/Notify_Service/Makefile.am:
+        * orbsvcs/Scheduling_Service/Makefile.am:
+        * orbsvcs/Time_Service/Makefile.am:
+        * orbsvcs/Trading_Service/Makefile.am:
 
-        * tao/Adapter_Registry.{h,cpp}:
-        Remove the empty throw spec for close and check_close. This way
-        exceptions from lower layers are propagated up.
+          Regenerated.
 
-        * tao/ORB_Core.{h,cpp}:
-        Removed empty throw spec from shutdown, if there are exceptions from
-        a lower layer and as a result we can't shutdown, let the user be
-        aware of it. This fixes bugzilla bug 2349
+Mon Aug 22 12:32:42 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-        Mon Apr  3 07:59:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am:
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am:
+        * orbsvcs/tests/AVStreams/Component_Switching/Makefile.am:
+        * orbsvcs/tests/AVStreams/Full_Profile/Makefile.am:
+        * orbsvcs/tests/AVStreams/Latency/Makefile.am:
+        * orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am:
+        * orbsvcs/tests/AVStreams/Multicast/Makefile.am:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am:
+        * orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am:
+        * orbsvcs/tests/AVStreams/Pluggable/Makefile.am:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am:
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am:
+        * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
+        * orbsvcs/tests/Bug_1334_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_1393_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_1630_Regression/Makefile.am:
+        * orbsvcs/tests/Concurrency/Makefile.am:
+        * orbsvcs/tests/CosEvent/Basic/Makefile.am:
+        * orbsvcs/tests/CosEvent/lib/Makefile.am:
+        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
+        * orbsvcs/tests/EC_MT_Mcast/Makefile.am:
+        * orbsvcs/tests/EC_Mcast/Makefile.am:
+        * orbsvcs/tests/EC_Multiple/Makefile.am:
+        * orbsvcs/tests/EC_Throughput/Makefile.am:
+        * orbsvcs/tests/Event/Basic/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/Common/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/Complex/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/Simple/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am:
+        * orbsvcs/tests/Event/Performance/Makefile.am:
+        * orbsvcs/tests/Event/lib/Makefile.am:
 
-        * TAO/IDL/be/be_visitor_union/discriminant_ci.cpp
-        * TAO/IDL/be/be_visitor_union/union_ch.cpp
-        * TAO/IDL/be/be_visitor_union/union_cs.cpp
-        * TAO/IDL/be/be_visitor_union_branch/public_ci.cpp
-        * tao/GIOPC.{h,cpp,inl}:
-        Removed arguments from the _reset method on the union generated,
-        these are not used.
+          Regenerated.
 
-        Sun Apr  2 18:56:25 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc:
 
-        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+          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.
+
+Mon Aug 22 18:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Pluggable/Pluggable.mpc:
+        * performance-tests/Memory/Single_Threaded/Memory_Growth.mpc:
+        * examples/Advanced/ch_3/Advanced_ch_3.mpc:
+          Updated to resolve link errors
+
+Mon Aug 22 18:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Array_VarOut_T.{h,inl}:
+        * tao/PortableServer/Fixed_Array_SArgument_T.cpp:
+        * tao/PortableServer/Var_Array_SArgument_T.{h,cpp}:
+          Changes to make msvc6 happy
+
+Mon Aug 22 10:43:11 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * tao/Makefile.am:
+
+          Regenerated.
+
+        * tao/AnyTypeCode.mpc:
+
+          Changed AnyTypecode to AnyTypeCode so generated project
+          files work with case sensitive filesystems.
+
+        * tao/tao.mpc:
+
+          Removed a few more headers that have been moved to the
+          AnyTypeCode library.
+
+        * tao/BiDir_GIOP/TAO_BiDirGIOP.pc.in:
+        * tao/CodecFactory/TAO_CodecFactory.pc.in:
+        * tao/Domain/TAO_Domain.pc.in:
+        * tao/DynamicAny/TAO_DynamicAny.pc.in:
+        * tao/DynamicInterface/TAO_DynamicInterface.pc.in:
+        * tao/IFR_Client/TAO_IFR_Client.pc.in:
+        * tao/IORInterceptor/TAO_IORInterceptor.pc.in:
+        * tao/IORManipulation/TAO_IORManip.pc.in:
+        * tao/ImR_Client/TAO_ImR_Client.pc.in:
+        * tao/Messaging/TAO_Messaging.pc.in:
+        * tao/ObjRefTemplate/TAO_ObjRefTemplate.pc.in:
+        * tao/PI/TAO_PI.pc.in:
+        * tao/PI_Server/TAO_PI_Server.pc.in:
+        * tao/PortableServer/TAO_PortableServer.pc.in:
+        * tao/RTCORBA/TAO_RTCORBA.pc.in:
+        * tao/RTPortableServer/TAO_RTPortableServer.pc.in:
+        * tao/RTScheduling/TAO_RTScheduler.pc.in:
+        * tao/Strategies/TAO_Strategies.pc.in:
+        * tao/TypeCodeFactory/TAO_TypeCodeFactory.pc.in:
+        * tao/Valuetype/TAO_Valuetype.pc.in:
+        * tao/TAO_Utils.pc.in
+
+          Update to add TAO_AnyTypeCode to "Requires:" as needed.
+
+        * tao/AnyTypeCode/TAO_AnyTypeCode.pc.in:
+
+          New file, pkg-config *.pc template for TAO_AnyTypeCode library.
+
+Mon Aug 22 13:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*:
+          Fixed minimum corba builds
+
+Mon Aug 22 10:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Removed a lot of files that are zapped
+
+        * tao/ORB.cpp
+        * tao/ORB.h
+        * tao/ORB_Core.cpp
+        * tao/ORB_Core.h
+        * tao/ORB_Core.i
+        * tao/PI/PICurrent_Loader.h
+        * tao/PI_Server/PI_Server.h
+        * tao/PI_Server/PortableServer_ORBInitializer.cpp
+        * tao/PI_Server/PortableServer_ORBInitializer.h
+        * tao/PortableServer/PortableServer.cpp
+        * tao/PortableServer/PortableServer.h
+        * tao/PortableServer/POA_Current.{h,cpp,inl}:
+        * tao/PortableServer/POA_Current_Factory.{h,cpp}:
+        * tao/PortableServer/PS_Current.pidl
+        * tao/PortableServer/PS_CurrentA.cpp
+        * tao/PortableServer/PS_CurrentC.cpp
+        * tao/PortableServer/PS_CurrentC.h
+          Moved POACurrent back to the PortableServer libary and use an object
+          loader to get it on demand instead of using an orbinitializer
+
+
+        * tao/PI_Server/POA_Current.cpp
+        * tao/PI_Server/POA_Current.h
+        * tao/PI_Server/POA_Current.inl
+        * tao/PI_Server/PS_Current.pidl
+        * tao/PI_Server/PS_CurrentA.cpp
+        * tao/PI_Server/PS_CurrentC.cpp
+        * tao/PI_Server/PS_CurrentC.h
+          Removed, back to PortableServer
+
+        * examples/POA/DSI/Database_i.h
+        * examples/POA/DSI/POA_DSI.mpc
+        * examples/POA/Default_Servant/File_i.cpp
+        * examples/POA/Default_Servant/POA_Default_Servant.mpc
+        * orbsvcs/ImplRepo_Service/Forwarder.cpp
+        * orbsvcs/ImplRepo_Service/Forwarder.h
+        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+        * orbsvcs/examples/ORT/Gateway_i.h
+        * orbsvcs/examples/ORT/ORT.mpc
+        * orbsvcs/orbsvcs/IFRService.mpc
+        * 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/scaletest.mpc
+        * orbsvcs/tests/ImplRepo/scale/server_i.cpp
+        * tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+        * tests/Collocation_Opportunities/Collocation_Opportunities.mpc
+        * tests/File_IO/File_IO.mpc
+        * tests/File_IO/File_i.cpp
+        * tests/ORT/ServerORBInitializer.cpp
+        * tests/POA/Current/Current.cpp
+        * tests/POA/Current/Current.mpc
+        * tests/POA/Persistent_ID/Persistent_ID.mpc
+        * tests/POA/Persistent_ID/server.cpp
+          Updated, no need to use PI_Server anymore now the POACurrent is
+          back to the PortableServer lib.
+
+        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+        * orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+          Removed explicit template instantiations
+
+        * tao/Valuetype/ValueBase.cpp
+          Use C++ cast instead of c-style cast
+
+Mon Aug 22 09:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Any.h:
+        * tao/AnyTypeCode/RefCount_Policy_Traits.h:
+          Include AnyTypeCode_methods instead of CORBA_methods
+
+        * tao/AnyTypeCode/AnyTypeCode_methods.h:
+          Added missing includes
+
+Mon Aug 22 08:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc:
+        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
+          Updated to resolve link errors
+
+Mon Aug 22 07:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+          Updated return type of operator >>
+
+Sun Aug 21 12:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode.inl:
+          Include AnyTypeCode_methods instead of CORBA_methods
+
+Sun Aug 21 11:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode.{h,cpp}:
+          Fixed compile errors with msvc6
+
+Sun Aug 21 11:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Transport.cpp:
+          Fixed warning in valgrind build
+
+Sun Aug 21 11:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc:
+        * tests/MT_Server/MT_Server.mpc:
+        * tests/Hello/Hello.mpc:
+        * tests/Hang_Shutdown/Hang.mpc:
+        * tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc:
+        * tests/Bug_1330_Regression/Bug_1330_Regression.mpc:
+          Updated to resolve link errors
+
+Sun Aug 21 11:23:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TAO_AnyTypeCode_Export.h:
+          Fixed vc71 static compile warnings
+
+Fri Aug 19 18:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl:
+          Added missing include
+
+        * examples/Kokyu_dsrt_schedulers/Kokyu_DSRT_Schedulers.mpc:
+          Added EDF_SchedulingC.cpp
+
+Fri Aug 19 18:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Union_TypeCode.cpp:
+          Fixed no return warning
+
+Fri Aug 19 18:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc:
+        * tests/Cache_Growth_Test/Cache_Growth_Test.mpc:
+          Updated to resolve link errors
+
+Fri Aug 19 18:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Fixed deprecated conversion warning
+
+Fri Aug 19 18:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc:
+        * performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc:
+        * tests/Crash_On_Write/Crash_On_Write.mpc:
+        * tests/MT_Client/MT_Client.mpc:
+        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
+        * tests/Single_Read/Single_Read.mpc:
+          Updated to resolve link errors
+
+Fri Aug 19 18:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/Messaging_PolicyFactory.{h,cpp}:
+          Fixed compile error when no messaging is defined
+
+Fri Aug 19 14:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ImR_Client/ImplRepoS.cpp:
+          Fixed some handcrafted code, will regenerate this file next week
+
+Fri Aug 19 13:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/NVList.h:
+          Fixed HP aCC compile error
+
+Fri Aug 19 12:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Profile.cpp:
+          Fixed 64bit conversion warnings by using the correct type or
+          using an explicit cast
+
+Fri Aug 19 12:24:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/SystemException.h:
+          Removed not needed trailing semi colon
+
+Fri Aug 19 11:58:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode.mpc:
+          Removed not existent file
+
+Fri Aug 19 11:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/DomainA.h:
+          Removed include of inline file.
+
+        * tao/AnyTypeCode/TypeCode.{h,cpp,inl}:
+          Moved operator << to cpp file
+
+Fri Aug 19 11:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Any_Insert_Policy_T.h:
+          Fix problem for HPUX, will move the special policies out of this
+          file soon.
+
+Fri Aug 19 10:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+          Fixed implicit conversion warning
+
+Fri Aug 19 09:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/PolicyA.h:
+          Removed include of inline file.
+
+Fri Aug 19 09:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Empty_Param_TypeCode.h:
+        * tao/AnyTypeCode/NVList.h:
+        * tao/AnyTypeCode/Objref_TypeCode_Static.h:
+        * tao/AnyTypeCode/Union_TypeCode_Static.h:
+        * tao/AnyTypeCode/Value_TypeCode_Static.h:
+          Fixed include of inline file.
+
+Fri Aug 19 08:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode.h:
+        * tao/AnyTypeCode/Alias_TypeCode_Static.h:
+        * tao/AnyTypeCode/Any.h:
+          Fixed include of inline file.
+
+Fri Aug 19 08:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+          Fixed compile error
+
+Fri Aug 19 07:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Merged AnyRefactor branch, a lot of files where moved to the
+        AnyTypeCode directory. Regenerated all files in the repo, add
+        AnyTypeCode as base project for a lot of MPC files, zapped
+        explicit templates
+
+        * TAO_IDL/be/be_codegen.cpp
+        * TAO_IDL/be/be_global.cpp
+        * TAO_IDL/be/be_produce.cpp
+        * TAO_IDL/be/be_visitor_arg_traits.cpp
+        * TAO_IDL/be/be_visitor_context.cpp
+        * TAO_IDL/be/be_visitor_root.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/paramlist.cpp
+        * TAO_IDL/be/be_visitor_array/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+        * TAO_IDL/be/be_visitor_field/serializer_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/interface_ch.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_module/module_ch.cpp
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+        * TAO_IDL/be/be_visitor_root/any_op.cpp
+        * TAO_IDL/be/be_visitor_root/root.cpp
+        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
+        * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_typecode/typecode_decl.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/cdr_op_cs.cpp
+        * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
+        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
+        * TAO_IDL/be/be_visitor_valuebox/any_op_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/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
+        * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
+        * TAO_IDL/be_include/be_codegen.h
+        * TAO_IDL/be_include/be_global.h
+        * TAO_IDL/be_include/be_visitor_arg_traits.h
+        * TAO_IDL/be_include/be_visitor_context.h
+        * TAO_IDL/be_include/be_visitor_root/root.h
+        * TAO_IDL/driver/drv_args.cpp
+        * docs/compiler.html
+        * docs/releasenotes/index.html
+        * examples/Buffered_AMI/client.cpp
+        * examples/Buffered_Oneways/client.cpp
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl
+        * examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl
+        * examples/POA/DSI/Database_i.cpp
+        * examples/POA/Default_Servant/POA_Default_Servant.mpc
+        * examples/POA/Forwarding/POA_Forwarding.mpc
+        * examples/POA/POA_BiDir/POA_BiDir.cpp
+        * examples/POA/TIE/POA_TIE.mpc
+        * examples/POA/TIE/client.cpp
+        * examples/POA/TIE/server.cpp
+        * examples/Simulator/NavWeap.idl
+        * examples/Simulator/Event_Supplier/Event_Con.cpp
+        * interop-tests/wchar/interop_wchar.mpc
+        * orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+        * orbsvcs/PSS/PSDL_Code_Gen.cpp
+        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
+        * orbsvcs/examples/ORT/Gateway_i.cpp
+        * orbsvcs/orbsvcs/PortableGroup.mpc
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
+        * 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.cpp
+        * 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.cpp
+        * 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.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+        * orbsvcs/orbsvcs/Log/PersistStore.cpp
+        * orbsvcs/orbsvcs/Log/PersistStore.h
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+        * orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+        * orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
+        * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+        * orbsvcs/tests/Bug_1630_Regression/test.mpc
+        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
+        * orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+        * orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+        * orbsvcs/tests/Security/BiDirectional/client.cpp
+        * orbsvcs/tests/Security/BiDirectional/server.cpp
+        * orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+        * performance-tests/Anyop/Anyop.mpc
+        * performance-tests/Anyop/anyop.cpp
+        * performance-tests/Callback/client.cpp
+        * performance-tests/Callback/server.cpp
+        * 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/RTCorba/Oneways/Reliable/client.cpp
+        * performance-tests/Sequence_Latency/DII/client.cpp
+        * performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
+        * performance-tests/Sequence_Latency/Deferred/client.cpp
+        * tao/Arg_Traits_T.h
+        * tao/Argument.cpp
+        * tao/Argument.h
+        * tao/Array_VarOut_T.h
+        * tao/Array_VarOut_T.inl
+        * tao/Asynch_Queued_Message.h
+        * tao/BD_String_Argument_T.cpp
+        * tao/BD_String_Argument_T.h
+        * tao/BD_String_Argument_T.inl
+        * tao/Basic_Argument_T.cpp
+        * tao/Basic_Argument_T.h
+        * tao/Basic_Argument_T.inl
+        * tao/Basic_Arguments.h
+        * tao/BiDir_GIOP.mpc
+        * tao/Block_Flushing_Strategy.h
+        * tao/BooleanSeqC.cpp
         * tao/BooleanSeqC.h
+        * tao/BooleanSeqS.h
+        * tao/Buffering_Constraint_Policy.cpp
+        * tao/Buffering_Constraint_Policy.h
+        * tao/CONV_FRAMEC.cpp
         * tao/CONV_FRAMEC.h
+        * tao/CONV_FRAMES.h
+        * tao/CORBANAME_Parser.cpp
+        * tao/CORBA_methods.h
+        * tao/Cache_Entries.h
+        * tao/Cache_Entries.inl
         * tao/CharSeqC.h
+        * tao/CodecFactory.mpc
+        * tao/CurrentC.cpp
+        * tao/CurrentC.h
+        * tao/CurrentS.h
+        * tao/Domain.mpc
+        * tao/DomainC.cpp
         * tao/DomainC.h
         * tao/DoubleSeqC.h
+        * tao/DynamicAny.mpc
+        * tao/DynamicInterface.mpc
+        * tao/Dynamic_Adapter.cpp
+        * tao/Exception.cpp
+        * tao/Exception.h
+        * tao/Fixed_Array_Argument_T.cpp
+        * tao/Fixed_Array_Argument_T.h
+        * tao/Fixed_Array_Argument_T.inl
+        * tao/Fixed_Size_Argument_T.cpp
+        * tao/Fixed_Size_Argument_T.h
+        * tao/Fixed_Size_Argument_T.inl
+        * tao/FloatSeqC.cpp
         * tao/FloatSeqC.h
+        * tao/FloatSeqS.h
+        * tao/Flushing_Strategy.h
+        * tao/GIOPC.cpp
+        * tao/GIOPC.h
+        * tao/GIOPS.h
+        * tao/GIOP_Message_Generator_Parser_10.cpp
+        * tao/GIOP_Message_Generator_Parser_12.cpp
+        * tao/GIOP_Message_Lite.cpp
+        * tao/IFR_Client.mpc
+        * tao/IFR_Client_Adapter.h
+        * tao/IIOP.pidl
+        * tao/IIOPC.cpp
         * tao/IIOPC.h
+        * tao/IIOP_Acceptor.cpp
         * tao/IIOP_EndpointsC.h
+        * tao/IOPC.cpp
+        * tao/IOPC.h
+        * tao/IOPS.h
+        * tao/IOP_IORC.cpp
         * tao/IOP_IORC.h
+        * tao/IOP_IORS.h
+        * tao/IORInterceptor.mpc
+        * tao/IORManipulation.mpc
+        * tao/IORTable.mpc
+        * tao/ImR_Client.mpc
+        * tao/Invocation_Adapter.h
+        * tao/Invocation_Base.cpp
+        * tao/Invocation_Base.h
+        * tao/Invocation_Base.inl
+        * tao/Leader_Follower_Flushing_Strategy.h
         * tao/LongDoubleSeqC.h
         * tao/LongLongSeqC.h
         * tao/LongSeqC.h
+        * tao/Messaging.mpc
+        * tao/Messaging_PolicyValue.pidl
         * tao/Messaging_PolicyValueC.h
+        * tao/ORB.cpp
         * tao/ORB.h
+        * tao/ORBInitializer_Registry_Adapter.h
+        * tao/ORB_Core.cpp
+        * tao/ORB_Core.h
+        * tao/ORB_Core.i
+        * tao/ORB_Core_Auto_Ptr.h
+        * tao/ORB_Core_TSS_Resources.cpp
+        * tao/ORB_Core_TSS_Resources.h
+        * tao/ORB_Table.h
+        * tao/ObjRefTemplate.mpc
+        * tao/Object.cpp
+        * tao/Object.h
         * tao/ObjectIdListC.h
-        * tao/Object_KeyC.h
+        * tao/Object_Argument_T.cpp
+        * tao/Object_Argument_T.h
+        * tao/Object_Argument_T.inl
+        * tao/Object_KeyC.cpp
+        * tao/OctetSeq.pidl
+        * tao/OctetSeqC.cpp
         * tao/OctetSeqC.h
+        * tao/OctetSeqS.h
+        * tao/PI.mpc
+        * tao/PI_ForwardC.cpp
+        * tao/PI_ForwardC.h
+        * tao/PI_Server.mpc
+        * tao/ParameterModeC.h
+        * tao/PolicyC.cpp
+        * tao/PolicyC.h
+        * tao/Policy_Current.cpp
+        * tao/Policy_ForwardC.cpp
         * tao/Policy_ForwardC.h
-        * tao/Seq_Out_T.h
-        * tao/Seq_Out_T.inl
+        * tao/Policy_ForwardS.h
+        * tao/PortableInterceptor.pidl
+        * tao/PortableInterceptorC.cpp
+        * tao/PortableInterceptorC.h
+        * tao/PortableInterceptorS.h
+        * tao/PortableServer.mpc
+        * tao/Profile.h
+        * tao/Profile_Transport_Resolver.h
+        * tao/Protocols_Hooks.h
+        * tao/RTCORBA.mpc
+        * tao/RTPortableServer.mpc
+        * tao/RTScheduler.mpc
+        * tao/Reactive_Flushing_Strategy.h
+        * tao/Refcounted_ObjectKey.h
+        * tao/Remote_Object_Proxy_Broker.cpp
+        * tao/ServerRequestInterceptor_Adapter.h
+        * tao/Services.pidl
+        * tao/ServicesC.cpp
         * tao/ServicesC.h
+        * tao/ServicesS.h
+        * tao/ShortSeqC.cpp
         * tao/ShortSeqC.h
+        * tao/ShortSeqS.h
+        * tao/SmartProxies.mpc
+        * tao/Special_Basic_Argument_T.cpp
+        * tao/Special_Basic_Argument_T.h
+        * tao/Special_Basic_Argument_T.inl
+        * tao/Special_Basic_Arguments.h
+        * tao/Strategies.mpc
+        * tao/StringSeqC.cpp
         * tao/StringSeqC.h
+        * tao/StringSeqS.h
+        * tao/Synch_Invocation.cpp
+        * tao/Synch_Invocation.h
+        * tao/Synch_Queued_Message.h
+        * tao/Synch_Reply_Dispatcher.h
+        * tao/SystemException.cpp
+        * tao/SystemException.h
+        * tao/TAOC.cpp
+        * tao/TAOC.h
+        * tao/TAOS.h
+        * tao/TAO_Server_Request.cpp
+        * tao/TAO_Server_Request.h
+        * tao/TAO_Server_Request.i
+        * tao/TSS_Resources.h
+        * tao/TimeBaseC.h
+        * tao/Transport.cpp
+        * tao/Transport.h
+        * tao/TypeCodeFactory.mpc
+        * tao/TypeCodeFactory_Adapter.cpp
+        * tao/TypeCodeFactory_Adapter.h
+        * tao/UB_String_Argument_T.cpp
+        * tao/UB_String_Argument_T.h
+        * tao/UB_String_Argument_T.inl
+        * tao/UB_String_Arguments.h
+        * tao/ULongLongSeqC.cpp
         * tao/ULongLongSeqC.h
+        * tao/ULongLongSeqS.h
+        * tao/ULongSeqC.cpp
         * tao/ULongSeqC.h
+        * tao/ULongSeqS.h
         * tao/UShortSeqC.h
+        * tao/UserException.cpp
+        * tao/UserException.h
+        * tao/UserException.inl
+        * tao/Utils.mpc
+        * tao/Valuetype.mpc
+        * tao/Valuetype_Adapter.cpp
+        * tao/Var_Array_Argument_T.cpp
+        * tao/Var_Array_Argument_T.h
+        * tao/Var_Array_Argument_T.inl
+        * tao/Var_Size_Argument_T.cpp
+        * tao/Var_Size_Argument_T.h
+        * tao/Var_Size_Argument_T.inl
+        * tao/WCharSeqC.cpp
         * tao/WCharSeqC.h
+        * tao/WCharSeqS.h
+        * tao/WStringSeqC.cpp
         * tao/WStringSeqC.h
-        * tao/AnyTypeCode/AnySeqC.h
-        * tao/AnyTypeCode/DynamicC.h
-        * tao/DynamicAny/DynamicAnyC.h
-        * tao/IFR_Client/IFR_BaseC.h
-        * tao/IFR_Client/IFR_BasicC.h
-        * tao/IFR_Client/IFR_ComponentsC.h
-        * tao/IFR_Client/IFR_ExtendedC.h
-        * tao/IORManipulation/IORC.h
-        * tao/ImR_Client/ImplRepoC.h
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.h
-        * tao/PortableServer/PortableServerC.h
-        * tao/RTCORBA/RTCORBAC.h
-        * tao/RTScheduling/RTSchedulerC.h
-        * tao/Strategies/sciop_endpointsC.h
-        * tao/Strategies/uiop_endpointsC.h
-        Simplified TAO_Seq_Out_T to just use one template argument. Updated
-        the IDL compiler for this. Also use false for the release argument
-        of generated sequence constructors and add an argument to
-        _tao_encode/_tao_decode when generated in a header file to help
-        doxygen.
-
-        * TAO_Objref_Out_T.{h,inl}:
-        Assinging _var to _out is not allowed according to the spec
-
-        * tao/Messaging/*:
-        Removed old AMI mapping. Fixes partly bugzilla bug 2273, need to
-        update the IDL compiler yet
-
-        * tao/Exception.h:
-        Moved constructors, assignment operator and copy constructor to
-        protected now vc6 has been dropped. Also moved
-        create_system_exception from TAO_Exceptions class to TAO namespace
-
-        * tao/Messaging/Messaging.cpp:
-        * tao/Sync_Invocation.cpp:
-        * tao/SystemException.cpp:
-        Updated because of the create_system_exception move
-
-        * tao/String_Manager_T.h:
-        Renamed String_Manager to String_Manager_T, this way we can have
-        TAO::String_Manager and TAO::WString_Manager. These replace
-        TAO_String_Manager and TAO_WString_Manager
-
-        * CIAO/tools/Config_Handlers/DnC_Dump.cpp
-        * CIAO/tools/Config_Handlers/DnC_Dump.h
-        * TAO_IDL/be/be_visitor_array/array.cpp
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp
-        * orbsvcs/PSS/PSDL_Exception_Visitor.cpp
-        * orbsvcs/PSS/PSDL_Node.h
-        * orbsvcs/PSS/PSDL_Struct_Visitor.cpp
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
-        * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
-        * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
-        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
-        * tao/CORBA_String.h
-        * tao/IIOPC.h
-        * tao/IIOP_EndpointsC.h
-        * tao/IOP_IORC.h
-        * tao/String_Manager_T.h
-        * tao/String_Traits_Base_T.h
-        * tao/Tagged_Profile.h
+        * tao/WStringSeqS.h
+        * tao/Wait_On_LF_No_Upcall.h
+        * tao/Wait_On_Leader_Follower.h
+        * tao/Wait_On_Reactor.h
+        * tao/Wait_On_Read.h
+        * tao/Wait_Strategy.h
+        * tao/WrongTransactionC.cpp
+        * tao/WrongTransactionC.h
+        * tao/corba.h
+        * tao/corbafwd.h
+        * tao/extra_core.mpb
+        * tao/operation_details.cpp
+        * tao/operation_details.h
+        * tao/operation_details.i
+        * tao/orb.idl
+        * tao/orb_typesC.cpp
+        * tao/orb_typesC.h
+        * tao/orb_typesS.h
+        * tao/params.h
+        * tao/tao.mpc
+        * tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+        * tao/CodecFactory/CDR_Encaps_Codec.cpp
+        * tao/CodecFactory/IOP_CodecA.cpp
+        * tao/CodecFactory/IOP_CodecC.h
+        * tao/Domain/DomainS.cpp
+        * tao/DynamicAny/DynAny_i.cpp
+        * tao/DynamicAny/DynArray_i.cpp
+        * tao/DynamicAny/DynCommon.cpp
+        * tao/DynamicAny/DynEnum_i.cpp
+        * tao/DynamicAny/DynSequence_i.cpp
+        * tao/DynamicAny/DynStruct_i.cpp
+        * tao/DynamicAny/DynUnion_i.cpp
         * tao/DynamicAny/DynamicAnyC.h
-        * tao/IFR_Client/IFR_BaseC.h
-        * tao/IFR_Client/IFR_BasicC.h
-        * tao/IFR_Client/IFR_ComponentsC.h
-        * tao/IFR_Client/IFR_ExtendedC.h
-        * tao/ImR_Client/ImplRepoC.h
-        * tao/PI/ORBInitInfoC.h
-        * tao/Strategies/sciop_endpointsC.h
-        * tao/Strategies/uiop_endpointsC.h
-        Updated all these files because of TAO::String_Manager and
-        TAO::WString_Manager introduction
-
-        * tests/Sequence_Unit_Tests/mock_reference.cpp:
-        * tests/Sequence_Unit_Tests/mock_reference.hpp:
-        Added counter to count number of marshal calls
-
-        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp:
-        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp:
-        Check the right counter, should be marshal.
-
-        * tao/PI/ClientRequestDetails.cpp:
-        * tao/PI_Server/ServerRequestDetails.cpp:
-        Added missing duplicate call
-
-        * TAO_IDL/be/be_interface.cpp
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/tie_si.cpp
-        * TAO_IDL/be/be_visitor_root/root.cpp
-        * tao/CurrentC.cpp
-        * tao/DomainC.cpp
-        * tao/ORB_Core.cpp
-        * tao/Object.cpp
-        * tao/Object_Ref_Table.cpp
-        * tao/PolicyC.cpp
-        * tao/Pseudo_VarOut_T.cpp
-        * tao/Pseudo_VarOut_T.inl
-        * tao/TAOC.cpp
-        * tao/AnyTypeCode/Any_Array_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Basic_Impl.cpp
-        * tao/AnyTypeCode/Any_Basic_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Impl.cpp
-        * tao/AnyTypeCode/Any_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Special_Impl_T.cpp
-        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
-        * tao/AnyTypeCode/TypeCode.cpp
-        * tao/AnyTypeCode/TypeCode.inl
-        * tao/BiDir_GIOP/BiDirPolicyC.cpp
-        * tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
-        * tao/CSD_Framework/CSD_FrameworkC.cpp
-        * tao/CSD_Framework/CSD_POA.cpp
-        * tao/CodecFactory/IOP_CodecC.cpp
-        * tao/DynamicAny/DynamicAnyC.cpp
+        * tao/DynamicInterface/Context.cpp
+        * tao/DynamicInterface/DII_Arguments.cpp
+        * tao/DynamicInterface/DII_Arguments.h
+        * tao/DynamicInterface/DII_Invocation.cpp
         * tao/DynamicInterface/Dynamic_Implementation.cpp
+        * tao/DynamicInterface/Dynamic_Implementation.h
         * tao/DynamicInterface/ExceptionList.cpp
         * tao/DynamicInterface/Request.cpp
+        * tao/DynamicInterface/Request.h
         * tao/DynamicInterface/Server_Request.cpp
+        * tao/DynamicInterface/Unknown_User_Exception.cpp
+        * tao/DynamicInterface/Unknown_User_Exception.h
+        * tao/IFR_Client/IFR_Base.pidl
         * 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_Basic.pidl
         * tao/IFR_Client/IFR_BasicC.cpp
+        * tao/IFR_Client/IFR_BasicC.h
+        * tao/IFR_Client/IFR_BasicC.inl
         * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.h
+        * tao/IFR_Client/IFR_Components.pidl
         * tao/IFR_Client/IFR_ComponentsC.cpp
+        * tao/IFR_Client/IFR_ComponentsC.h
+        * tao/IFR_Client/IFR_ComponentsC.inl
+        * tao/IFR_Client/IFR_Extended.pidl
         * tao/IFR_Client/IFR_ExtendedC.cpp
+        * tao/IFR_Client/IFR_ExtendedC.h
+        * tao/IFR_Client/IFR_ExtendedC.inl
         * tao/IORInterceptor/IORInfoC.cpp
-        * tao/IORInterceptor/IORInterceptorC.cpp
-        * tao/IORManipulation/IORC.cpp
-        * tao/IORManipulation/IORManipulation.cpp
-        * tao/IORTable/IORTableC.cpp
-        * tao/IORTable/Table_Adapter.cpp
+        * tao/IORManipulation/IORA.cpp
+        * tao/ImR_Client/ImplRepo.pidl
+        * tao/ImR_Client/ImplRepoA.cpp
         * tao/ImR_Client/ImplRepoC.cpp
-        * tao/ImR_Client/ServerObjectC.cpp
+        * tao/ImR_Client/ImplRepoS.cpp
+        * tao/ImR_Client/ServerObjectA.cpp
+        * tao/ImR_Client/ServerObjectS.cpp
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp
+        * tao/Messaging/Messaging.cpp
+        * tao/Messaging/MessagingA.cpp
         * tao/Messaging/MessagingC.cpp
-        * tao/Messaging/Messaging_No_ImplC.cpp
-        * tao/Messaging/Messaging_RT_PolicyC.cpp
-        * tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+        * tao/Messaging/MessagingS.cpp
+        * tao/Messaging/Messaging_No_ImplA.cpp
+        * tao/Messaging/Messaging_PolicyFactory.cpp
+        * tao/Messaging/Messaging_PolicyFactory.h
+        * tao/Messaging/Messaging_Policy_i.cpp
+        * tao/Messaging/Messaging_RT_PolicyA.cpp
+        * tao/Messaging/Messaging_SyncScope_PolicyA.cpp
         * tao/Messaging/PollableC.cpp
-        * tao/Messaging/TAO_ExtC.cpp
-        * tao/PI/ClientRequestInfoC.cpp
-        * tao/PI/ClientRequestInterceptorC.cpp
-        * tao/PI/InterceptorC.cpp
+        * tao/Messaging/TAO_ExtA.cpp
+        * tao/ObjRefTemplate/Default_ORTA.cpp
+        * tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+        * tao/PI/ClientRequestInfo.cpp
+        * tao/PI/ClientRequestInfo.h
+        * tao/PI/ClientRequestInfoA.cpp
+        * tao/PI/ClientRequestInfoC.h
+        * tao/PI/ClientRequestInterceptorA.cpp
+        * tao/PI/InterceptorA.cpp
         * tao/PI/ORBInitInfo.cpp
-        * tao/PI/ORBInitInfoC.cpp
-        * tao/PI/ORBInitializerC.cpp
-        * tao/PI/PICurrentC.cpp
-        * tao/PI/PolicyFactoryC.cpp
-        * tao/PI/PolicyFactory_Registry.cpp
-        * tao/PI/ProcessingModePolicyC.cpp
-        * tao/PI/RequestInfoC.cpp
-        * tao/PI_Server/ServerRequestInfoC.cpp
-        * tao/PI_Server/ServerRequestInterceptorC.cpp
+        * tao/PI/ORBInitInfoA.cpp
+        * tao/PI/ORBInitializerA.cpp
+        * tao/PI/ORBInitializer_Registry_Impl.cpp
+        * tao/PI/ORBInitializer_Registry_Impl.h
+        * tao/PI/PI.h
+        * tao/PI/PIForwardRequestA.cpp
+        * tao/PI/PolicyFactoryA.cpp
+        * tao/PI/PolicyFactoryC.h
+        * tao/PI/RequestInfo.pidl
+        * tao/PI/RequestInfoA.cpp
+        * tao/PI/RequestInfoC.h
+        * tao/PI_Server/POA_Current.cpp
+        * tao/PI_Server/PS_CurrentA.cpp
+        * tao/PI_Server/ServerInterceptorAdapter.cpp
+        * tao/PI_Server/ServerInterceptorAdapter.h
+        * tao/PI_Server/ServerRequestInfo.cpp
+        * tao/PI_Server/ServerRequestInfoA.cpp
+        * tao/PI_Server/ServerRequestInfoC.h
+        * tao/PI_Server/ServerRequestInterceptorA.cpp
+        * tao/PortableServer/AdapterActivatorA.cpp
         * tao/PortableServer/AdapterActivatorC.cpp
+        * tao/PortableServer/AdapterActivatorC.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/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/ForwardRequestA.cpp
+        * tao/PortableServer/ForwardRequestC.cpp
+        * tao/PortableServer/ForwardRequestC.h
+        * tao/PortableServer/IdAssignmentPolicyA.cpp
         * tao/PortableServer/IdAssignmentPolicyC.cpp
+        * tao/PortableServer/IdAssignmentPolicyC.h
+        * tao/PortableServer/IdUniquenessPolicyA.cpp
         * tao/PortableServer/IdUniquenessPolicyC.cpp
+        * tao/PortableServer/IdUniquenessPolicyC.h
+        * tao/PortableServer/ImplicitActivationPolicyA.cpp
         * tao/PortableServer/ImplicitActivationPolicyC.cpp
+        * tao/PortableServer/ImplicitActivationPolicyC.h
+        * tao/PortableServer/LifespanPolicyA.cpp
         * tao/PortableServer/LifespanPolicyC.cpp
-        * tao/PortableServer/Object_Adapter.cpp
-        * tao/PortableServer/POAManager.cpp
+        * tao/PortableServer/LifespanPolicyC.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/POAManagerC.cpp
-        * tao/PortableServer/PS_CurrentC.cpp
+        * tao/PortableServer/POAManagerC.h
+        * tao/PortableServer/POA_Current_Impl.cpp
+        * tao/PortableServer/PS_ForwardA.cpp
+        * tao/PortableServer/PS_ForwardC.cpp
+        * tao/PortableServer/PS_ForwardC.h
+        * tao/PortableServer/PolicyS.cpp
+        * tao/PortableServer/PortableServer.h
+        * tao/PortableServer/PortableServerA.cpp
         * tao/PortableServer/PortableServerC.cpp
+        * tao/PortableServer/PortableServerC.h
+        * tao/PortableServer/PortableServerS.h
+        * tao/PortableServer/PortableServer_includeC.h
+        * tao/PortableServer/PortableServer_includeS.h
+        * tao/PortableServer/RequestProcessingPolicyA.cpp
         * tao/PortableServer/RequestProcessingPolicyC.cpp
+        * tao/PortableServer/RequestProcessingPolicyC.h
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
         * tao/PortableServer/Root_POA.cpp
+        * tao/PortableServer/ServantActivatorA.cpp
         * tao/PortableServer/ServantActivatorC.cpp
+        * tao/PortableServer/ServantActivatorC.h
+        * tao/PortableServer/ServantLocatorA.cpp
         * tao/PortableServer/ServantLocatorC.cpp
+        * tao/PortableServer/ServantLocatorC.h
+        * tao/PortableServer/ServantManagerA.cpp
         * tao/PortableServer/ServantManagerC.cpp
+        * tao/PortableServer/ServantManagerC.h
+        * tao/PortableServer/ServantRetentionPolicyA.cpp
         * tao/PortableServer/ServantRetentionPolicyC.cpp
+        * tao/PortableServer/ServantRetentionPolicyC.h
+        * tao/PortableServer/Servant_Base.cpp
+        * 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/ThreadPolicyA.cpp
         * tao/PortableServer/ThreadPolicyC.cpp
-        * tao/RTCORBA/RTCORBAC.cpp
-        * tao/RTPortableServer/RTPortableServerC.cpp
+        * tao/PortableServer/ThreadPolicyC.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_SArguments.h
+        * tao/PortableServer/Upcall_Wrapper.cpp
+        * tao/PortableServer/Var_Array_SArgument_T.cpp
+        * tao/PortableServer/Var_Array_SArgument_T.h
+        * tao/PortableServer/Var_Array_SArgument_T.inl
+        * tao/PortableServer/Var_Size_SArgument_T.cpp
+        * tao/PortableServer/Var_Size_SArgument_T.h
+        * tao/PortableServer/Var_Size_SArgument_T.inl
+        * tao/RTCORBA/RTCORBAA.cpp
+        * tao/RTCORBA/RT_Policy_i.cpp
+        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+        * tao/RTPortableServer/RTPortableServerA.cpp
         * tao/RTScheduling/Current.cpp
+        * tao/RTScheduling/RTSchedulerA.cpp
         * tao/RTScheduling/RTSchedulerC.cpp
-        * tao/TypeCodeFactory/TypeCodeFactoryC.cpp
-        * tao/Utils/Server_Main.cpp
-        * tao/Valuetype/AbstractBase.cpp:
-        Use :: before ::CORBA
-
-        * TAO_IDL/be/be_interface.cpp
-        * tao/DomainC.cpp
-        * tao/DomainC.inl
-        * tao/GIOPC.h
-        * tao/PolicyC.cpp
-        * tao/PolicyC.h
-        * tao/PolicyC.inl
-        * tao/WrongTransactionC.cpp
+        * tao/RTScheduling/Request_Interceptor.cpp
+        * tao/Strategies/sciop_endpointsC.cpp
+        * tao/Strategies/uiop_endpointsC.cpp
+        * tao/TypeCodeFactory/Recursive_TypeCode.h
+        * tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+        * tao/TypeCodeFactory/TypeCodeFactoryC.h
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+        * tao/Valuetype/AbstractBase.h
+        * tao/Valuetype/StringValueC.cpp
+        * tao/Valuetype/ValueBase.cpp
+        * tao/Valuetype/ValueBase.h
+        * tests/AMI_Buffering/AMI_Buffering.mpc
+        * tests/AMI_Buffering/client.cpp
+        * tests/AMI_Timeouts/AMI_Timeouts.mpc
+        * tests/AMI_Timeouts/timeout_client.cpp
+        * tests/Any/Recursive/RecursiveHello.mpc
+        * tests/BiDirectional/BiDirectional.mpc
+        * tests/BiDirectional/client.cpp
+        * tests/BiDirectional/server.cpp
+        * tests/BiDirectional_MultipleORB/destroy.cpp
+        * tests/BiDirectional_MultipleORB/destroy.mpc
+        * tests/BiDirectional_NestedUpcall/client.cpp
+        * tests/BiDirectional_NestedUpcall/server.cpp
+        * tests/Big_Reply/Big_Reply.mpc
+        * tests/Big_Request_Muxing/Client_Task.cpp
+        * tests/Blocking_Sync_None/client.cpp
+        * tests/Bug_1020_Basic_Regression/client.cpp
+        * tests/Bug_1020_Regression/client.cpp
+        * tests/Bug_1269_Regression/client.cpp
+        * tests/Bug_1270_Regression/client.cpp
+        * tests/Bug_1361_Regression/client.cpp
+        * tests/Bug_1476_Regression/Client_Task.cpp
+        * tests/Bug_1476_Regression/client.cpp
+        * tests/Bug_1482_Regression/client.cpp
+        * tests/Bug_1551_Regression/client.cpp
+        * tests/Bug_1627_Regression/test.mpc
+        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc
+        * tests/CDR/CDR.mpc
+        * tests/CDR/basic_types.cpp
+        * tests/CDR/tc.cpp
+        * tests/Client_Leaks/Client_Leaks.mpc
+        * tests/CodeSets/simple/CodeSets_simple.mpc
+        * tests/Collocation/Collocation.mpc
+        * tests/Collocation_Oneway_Tests/Client_Task.cpp
+        * tests/Connection_Timeout/client.cpp
+        * tests/Crashed_Callback/client.cpp
+        * tests/Crashed_Callback/server.cpp
+        * tests/DLL_ORB/DLL_ORB.mpc
+        * tests/DynAny_Test/data.cpp
+        * tests/DynAny_Test/data.h
+        * tests/File_IO/File_IO.mpc
+        * tests/Forwarding/Forwarding.mpc
+        * tests/Hello/Hello.mpc
+        * tests/IDL_Test/IDL_Test.mpc
+        * tests/IDL_Test/main.cpp
+        * tests/InterOp-Naming/InterOp-Naming.mpc
+        * tests/MProfile_Connection_Timeout/client.cpp
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+        * tests/MT_BiDir/client.cpp
+        * tests/MT_BiDir/server.cpp
+        * tests/MT_Client/MT_Client.mpc
+        * tests/MT_Server/MT_Server.mpc
+        * tests/MT_Timeout/Client_Task.cpp
+        * tests/Muxing/Muxing.mpc
+        * tests/Native_Exceptions/Native_Exceptions.mpc
+        * tests/Nested_Upcall_Crash/client.cpp
+        * tests/Nested_Upcall_Crash/scavenger.cpp
+        * tests/Nested_Upcall_Crash/server.cpp
+        * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+        * tests/ORT/ORT.mpc
+        * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+        * tests/OctetSeq/OctetSeq.mpc
+        * tests/Oneway_Buffering/client.cpp
+        * tests/POA/Current/Current.mpc
+        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+        * tests/POA/Policies/Policies.cpp
+        * tests/Param_Test/Param_Test.mpc
+        * tests/Param_Test/param_test.idl
+        * tests/Policies/Manipulation.cpp
+        * tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+        * tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+        * tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+        * tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+        * tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+        * tests/Portable_Interceptors/ForwardRequest/test.idl
+        * tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+        * tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+        * tests/Portable_Interceptors/PICurrent/client.cpp
+        * tests/Portable_Interceptors/PICurrent/test_i.h
+        * tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+        * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+        * tests/RTCORBA/Policies/Policies.cpp
+        * tests/Reliable_Oneways/client.cpp
+        * tests/Server_Leaks/Server_Leaks.mpc
+        * tests/Stack_Recursion/Stack_Recursion.mpc
+        * tests/Timed_Buffered_Oneways/client.cpp
+        * tests/Timeout/client.cpp
+        * tests/Two_Objects/Two_Objects.mpc
+        * tests/Typedef_String_Array/typedef_string_array.mpc
+        * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
+        * utils/catior/catior.cpp
+          Updated these files because of the AnyTypeCode refactoring
+
+        * 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/AnySeq.pidl
+        * tao/AnyTypeCode/AnySeqA.cpp
+        * tao/AnyTypeCode/AnySeqA.h
+        * tao/AnyTypeCode/AnySeqC.cpp
+        * tao/AnyTypeCode/AnySeqC.h
+        * tao/AnyTypeCode/AnySeqS.h
+        * 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_Impl_T.h
+        * tao/AnyTypeCode/Any_Impl_T.inl
+        * 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/BooleanSeqA.cpp
+        * tao/AnyTypeCode/BooleanSeqA.h
+        * tao/AnyTypeCode/Bounds.pidl
+        * 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/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/Dynamic.pidl
+        * tao/AnyTypeCode/DynamicA.cpp
+        * tao/AnyTypeCode/DynamicA.h
+        * tao/AnyTypeCode/DynamicC.cpp
+        * tao/AnyTypeCode/DynamicC.h
+        * tao/AnyTypeCode/DynamicS.h
+        * tao/AnyTypeCode/Dynamic_Parameter.pidl
+        * tao/AnyTypeCode/Dynamic_ParameterA.cpp
+        * tao/AnyTypeCode/Dynamic_ParameterA.h
+        * tao/AnyTypeCode/Dynamic_ParameterC.cpp
+        * tao/AnyTypeCode/Dynamic_ParameterC.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/ExceptionA.cpp
+        * tao/AnyTypeCode/ExceptionA.h
+        * tao/AnyTypeCode/Fixed_TypeCode.cpp
+        * tao/AnyTypeCode/Fixed_TypeCode.h
         * tao/AnyTypeCode/Fixed_TypeCode.inl
+        * 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/IOPA.cpp
+        * tao/AnyTypeCode/IOPA.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/Marshal.cpp
+        * tao/AnyTypeCode/Marshal.h
+        * tao/AnyTypeCode/Marshal.inl
+        * tao/AnyTypeCode/Messaging_PolicyValueA.cpp
+        * tao/AnyTypeCode/Messaging_PolicyValueA.h
+        * tao/AnyTypeCode/Messaging_SyncScopeA.h
+        * 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/ObjectIdListA.cpp
+        * tao/AnyTypeCode/ObjectIdListA.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/OctetSeqA.cpp
+        * tao/AnyTypeCode/OctetSeqA.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.cpp
+        * tao/AnyTypeCode/PortableInterceptorA.h
         * 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/ServicesA.cpp
+        * tao/AnyTypeCode/ServicesA.h
+        * tao/AnyTypeCode/ShortSeqA.cpp
+        * tao/AnyTypeCode/ShortSeqA.h
+        * tao/AnyTypeCode/StringSeqA.cpp
+        * tao/AnyTypeCode/StringSeqA.h
+        * 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/String_TypeCode_Traits.h
+        * 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/SystemExceptionA.cpp
+        * tao/AnyTypeCode/SystemExceptionA.h
+        * tao/AnyTypeCode/TAOA.cpp
+        * tao/AnyTypeCode/TAOA.h
+        * tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+        * tao/AnyTypeCode/TC_Constants_Forward.h
+        * tao/AnyTypeCode/TimeBaseA.cpp
+        * tao/AnyTypeCode/TimeBaseA.h
+        * 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/TypeCodeA.cpp
+        * tao/AnyTypeCode/TypeCode_Base_Attributes.cpp
+        * 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.cpp
+        * tao/AnyTypeCode/TypeCode_Constants.h
+        * tao/AnyTypeCode/TypeCode_Struct_Field.h
+        * tao/AnyTypeCode/TypeCode_Traits.h
+        * tao/AnyTypeCode/TypeCode_Value_Field.h
+        * tao/AnyTypeCode/Typecode_typesA.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/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/ValueModifier.pidl
+        * tao/AnyTypeCode/ValueModifierA.cpp
+        * tao/AnyTypeCode/ValueModifierA.h
+        * tao/AnyTypeCode/ValueModifierC.cpp
+        * tao/AnyTypeCode/ValueModifierC.h
+        * tao/AnyTypeCode/ValueModifierS.h
+        * 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/BiDir_GIOP/BiDir_Policy_i.cpp
-        * tao/CodecFactory/IOP_CodecC.cpp
-        * tao/Domain/DomainS.cpp
-        * tao/DynamicAny/DynamicAnyC.cpp
+        * tao/AnyTypeCode/Visibility.pidl
+        * tao/AnyTypeCode/VisibilityA.cpp
+        * tao/AnyTypeCode/VisibilityA.h
+        * tao/AnyTypeCode/VisibilityC.cpp
+        * tao/AnyTypeCode/VisibilityC.h
+        * tao/AnyTypeCode/VisibilityS.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/append.cpp
+        * tao/AnyTypeCode/orb_typesA.cpp
+        * tao/AnyTypeCode/orb_typesA.h
+        * tao/AnyTypeCode/skip.cpp
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
+        * tao/AnyTypeCode.mpc
+        * tao/AnyTypeCode_Adapter.cpp
+        * tao/AnyTypeCode_Adapter.h
+        * tao/Any_Insert_Policy_T.h
+        * tao/NVList_Adapter.cpp
+        * tao/NVList_Adapter.h
+        * tao/IFR_Client/IFR_BaseA.h
+        * tao/IFR_Client/IFR_BasicA.h
+        * tao/IFR_Client/IFR_ComponentsA.h
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_includeA.h
+        * tao/PI/InvalidSlot.pidl
+        * tao/PI/InvalidSlotA.cpp
+        * tao/PI/InvalidSlotA.h
+        * tao/PI/InvalidSlotC.cpp
+        * tao/PI/InvalidSlotC.h
+        * tao/PI/InvalidSlotS.h
+        * tao/PortableServer/PortableServer_includeA.h
+        * tao/PortableServer/RequestProcessingPolicyA.h
+        * tao/PortableServer/SArg_Traits_T.h
+        * tao/PortableServer/ServantActivatorA.h
+        * tao/PortableServer/ServantLocatorA.h
+        * tao/PortableServer/ServantManagerA.h
+        * tao/PortableServer/ServantRetentionPolicyA.h
+        * tao/PortableServer/ThreadPolicyA.h
+        * tao/PI/PICurrent.cpp
+        * tao/PI/PICurrent.h
+        * tao/PI/PICurrent.inl
+        * tao/PI/PICurrent.pidl
+        * tao/PI/PICurrentA.cpp
+        * tao/PI/PICurrentA.h
+        * tao/PI/PICurrentC.cpp
+        * tao/PI/PICurrentC.h
+        * tao/PI/PICurrentS.h
+        * 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/RTCORBA/RTCORBA_includeA.h
+        * tao/ImR_Client/ImplRepoA.h
+        * tao/IFR_Client/IFR_ExtendedA.h
+        * tao/RTScheduling/RTScheduler_includeA.h
+        * tao/PortableServer/ForwardRequestA.h
+        * tao/PortableServer/IdAssignmentPolicyA.h
+        * tao/PortableServer/IdUniquenessPolicyA.h
+        * tao/ImR_Client/ServerObjectA.h
+        * tao/PortableServer/ImplicitActivationPolicyA.h
+        * tao/PortableServer/LifespanPolicyA.h
+        * tao/PortableServer/AdapterActivatorA.h
+        * tao/PortableServer/PS_ForwardA.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_include.pidl
+        * tao/PI_Server/PI_Server_includeA.h
+        * tao/PI_Server/PI_Server_includeC.h
+        * tao/PI_Server/PI_Server_includeS.h
+          Added these files to the repo
+
+        * tao/UShortSeqA.cpp
+        * tao/Union_TypeCode.cpp
+        * tao/Union_TypeCode.h
+        * tao/Union_TypeCode.inl
+        * tao/Union_TypeCode_Static.cpp
+        * tao/Union_TypeCode_Static.h
+        * tao/Union_TypeCode_Static.inl
+        * tao/Dynamic.pidl
+        * tao/DynamicA.cpp
+        * tao/DynamicC.cpp
+        * tao/DynamicC.h
+        * tao/DynamicS.h
+        * tao/Dynamic_Parameter.pidl
+        * tao/Dynamic_ParameterA.cpp
+        * tao/Dynamic_ParameterC.cpp
+        * tao/Dynamic_ParameterC.h
+        * tao/Empty_Param_TypeCode.cpp
+        * tao/Empty_Param_TypeCode.h
+        * tao/Empty_Param_TypeCode.inl
+        * tao/Enum_TypeCode.cpp
+        * tao/Enum_TypeCode.h
+        * tao/Enum_TypeCode.inl
+        * tao/Enum_TypeCode_Static.cpp
+        * tao/Enum_TypeCode_Static.h
+        * tao/Enum_TypeCode_Static.inl
+        * tao/Valuetype/Seq_Tmplinst.cpp
+        * TAO_IDL/be/be_visitor_tmplinst.cpp
+        * TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst.cpp
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl
+        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp
+        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h
+        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h.diff
+        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.i
+        * TAO_IDL/be_include/be_visitor_tmplinst.h
+        * TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h
+        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst.h
+        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h
+        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_ss.h
+        * tao/ULongSeqA.cpp
+        * orbsvcs/orbsvcs/IFRService/tmplinst.cpp
+        * tao/Alias_TypeCode.cpp
+        * tao/Alias_TypeCode.h
+        * tao/Alias_TypeCode.inl
+        * tao/Alias_TypeCode_Static.cpp
+        * tao/Alias_TypeCode_Static.h
+        * tao/Alias_TypeCode_Static.inl
+        * tao/Any.cpp
+        * tao/Any.h
+        * tao/Any.i
+        * tao/AnySeq.pidl
+        * tao/AnySeqA.cpp
+        * tao/AnySeqC.cpp
+        * tao/AnySeqC.h
+        * tao/AnySeqS.h
+        * tao/Any_Arg_Traits.h
+        * tao/Any_Array_Impl_T.cpp
+        * tao/Any_Array_Impl_T.h
+        * tao/Any_Array_Impl_T.inl
+        * tao/Any_Basic_Impl.cpp
+        * tao/Any_Basic_Impl.h
+        * tao/Any_Basic_Impl_T.cpp
+        * tao/SystemExceptionA.cpp
+        * tao/TAOA.cpp
+        * tao/IFR_Client/IFR_ExtendedA.cpp
+        * tao/Any_Basic_Impl_T.h
+        * tao/Any_Basic_Impl_T.inl
+        * tao/Any_Dual_Impl_T.cpp
+        * tao/Any_Dual_Impl_T.h
+        * tao/Any_Dual_Impl_T.inl
+        * tao/Any_Impl.cpp
+        * tao/Any_Impl.h
+        * tao/Any_Impl_T.cpp
+        * tao/Any_Impl_T.h
+        * tao/Any_Impl_T.inl
+        * tao/IFR_Client/IFR_ComponentsA.cpp
+        * tao/IFR_Client/IFR_BaseA.cpp
+        * tao/IFR_Client/IFR_BasicA.cpp
+        * tao/ValueModifier.pidl
+        * tao/ValueModifierC.cpp
+        * tao/ValueModifierC.h
+        * tao/ValueModifierS.h
+        * tao/Value_TypeCode.cpp
+        * tao/Value_TypeCode.h
+        * tao/Value_TypeCode.inl
+        * tao/Value_TypeCode_Static.cpp
+        * tao/Value_TypeCode_Static.h
+        * tao/Value_TypeCode_Static.inl
+        * tao/Any_Special_Impl_T.cpp
+        * tao/Any_Special_Impl_T.h
+        * tao/Any_Special_Impl_T.inl
+        * tao/Any_SystemException.cpp
+        * tao/Any_SystemException.h
+        * tao/Any_Unknown_IDL_Type.cpp
+        * tao/Any_Unknown_IDL_Type.h
+        * tao/BooleanSeqA.cpp
+        * tao/Bounds.pidl
+        * tao/BoundsA.cpp
+        * tao/BoundsC.cpp
+        * tao/BoundsC.h
+        * tao/CONV_FRAMEA.cpp
+        * tao/CurrentA.cpp
+        * tao/DomainA.cpp
+        * tao/DoubleSeqA.cpp
+        * tao/PortableServer/PICurrent_Guard.cpp
+        * tao/PortableServer/PICurrent_Guard.h
+        * tao/PortableServer/POAManagerA.cpp
+        * tao/TC_Constants_Forward.h
+        * tao/TimeBaseA.cpp
+        * tao/True_RefCount_Policy.cpp
+        * tao/True_RefCount_Policy.h
+        * tao/True_RefCount_Policy.inl
+        * tao/TypeCode.h
+        * tao/TypeCode.inl
+        * tao/TypeCodeA.cpp
+        * tao/TypeCode_Base_Attributes.cpp
+        * tao/TypeCode_Base_Attributes.h
+        * tao/TypeCode_Base_Attributes.inl
+        * tao/TypeCode_CDR_Extraction.cpp
+        * tao/Visibility.pidl
+        * tao/VisibilityC.cpp
+        * tao/VisibilityC.h
+        * tao/VisibilityS.h
+        * tao/WCharSeqA.cpp
+        * tao/WStringSeqA.cpp
+        * tao/WrongTransactionA.cpp
+        * tao/append.cpp
+        * tao/skip.cpp
+        * tao/TypeCode_CDR_Extraction.h
+        * tao/TypeCode_Case.cpp
+        * tao/TypeCode_Case.h
+        * tao/TypeCode_Case.inl
+        * tao/TypeCode_Case_T.cpp
+        * tao/TypeCode_Case_T.h
+        * tao/TypeCode_Case_T.inl
+        * tao/TypeCode_Constants.cpp
+        * tao/TypeCode_Constants.h
+        * tao/TypeCode_Struct_Field.h
+        * tao/TypeCode_Traits.h
+        * tao/TypeCode_Value_Field.h
+        * tao/ULongLongSeqA.cpp
+        * tao/CharSeqA.cpp
+        * tao/Fixed_TypeCode.cpp
+        * tao/Fixed_TypeCode.h
+        * tao/Fixed_TypeCode.inl
+        * tao/FloatSeqA.cpp
+        * tao/GIOPA.cpp
+        * tao/IIOPA.cpp
+        * tao/IIOP_EndpointsA.cpp
+        * tao/IOP_IORA.cpp
+        * tao/InvalidSlot.pidl
+        * tao/InvalidSlotA.cpp
+        * tao/InvalidSlotC.cpp
+        * tao/InvalidSlotC.h
+        * tao/InvalidSlotS.h
+        * tao/Marshal.cpp
+        * tao/LongSeqA.cpp
+        * tao/LongDoubleSeqA.cpp
+        * tao/LongLongSeqA.cpp
+        * tao/Marshal.h
+        * tao/Marshal.i
+        * tao/Messaging_PolicyValueA.cpp
+        * tao/NVList.cpp
+        * tao/NVList.h
+        * tao/NVList.i
+        * tao/Null_RefCount_Policy.h
+        * tao/ObjectIdListA.cpp
+        * tao/Objref_TypeCode.cpp
+        * tao/Objref_TypeCode.h
+        * tao/Objref_TypeCode.inl
+        * tao/Objref_TypeCode_Static.cpp
+        * tao/Objref_TypeCode_Static.h
+        * tao/Objref_TypeCode_Static.inl
+        * tao/OctetSeqA.cpp
+        * tao/PICurrent.cpp
+        * tao/PICurrent.h
+        * tao/PICurrent.inl
+        * tao/PICurrent.pidl
+        * tao/PICurrentA.cpp
+        * tao/PICurrentC.cpp
+        * tao/PICurrentC.h
+        * tao/PICurrentS.h
+        * tao/PICurrent_Copy_Callback.cpp
+        * tao/PICurrent_Copy_Callback.h
+        * tao/PICurrent_Impl.cpp
+        * tao/PICurrent_Impl.h
+        * tao/PICurrent_Impl.inl
+        * tao/PICurrent_Loader.cpp
+        * tao/PICurrent_Loader.h
+        * tao/ParameterModeA.cpp
+        * tao/PolicyA.cpp
+        * tao/Policy_ForwardA.cpp
+        * tao/Recursive_Type_TypeCode.cpp
+        * tao/Recursive_Type_TypeCode.h
+        * tao/Recursive_Type_TypeCode.inl
+        * tao/RefCount_Policy_Traits.h
+        * tao/RequestInfo_Util.cpp
+        * tao/RequestInfo_Util.h
+        * tao/Sequence_TypeCode.cpp
+        * tao/Sequence_TypeCode.h
+        * tao/Sequence_TypeCode.inl
+        * tao/Sequence_TypeCode_Static.cpp
+        * tao/Sequence_TypeCode_Static.h
+        * tao/Sequence_TypeCode_Static.inl
+        * tao/ServicesA.cpp
+        * tao/ShortSeqA.cpp
+        * tao/StringSeqA.cpp
+        * tao/String_TypeCode.cpp
+        * tao/String_TypeCode.h
+        * tao/String_TypeCode.inl
+        * tao/String_TypeCode_Static.cpp
+        * tao/String_TypeCode_Static.h
+        * tao/String_TypeCode_Static.inl
+        * tao/String_TypeCode_Traits.h
+        * tao/Struct_TypeCode.cpp
+        * tao/Struct_TypeCode.h
+        * tao/Struct_TypeCode.inl
+        * tao/Struct_TypeCode_Static.cpp
+        * tao/Struct_TypeCode_Static.h
+        * tao/Struct_TypeCode_Static.inl
+          Removed these files from the repo
+
+        Thu Aug 18 14:28:45 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * examples/Simulator/Event_Supplier/Event_Con.cpp:
+
+          Removed uses of Any::value() and replaced them with the
+          generated extraction operator.
+
+        Thu Aug 18 07:43:16 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be_include/be_visitor_arg_traits.h:
+          When Any generation is not enabled, generate Any_Insert_Policy_Noop
+          as insert policy for the any, that way we don't get dependent
+          on the AnyTypeCode library
+
+        Wed Aug 17 13:27:16 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          In generating the include of *C.h in *A.h, added generation
+          of the prefix "tao/" if we are processing a .pidl file, since
+          in that case, the *A.h file will not be in the same directory.
+
+        Wed Aug 17 12:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+          Generate explicit casts to suppress warnings at level 4 with msvc7
+
+        Wed Aug 17 10:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+        * tao/ServerRequestInterceptor_Adapter.h:
+        * tao/TAO_Server_Request.{h,cpp,i}:
+        * tao/PI_Server/ServerInterceptorAdapter.{h,cpp}:
+          Made PICurrent working again
+
+        Wed Aug 17 08:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp
+        * tao/AnyTypeCode_Adapter.h
+        * tao/BD_String_Argument_T.h
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+        * tao/PortableServer/BD_String_SArgument_T.h
+          Removed the specialization for bound (w)string from the TAO
+          lib and just generate the full Arg_Trait in the IDL compiler,
+          this makes it not needed anymore to have an insertion
+          method for the bound (w)string in the AnyTypeCode adapter
+
+        Tue Aug 16 20:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp:
+          Generate the correct export macro
+
+        Tue Aug 16 19:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*:
+          Regenerated
+
+        Tue Aug 16 18:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Removed pragma push/pop for msvs, those warnings are already
+          disabled in general
+
+        * tao/Array_VarOut_T.{h,inl}:
+          In the TAO_Array_Forany_T make the pointer in the constructor
+          const to get things compiling with the new any insertion
+
+        Mon Aug 15 19:56:10 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_nodule/module_ch.cpp:
+
+          Where namespace openings and closings are generated, add
+          generation of the same openings and closings in the *A.h
+          file, if the -GA option is being used. This change ensures
+          that typecode declarations for types nested in one or more
+          modules will themselves appear in the same scope.
+
+        Mon Aug 15 19:52:50 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/PI/PICurrent_Loader.cpp:
+        * tao/PI/PICurrent_Loader.h:
+
+          Change library name in ACE_FACTORY_DEFINE and ACE_FACTORY_DECLARE
+          to TAO_PI (where the modified files are located) instad of TAO.
+
+        Mon Aug 15 19:14:16 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp:
+
+          Added #include of "tao/AnyTypeCode/Any.h".
+
+        Mon Aug 15 19:10:43 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+
+          Removed the extra subgroup labeled OBRSVCS_COMPONENTS. This is
+          not used on any platform and it creates an extra subdirectory
+          in the MSVC 7.1 solution browser.
+
+        Mon Aug 15 09:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Generate the A.h includes in the header file instead of the cpp file.
+          When A.idl includes B.pidl which includes C.pidl, when we generate
+          the includes in the header file, then in AC.h we don't have the types
+          from CC.h.
+
+        Fri Aug 12 12:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/PICurrent.{h,cpp,inl}:
+          Made PICurrent on the client side working again. When PICurrent is
+          requested and used, then we allocate a key in the orb tss resources
+          and create the PICurrent_Impl at that moment. The server side of
+          PICurrent is now the next todo.
+
+        Fri Aug 12 09:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.cpp:
+        * tao/ORBInitializer_Registry_Adapter.h:
+        * tao/PI/ORBInitializer_Registry_Impl.{h,cpp}:
+          Changed the way the number of allocated slots is passed to PICurrent.
+          This is now completely handled in the PI library, it is not up
+          to the ORB anymore. This makes the ORB unaware of PICurrent
+
+        Thu Aug 11 15:56:51 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          Fixed the logic of generating a *A.h include associated
+          with an included .pidl file to determine whether the
+          .pidl file is located in $TAO_ROOT/tao or in a subdirectory,
+          and thus whether to include the *A.h file from the
+          AnyTypeCode library or not. Only .pidl files in the
+          $TAO_ROOT/tao directory itself have their associated
+          *A.* files moved to the AnyTypeCode library.
+
+        Thu Aug 11 09:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PI.h:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+        * orbsvcs/orbsvcs/Log/PersistStore.cpp
+        * orbsvcs/orbsvcs/Log/PersistStore.h
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+        * examples/POA/DSI/Database_i.cpp
+        * examples/POA/POA_BiDir/POA_BiDir.cpp
+        * examples/Simulator/Event_Supplier/Event_Con.cpp
+        * orbsvcs/PSS/PSDL_Code_Gen.cpp
+        * orbsvcs/examples/ORT/Gateway_i.cpp
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+        * tao/IFR_Client.mpc
+        * tao/tao.mpc
+        * tests/Nested_Upcall_Crash/client.cpp
+        * tests/Nested_Upcall_Crash/scavenger.cpp
+        * tests/Nested_Upcall_Crash/server.cpp
+        * tests/Oneway_Buffering/client.cpp
+        * tests/POA/Policies/Policies.cpp
+        * tests/Portable_Interceptors/PICurrent/client.cpp
+
+        Wed Aug 10 19:47:30 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_root.cpp:
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_visitor_root/root.h:
+
+          Removed calls to the visitor classes in the files
+          below that have been removed, and removed the -GT
+          command line option and the associated usage message.
+          The IDL compiler now generates no explicit template
+          instantiations, and has no command line option to
+          do so.
+
+        * TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h:
+        * TAO_IDL/be_include/be_visitor_tmplinst/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/be_visitor_tmplinst/arg_tmplinst.cpp:
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst.cpp:
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp:
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp:
+        * TAO_IDL/be_include/be_visitor_tmplinst.h:
+        * TAO_IDL/be/be_visitor_tmplinst.cpp:
+
+          Unused visitor classes related to generation of
+          explicit template instantiations, their files
+          have been removed from CVS.
+
+        * docs/compiler.html:
+
+          Removed the -GT command line option from the table.
+
+        * docs/releasenotes/index.html:
+
+          Updated documentation of the IDL compiler to reflect
+          the above changes.
+
+        Wed Aug 10 13:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/PortableInterceptors/Benchmark/client_interceptors.cpp
+        * tests/PortableInterceptors/Benchmark/server_interceptors.cpp
+        * tests/PortableInterceptors/Collocated/Dynamic/interceptors.cpp
+        * tests/PortableInterceptors/Dynamic/client_interceptor.cpp
+        * tests/PortableInterceptors/Dynamic/server_interceptor.cpp
+        * tests/PortableInterceptors/PolicyFactory/PolicyFactory.cpp
+
+        Wed Aug 10 13:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Buffered_AMI/client.cpp
+        * examples/Buffered_Oneways/client.cpp
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+        * tests/MProfile_Connection_Timeout/client.cpp
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+        * tests/MT_BiDir/client.cpp
+        * tests/MT_BiDir/server.cpp
+        * tests/MT_Client/MT_Client.mpc
+        * tests/MT_Server/MT_Server.mpc
+        * tests/MT_Timeout/Client_Task.cpp
+        * performance_tests/Anyop/Anyop.mpc
+        * performance_tests/Anyop/anyop.cpp
+        * performance_tests/Callback/client.cpp
+        * performance_tests/Callback/server.cpp
+        * 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/RTCorba/Oneways/Reliable/client.cpp
+        * performance_tests/Sequence_Latency/DII/client.cpp
+        * performance_tests/Sequence_Latency/DSI/Roundtrip.cpp
+        * performance_tests/Sequence_Latency/Deferred/client.cpp
+          Updated for moves.
+
+        Wed Aug 10 12:59:06 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * 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/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+
+          Removed generation of Any operators for local interfaces.
+
+        Wed Aug 10 11:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+        * tests/MT_Client/MT_Client.mpc
+        * tests/MT_Server/MT_Server.mpc
+        * tests/DLL_ORB/DLL_ORB.mpc
+        * tests/CDR/CDR.mpc:
+        * tests/AMI_Buffering/AMI_Buffering.mpc:
+        * tests/AMI_Timeouts/AMI_Timeouts.mpc:
+        * tests/BiDirectional/BiDirectional.mpc:
+        * tests/BiDirectional_MultipleORB/destroy.mpc:
+        * tests/Collocation/Collocation.mpc:
+        * CDR/CDR.mpc
+          Simplified this MPC file
+
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+        * tests/MProfile_Connection_Timeout/client.cpp
+        * tests/MT_BiDir/client.cpp
+        * tests/MT_BiDir/server.cpp
+        * tests/MT_Timeout/Client_Task.cpp
+        * tests/CDR/tc.cpp:
+        * tests/AMI_Buffering/client.cpp:
+        * tests/AMI_Timeouts/timeout_client.cpp:
+        * tests/BiDirectional/client.cpp:
+        * tests/BiDirectional/server.cpp:
+        * tests/BiDirectional_MultipleORB/destroy.cpp:
+        * tests/BiDirectional_NestedUpcall/client.cpp:
+        * tests/BiDirectional_NestedUpcall/server.cpp:
+        * tests/Big_Request_Muxing/Client_Task.cpp:
+        * Blocking_Sync_None/client.cpp
+        * Bug_1020_Basic_Regression/client.cpp
+        * Bug_1020_Regression/client.cpp
+        * Bug_1269_Regression/client.cpp
+        * Bug_1270_Regression/client.cpp
+        * Bug_1361_Regression/client.cpp
+        * Bug_1476_Regression/Client_Task.cpp
+        * Bug_1476_Regression/client.cpp
+        * Bug_1482_Regression/client.cpp
+        * Bug_1551_Regression/client.cpp
+        * CDR/basic_types.cpp
+        * tests/Connection_Timeout/client.cpp
+        * tests/Crashed_Callback/client.cpp
+        * tests/Crashed_Callback/server.cpp
+        * tests/DynAny_Test/data.cpp
+        * tests/DynAny_Test/data.h
+          Added missing includes that are needed because of file moves
+
+        * tests/Any/Recursive/RecursiveHello.mpc:
+          Don't use -GA, causes problems with the recursive structs
+
+        * tao/corba.h:
+          Removed AnySeqC, file moved to a seperate library
+
+        * tao/BD_String_Argument_T.h:
+        * tao/PortableServer/BD_String_SArgument_T.{h,inl}:
+          Fixed some errors in these files
+
+        * tao/Fixed_Size_Argument_T.cpp
+        * tao/Fixed_Size_Argument_T.h
+        * tao/Fixed_Size_Argument_T.inl
+        * tao/PortableServer/Fixed_Size_SArgument_T.h
+        * tao/PortableServer/Fixed_Size_SArgument_T.inl
+          Updated
+
+        * tao/orb.idl
+          Removed moved files
+
+        Wed Aug 10 08:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Added AnyTypeCode to include path of Any_Arg_Traits.h
+
+        Wed Aug 10 08:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IFR_Client/*:
+          Removed -GA in the generation options and removed all *A.cpp
+          files. The IFR_Client has a struct defined in an interface, then
+          the generation of seperate *A.h file will not work.
+
+        * tao/AnyTypeCode/ValueModifier*.*:
+          Added A.{h,cpp} file.
+
+        Tue Aug  9 13:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * 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/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/Object_SArg_Traits.h
+        * tao/PortableServer/Object_SArgument_T.cpp
+        * tao/PortableServer/Object_SArgument_T.h
+        * tao/PortableServer/Object_SArgument_T.inl
+        * tao/PortableServer/PolicyS.cpp
+        * 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/TypeCode_SArg_Traits.h
+          Updated also all SArg_Traits templates
+
+        Tue Aug  9 12:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+          Updated Arg traits generation
+
+        Tue Aug  9 11:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * AnyTypeCode_Adapter.h
+        * BD_String_Argument_T.cpp
+        * BD_String_Argument_T.h
+        * BD_String_Argument_T.inl
+        * Basic_Argument_T.cpp
+        * Basic_Argument_T.h
+        * Basic_Argument_T.inl
+        * Basic_Arguments.h
+        * DomainC.cpp
+        * Fixed_Array_Argument_T.cpp
+        * Fixed_Array_Argument_T.h
+        * Fixed_Array_Argument_T.inl
+        * ORB_Core_TSS_Resources.cpp
+        * ORB_Core_TSS_Resources.h
+        * Object.cpp
+        * Object.h
+        * Object_Argument_T.cpp
+        * Object_Argument_T.h
+        * Object_Argument_T.inl
+        * PolicyC.cpp
+        * Special_Basic_Argument_T.cpp
+        * Special_Basic_Argument_T.h
+        * Special_Basic_Argument_T.inl
+        * Special_Basic_Arguments.h
+        * UB_String_Argument_T.cpp
+        * UB_String_Argument_T.h
+        * UB_String_Argument_T.inl
+        * UB_String_Arguments.h
+        * Var_Array_Argument_T.cpp
+        * Var_Array_Argument_T.h
+        * Var_Array_Argument_T.inl
+        * Var_Size_Argument_T.cpp
+        * Var_Size_Argument_T.h
+        * Var_Size_Argument_T.inl
+        * AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+        * AnyTypeCode/Any_Arg_Traits.h
+        * AnyTypeCode/TypeCode.h
+        * Domain/DomainS.cpp
+        * IFR_Client/IFR_BaseC.cpp
+        * IORInterceptor/IORInfoC.cpp
+        * ImR_Client/ImplRepoC.cpp
+        * ImR_Client/ImplRepoS.cpp
+        * ObjRefTemplate/ObjectReferenceTemplateC.cpp
+        * PortableServer/PolicyS.cpp
+        * PortableServer/PortableServerC.cpp
+        * RTScheduling/RTSchedulerC.cpp
+        * Valuetype/AbstractBase.h
+        * Valuetype/ValueBase.h
+          Updated Argument classes to use new Any Insert Policy  template
+
+        Mon Aug  8 09:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.cpp:
+        * tao/ORB_Core.{h,cpp,i}:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI_Server/POA_Current.cpp:
+        * tao/PI_Server/ServerRequestInfo.cpp:
+          Updated partly for PI changes. Idea is now to store PICurrent in the
+          ORB Core as Object_ptr, a dynamic cast can then be done in the PI libs
+
+        * tao/Argument.cpp
+        * tao/Argument.h
+        * tao/BD_String_Argument_T.cpp
+        * tao/BD_String_Argument_T.h
+        * tao/Basic_Argument_T.cpp
+        * tao/Basic_Argument_T.h
+        * tao/Basic_Arguments.h
+        * tao/DomainC.cpp
+        * tao/Fixed_Array_Argument_T.cpp
+        * tao/Fixed_Array_Argument_T.h
+        * tao/Fixed_Size_Argument_T.cpp
+        * tao/Fixed_Size_Argument_T.h
+        * tao/IFR_Client_Adapter.h
+        * tao/Object.cpp
+        * tao/Object.h
+        * tao/Object_Argument_T.cpp
+        * tao/Object_Argument_T.h
+        * tao/PolicyC.cpp
+        * tao/Special_Basic_Argument_T.cpp
+        * tao/Special_Basic_Argument_T.h
+        * tao/UB_String_Argument_T.cpp
+        * tao/UB_String_Argument_T.h
+        * tao/Var_Array_Argument_T.cpp
+        * tao/Var_Array_Argument_T.h
+        * tao/Var_Size_Argument_T.cpp
+        * tao/Var_Size_Argument_T.h
+        * tao/DynamicInterface/DII_Arguments.cpp
+        * tao/DynamicInterface/DII_Arguments.h
         * tao/IFR_Client/IFR_BaseC.cpp
-        * tao/IFR_Client/IFR_BaseC.h
-        * tao/IFR_Client/IFR_BaseC.inl
         * tao/IFR_Client/IFR_BasicC.cpp
-        * tao/IFR_Client/IFR_BasicC.h
-        * tao/IFR_Client/IFR_BasicC.inl
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.h
         * tao/IFR_Client/IFR_ComponentsC.cpp
-        * tao/IFR_Client/IFR_ComponentsC.inl
         * tao/IFR_Client/IFR_ExtendedC.cpp
-        * tao/IFR_Client/IFR_ExtendedC.h
-        * tao/IFR_Client/IFR_ExtendedC.inl
-        * tao/IORManipulation/IORC.cpp
-        * tao/IORTable/IORTableC.cpp
         * tao/ImR_Client/ImplRepoC.cpp
-        * tao/ImR_Client/ImplRepoC.inl
         * tao/ImR_Client/ServerObjectC.cpp
-        * tao/ImR_Client/ServerObjectC.inl
-        * tao/Messaging/Connection_Timeout_Policy_i.cpp
-        * tao/Messaging/MessagingC.cpp
-        * tao/Messaging/MessagingC.inl
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+        * tao/PI/ClientRequestInfo.cpp
+        * tao/PI_Server/ServerRequestInfo.cpp
+        * tao/PortableServer/BD_String_SArgument_T.cpp
+        * tao/PortableServer/BD_String_SArgument_T.h
+        * tao/PortableServer/Basic_SArgument_T.cpp
+        * tao/PortableServer/Basic_SArgument_T.h
+        * tao/PortableServer/Basic_SArguments.h
+        * tao/PortableServer/Fixed_Array_SArgument_T.cpp
+        * tao/PortableServer/Fixed_Array_SArgument_T.h
+        * tao/PortableServer/Fixed_Size_SArgument_T.cpp
+        * tao/PortableServer/Fixed_Size_SArgument_T.h
+        * tao/PortableServer/Object_SArgument_T.cpp
+        * tao/PortableServer/Object_SArgument_T.h
+        * tao/PortableServer/PolicyS.cpp
+        * tao/PortableServer/Special_Basic_SArgument_T.cpp
+        * tao/PortableServer/Special_Basic_SArgument_T.h
+        * tao/PortableServer/UB_String_SArgument_T.cpp
+        * tao/PortableServer/UB_String_SArgument_T.h
+        * tao/PortableServer/Var_Array_SArgument_T.cpp
+        * tao/PortableServer/Var_Array_SArgument_T.h
+        * tao/PortableServer/Var_Size_SArgument_T.cpp
+        * tao/PortableServer/Var_Size_SArgument_T.h
+          Changed the interface of TAO::Argument. Instead of using
+          Dynamic::Parameter as argument, use the method interceptor_
+          value that gets an Any* argument and a separate mode argument
+          to get the mode of the argument (in/out/inout). Instead of
+          duplicating this mode method, added InArgument, InoutArgument,
+          OutArgument and RetArgument class that implement this method.
+          All templates are then derived from the correct base method.
+
+        Mon Aug  8 20:26:22 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/NVList_Adapter_Impl.h:
+
+          Corrected the export macro.
+
+        Mon Aug  8 19:55:07 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+
+          Moved generation of the _tao_type() method for user exceptions
+          to the *A.cpp file if we are using the -GA option.
+
+        * TAO_IDL/be/be_codegen.cp:
+
+          Added code generation of *A.h includes from the AnyTypeCode
+          library corresponding to included .pidl files.
+
+        Thu Aug  4 18:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Cache_Entries.{h,inl}:
+          Removed non const index method
+
+        * tao/PortableServer/SArg_Traits_T.h:
+        * tao/PortableServer/Basic_SArguments.h:
+        * tao/PortableServer/Special_Basic_SArguments.h:
+        * tao/PortableServer/UB_String_SArguments.h:
+        * tao/Arg_Traits_T.h:
+          Moved SArg_Traits to its own file and updated includes
+
+        * tao/PI_Server/ServerRequestInfo.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+          Updated for PICurrent changes
+
+        * tao/PI/ClientRequestInfo.{h,cpp}:
+          Implemented several methods here instead of using
+          functionality that was in the TAO lib for interceptors
+
+        * tao/DynamicInterface/DII_Invocation.cpp:
+          Updated include of RequestInfo_Util.h
+
+        * tao/Invocation_Base.{h,cpp}:
+        * tao/operation_details.{h,cpp,i}:
+          Removed several methods that are just there for the
+          ClientRequestInfo. The functionality moved to the
+          ClientRequestInfo class in the PI library where we just
+          access the operation details.
+
+        * tao/tao.mpc:
+          Removed files
+
+        * tao/RequestInfo_Util.{h,cpp}:
+        * tao/PI/RequestInfo_Util.{h,cpp}:
+          Moved to the PI lib
+
+        * tao/Invocation_Adapter.h:
+          Removed obsolete forward declaration of TAO_Exception_Data
+
+        * tao/AnyTypeCode/TypeCode.cpp:
+          Applied some patches Ossama did to the main branch also
+
+        * tao/Argument.cpp:
+          Use true instead of 1
+
+        * tao/PI/InvalidSlotA.h:
+        * tao/PI/InvalidSlotC.h:
+          Corrected export macro
+
+        * tao/DynamicInterface/Unknown_User_Exception.{h,cpp}:
+          Removed _is_a method
+
+        * tao/operation_details.{h,i}:
+          Removed non const version of addressing_mode
+
+        * tao/Invocation_Base.{h,inl}:
+          Added accessor for operation details
+
+        Tue Aug  2 13:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/TC_Constants_Forward.h:
+        * tao/AnyTypeCode/TC_Constants_Forward.h:
+          Moved to AnyTypeCode lib
+
+        Tue Aug  2 12:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CORBA_methods.h:
+          Removed not needed forward declarations
+
+        * tao/Dynamic_Adapter.cpp:
+          Removed not needed includes and explicit templates
+
+        * tao/NVList_Adapter.{h,cpp}:
+          New NVList adapter
+
+        * tao/ORB.{h,cpp}:
+          Use new NVList Adapter
+
+        * tao/tao.mpc:
+          Added NVList_Adapter files
+
+        * tao/AnyTypeCode.mpc:
+          Added new files
+
+        * tao/NVList.h:
+          Updated friends
+
+        * tao/NVList_Adapter_Impl.{h,cpp}:
+          Concrete NVList Adapter implementation
+
+        Tue Aug  2 12:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.{h,cpp}:
+          Adapter implementation. _tao_type for all systemexceptions
+          is not available
+
+        Tue Aug  2 12:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/ExceptionA.cpp:
+          Reenabled CORBA::Exception Any operators now _tao_type is available
+          again
+
+        Mon Aug  1 19:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exception.{h,cpp}:
+          Removed class TAO_DONT_CATCH, it is not used at all. Also removed
+          the emulated exception argument from create_system_exception, it
+          is not needed
+
+        Mon Aug  1 19:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode_Adapter.{h,cpp}:
+        * tao/SystemException.cpp:
+          Added first version of Adapter interface and implemented
+          SystemException::_tao_type to call the adapter method.
+
+        * tao/tao.mpc:
+          Added new file
+
+        Mon Aug  1 18:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exception.{h,cpp}:
+        * tao/SystemException.{h,cpp}:
+        * tao/UserException.{h,cpp}:
+          Removed _is_a, it is TAO specific to handle environments without
+          RTTI but we require and use that, so zapped this method.
+          Reimplemented SystemException::_tao_get_omg_exception_description
+          to use dynamic_cast to check for the specific exception type
+
+        Mon Aug  1 15:22:59 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/DynamicA.h:
+        * tao/AnyTypeCode/DynamicC.h:
+
+          Fixed some export macros that were not changed when these
+          files were moved to the AnyTypeCode library.
+
+        Mon Aug  1 14:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exception.h:
+        * tao/SystemException.h:
+        * tao/UserException.h:
+          Documentation improvements
+
+        Mon Aug  1 12:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exception.{h,cpp}:
+          Declared _tao_type as pure virtual. No need to have a default
+          implementation here
+
+        * tao/ORB.{h,cpp}:
+          Optimized InvalidName::_downcast. Implemented _tao_type as
+          return 0, we don't have a default implementatio anymore in the
+          base
+
+        * tao/PolicyC.{h,cpp}:
+        * tao/WrongTransactionC.{h,cpp}:
+          Made _tao_type active again, implement this as return 0 at this
+          moment, have to call a new adapter later
+
+        * tao/SystemException.{h,cpp}:
+          Added _tao_type again, implemented it as return 0, have to add
+          a call to an adapter later for all system exceptions
+
+        * tao/UserException.{h,cpp}:
+          Added _tao_type with return 0 as default implementation, coming
+          from the base
+
+        * tao/AnyTypeCode/BoundsC.{h,cpp}:
+        * tao/PI/InvalidSlotC.{h,cpp}:
+          Added _tao_type again.
+
+        * tao/AnyTypeCode/TypeCode.{h,cpp}:
+          Added _tao_type with return 0
+
+        Mon Aug  1 11:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode.mpc:
+          Updated for a lot of changes
+
+        * tao/Basic_Argument_T.cpp:
+          Added a temporarily specialization for unsigned int, will need to be
+          removed soon
+
+        * tao/Object_Argument_T.cpp
+          Added a temporarily specialization for Policy, will need to be
+          removed soon
+
+        * tao/Special_Basic_Argument_T.cpp:
+          Added a temporarily specialization for bool, will need to be
+          removed soon
+
+        * tao/UB_String_Argument_T.cpp:
+          Added a temporarily specialization for string, will need to be
+          removed soon
+
+        * tao/BD_String_Argument_T.cpp:
+        * tao/Fixed_Array_Argument_T.cpp:
+        * tao/Fixed_Size_Argument_T.cpp:
+          Removed include of Dynamic_ParameterC.h
+
+        * tao/Block_Flushing_Strategy.h:
+        * tao/Flushing_Strategy.h:
+        * tao/Leader_Follower_Flushing_Strategy.h:
+        * tao/Reactive_Flushing_Strategy.h:
+        * tao/Wait_On_Leader_Follower.h:
+        * tao/Wait_On_LF_No_Upcall.h:
+        * tao/Wait_On_Reactor.h:
+        * tao/Wait_On_Read.h:
+        * tao/Wait_Strategy.h:
+          No need to export the class in this file
+
+        * tao/DomainC.cpp:
+          Pass the Dynamic_Parameter to the IFR Adapter, this way we don't
+          depend on Any
+
+        * tao/IFR_Client_Adapter.h:
+          Pass the Dynamic::Parameter to interfacedef_any_insert
+
+        * tao/InvalidSlot*.*:
+          Moved to the PI library
+
+        * tao/Invocation_Base.cpp:
+        * tao/operation_details.cpp:
+          Commented out several methods which need to be reimplemented
+          using a new adapter
+
+        * tao/ORB.cpp:
+        * tao/ORB_Core.{h,cpp,i}:
+        * tao/ORB_Core_TSS_Resources.{h,cpp}:
+          Commented out creation of PICurrent, will have to reimplement this
+          now PICurrent moved to the PI lib
+
+        * tao/PortableInterceptor.pidl:
+        * tao/PortableInterceptorC.h:
+          Removed the files that moved to the PI lib
+
+        * tao/PICurrent.{h,cpp,inl,pidl}:
+        * tao/PICurrent_Copy_Callback.{h,cpp}:
+        * tao/PICurrent_Impl.{h,cpp,inl}:
+        * tao/PICurrent_Loader.{h,cpp}:
+        * tao/PICurrentC.{h,cpp}:
+        * tao/PICurrentS.h:
+          Moved to the PI lib
+
+        * tao/Server_Request.{h,cpp,inl}:
+          Use pointers for the PI stuff, will need to update this soon
+
+        * tao/TypeCodeFactory_Adapter.h:
+          Added forward declaration for ValueModifier
+
+        * tao/ValueModifier.pidl:
+        * tao/ValueModifierC.{h,cpp}:
+        * tao/ValueModifierS.h:
+          Moved to AnyTypeCode lib
+
+        * tao/Visibility.pidl:
+        * tao/VisibilityC.{h,cpp}:
+        * tao/VisibilityS.h:
+          Moved to AnyTypeCode lib
+
+        * tao/AnyTypeCode/PICurrentA.{h,cpp}:
+        * tao/AnyTypeCode/InvalidSlotA.{h,cpp}:
+          Moved to the PI lib
+
+        * tao/AnyTypeCode/PortableInterceptorA.h:
+          Removed some includes
+
+        * tao/AnyTypeCode/TypeCode.h:
+        * tao/AnyTypeCode/Value_TypeCode:
+        * tao/AnyTypeCode/Value_TypeCode_Static.h:
+          Updated includes
+
+        * tao/IFR_Client/*C.cpp:
+          Added include of Dynamic_Parameter.h
+
+        * tao/PI/ClientRequestInfo.{h,cpp}:
+          Updated includes
+
+        * tao/PI/PICurrent*.*:
+          Moved here from the tao lib
+
+        * tao/PoratbleServer/Basic_SArgument_T.cpp
+        * tao/PoratbleServer/BD_String_SArgument_T.cpp
+        * tao/PoratbleServer/Fixed_Array_SArgument_T.cpp
+        * tao/PoratbleServer/Fixed_Size_SArgument_T.cpp
+        * tao/PoratbleServer/Object_SArgument_T.cpp
+        * tao/PoratbleServer/Special_Basic_SArgument_T.cpp
+        * tao/PoratbleServer/UB_String_SArgument_T.cpp
+        * tao/PoratbleServer/Var_Array_SArgument_T.cpp
+        * tao/PoratbleServer/Var_Size_SArgument_T.cpp
+          Update includes
+
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+          Temporarily commented out PICurrent_Guard. Need to change this
+          to a call to the PI adapter and an auto_ptr
+
+        Fri Jul 29 19:23:17 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+
+          Added -oA <path> option to direct the output of generated
+          *A.* files. The -oA option overrides path specified by
+          -o, if any.
+
+        * docs/compiler.html:
+
+          Added above option to commandline option table.
+
+        Fri Jul 29 18:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny.mpc
+        * tao/IFR_Client.mpc
+        * tao/IORManipulation.mpc
+        * tao/Strategies.mpc
+        * tao/Valuetype.mpc
+        * tao/Var_Size_Argument_T.cpp
+        * tao/corba.h
+        * tao/AnyTypeCode/DynamicA.cpp
+        * tao/AnyTypeCode/DynamicA.h
+        * tao/AnyTypeCode/DynamicC.cpp
+        * tao/AnyTypeCode/DynamicC.h
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+        * tao/AnyTypeCode/orb_typesA.h
+        * tao/DynamicInterface/DII_Arguments.cpp
+        * tao/DynamicInterface/Request.cpp
+        * tao/DynamicInterface/Request.h
+        * tao/DynamicInterface/Server_Request.cpp
+        * tao/IFR_Client/IFR_BaseA.cpp
+        * tao/IFR_Client/IFR_BaseC.cpp
+        * tao/IFR_Client/IFR_BasicA.cpp
+        * tao/IFR_Client/IFR_BasicC.cpp
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+        * tao/IFR_Client/IFR_ComponentsA.cpp
+        * tao/IFR_Client/IFR_ExtendedA.cpp
+        * tao/IORManipulation/IORA.cpp
+        * tao/ImR_Client/ImplRepoA.cpp
+        * tao/Messaging/Messaging_PolicyFactory.cpp
         * tao/Messaging/Messaging_Policy_i.cpp
-        * tao/Messaging/PollableC.cpp
-        * tao/PI/InvalidSlotC.cpp
-        * tao/PI/ORBInitInfoC.cpp
-        * tao/PI/PIForwardRequestC.cpp
-        * tao/PortableServer/ForwardRequestC.cpp
-        * tao/PortableServer/POAManagerC.cpp
-        * tao/PortableServer/PS_CurrentC.cpp
-        * tao/PortableServer/PortableServerC.cpp
-        * tao/RTCORBA/RTCORBAC.cpp
+        * tao/Messaging/Messaging_RT_PolicyA.cpp
+        * tao/ObjRefTemplate/Default_ORTA.cpp
+        * tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+        * tao/PI/ClientRequestInfoA.cpp
+        * tao/PI/ClientRequestInterceptorA.cpp
+        * tao/PI/InterceptorA.cpp
+        * tao/PI/ORBInitInfoA.cpp
+        * tao/PI/RequestInfo.pidl
+        * tao/PI/RequestInfoA.cpp
+        * tao/PI_Server/ServerRequestInfoA.cpp
+        * tao/PI_Server/ServerRequestInterceptorA.cpp
+        * tao/PortableServer/Var_Size_SArgument_T.cpp
+        * tao/RTCORBA/RTCORBAA.cpp
         * tao/RTCORBA/RT_Policy_i.cpp
-        * tao/RTScheduling/RTSchedulerC.cpp
-        * tao/TypeCodeFactory/Recursive_TypeCode.inl
-        * tao/Valuetype/StringValueC.inl
-        Removed ACE_NESTED_CLASS
-
-        * TAO_IDL/ast/ast_type.cpp
-        * TAO_IDL/be/be_interface.cpp
-        * TAO_IDL/be/be_visitor_component/component_ci.cpp
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp
-        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-        * TAO_IDL/be/be_visitor_interface/interface_is.cpp
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp
-        * TAO_IDL/be/be_visitor_operation/operation.cpp
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
-        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
-        Removed generation of ACE_NESTED_CLASS, just use A::B instead
+        * tao/RTPortableServer/RTPortableServerA.cpp
+        * tao/RTScheduling/RTSchedulerA.cpp
+        * tao/Strategies/sciop_endpointsC.cpp
+        * tao/Strategies/uiop_endpointsC.cpp
+        * tao/TypeCodeFactory/Recursive_TypeCode.h
+        * tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+        * tao/Valuetype/StringValueC.cpp
+        * tao/Valuetype/ValueBase.cpp
+          All kinds of changes to get things compiling again
 
-        All changes below is the merge of the branch sequenceupdate to
-        sequpdate2. This is the new sequence implementation for TAO.
+        * AnyTypeCode/Union_TypeCode.{h,cpp,inl}:
+        * AnyTypeCode/Union_TypeCode_T.{h,cpp,inl}:
+          Renamed _T back to normal file
 
-        * tao/Array_VarOut_T.h:
-        Only do an empty forward declaration of Array_Traits. This will
-        make sure that we have to do each specialization explicitly, if
-        we lack one, we get a compile error instead of this empty default
-        one.
+        Fri Jul 29 15:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/Objref_VarOut_T.h:
-        Only do an empty forward declaration of Objref_Traits. This will
-        make sure that we have to do each specialization explicitly, if
-        we lack one, we get a compile error instead of this empty default
-        one.
+        * tao/DynamicInterface/DynamicParameter*.{h,cpp}:
+        * tao/AnyTypeCode/DynamicParameter*.{h,cpp}:
+          Moved DynamicParameter to the AnyTypeCode lib. The PI lib uses this
+          and having it in DynamicInterface will make PI dependent on
+          DynamicInterface
 
-        * tao/Basic_Types.h:
-        Updated the string types, these are implemented by a template now.
+        Fri Jul 29 11:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/BooleanSeqC.{h,cpp}:
-        * tao/CharSeqC.{h,cpp}:
-        * tao/CONV_FRAMEC.{h,cpp}:
-        * tao/CurrentC.{h,cpp}:
-        * tao/DomainC.{h,cpp}:
-        * tao/DoubleSeqC.{h,cpp}:
-        * tao/FloatSeqC.{h,cpp}:
-        * tao/WStringSeqC.{h,cpp}:
-        * tao/LongSeqC.{h,cpp}:
-        * tao/WCharSeqC.{h,cpp}:
-        * tao/Object_KeyC.{h,cpp}:
-        * tao/ObjectIdListC.{h,cpp}:
-        * tao/IIOP_EndpointsC.{h,cpp}:
-        * tao/LongLongSeqC.{h,cpp}:
-        * tao/IIOPC.{h,cpp}:
-        * tao/IOP_IORC.{h,cpp}:
-        * tao/LongDoubleSeqC.{h,cpp}:
-        * tao/Messaging_PolicyValueC.{h,cpp}:
-        * tao/OctetSeqC.{h,cpp}:
-        * tao/Policy_ForwardC.{h,cpp}:
-        * tao/PolicyC.{h,cpp}:
-        * tao/ServicesC.{h,cpp}:
-        * tao/ShortSeqC.{h,cpp}:
-        * tao/StringSeqC.{h,cpp}:
-        * tao/TAOC.{h,cpp}:
-        * tao/ULongLongSeqC.{h,cpp}:
-        * tao/ULongSeqC.{h,cpp}:
-        * tao/UShortSeqC.{h,cpp}:
-        * tao/AnyTypeCode/AnySeqC.{h,cpp}:
-        * tao/AnyTypeCode/DynamicC.{h,cpp}:
-        * tao/DynamicAny/DynamicAnyC.{h,cpp}:
-        * tao/IFR_Client/IFR_ExtendedC.{h,cpp}:
-        * tao/IFR_Client/IFR_ComponentsC.{h,cpp}:
-        * tao/IFR_Client/IFR_BasicC.{h,cpp}:
-        * tao/IFR_Client/IFR_BaseC.{h,cpp}:
-        * tao/ImR_Client/ImplRepoC.{h,cpp}:
-        * tao/IORManipulation/IORC.{h,cpp}:
-        * tao/ObjRefTemplate/ObjectReferenceTemplateC.{h,cpp}:
-        * tao/PortableServer/PortableServerC.{h,cpp}:
-        * tao/RTCORBA/RTCORBAC.{h,cpp}:
-        * tao/RTScheduling/RTSchedulerC.{h,cpp}:
-        * tao/Strategies/sciop_endpointsC.{h,cpp}:
-        * tao/Strategies/uiop_endpointsC.{h,cpp}:
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.{h,cpp}:
-        Updated all these files because of the changes to the sequence
-        implementation. The base classes are changed including the way we
-        marshal and demarshal sequences. The argument to the marshal method
-        is also const.
-
-        * tao/Bounded_Array_Allocation_Traits.h:
-        * tao/Bounded_Reference_Allocation_Traits_T.h:
-        * tao/Bounded_Value_Allocation_Traits_T.h:
-        New allocation traits for bounded sequences
-
-        * tao/Value_Traits_T.h:
-        New value traits.
-
-        * tao/Bounded_Array_Sequence_T.h:
-        New template for Bounded Array Sequences
-
-        * tao/Bounded_Basic_String_Sequence_T.h:
-        * tao/Bounded_String_Sequence_T.h:
-        * tao/Bounded_Wstring_Sequence_T.h:
-        New template for bounded strings, derived are string and wstring
-        bounded sequences
-
-        * tao/Bounded_Object_Reference_Sequence_T.h:
-        New template for bounded object reference sequences
-
-        New allocation traits for bounded reference
-
-        * tao/Bounded_Sequence_CDR_T.h:
-        Template method for sequence marshal/demarshal
+        * tao/Exception.{h,cpp}:
+        * tao/AnyTypeCode/Exception.{h,cpp}:
+          Moved Any code from Exception to AnyTypeCode. Have to solve the
+          _tao_type issue.
 
-        * tao/corba.h:
-        Updated includes, Managed_Types.h is replaced with
-        String_Manager_T.h
+        Fri Jul 29 10:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/CORBA_String.{h,cpp,inl}:
-        The CORBA::String_var/_out and CORBA::WString_var/_out are now
-        implemented with the new TAO::String_var/_out template
+        * tao/AnyTypeCode/AnyTypeCode_methods.h:
+        * tao/AnyTypeCode/TypeCode.h:
+          Moved is_nil and release from TypeCode.h to AnyTypeCode_methods.h
 
-        * tao/Generic_Sequence_T.h:
-        New generic sequence template
+        Fri Jul 29 04:19:55 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/Managed_Types.{h,cpp,i}:
-        Removed these files
+        * tao/CORBA_methods.h:
 
-        * tao/MProfile.cpp:
-        Initialise pointers with 0 and fixed retrieval of a policy
+          Removed static CORBA is_nil() and release() methods for
+          NamedValue and NVList.
 
-        * tao/Object.{h,cpp}:
-        Made the argument of the marshal method const
+        * tao/SystemException.cpp:
 
-        * tao/operation_details.i:
-        Changed the way we reset the service info
+          Restored definition of static _tao_any_destructor()
+          methods for system exceptions. They are used by Anys,
+          but do not depend on them. This move eliminated
+          'inconsistent dll linkage' warnings on MSVC.
 
-        * tao/ORB.h:
-        Updated all typedefs in this file
+        * tao/SystemException.h:
 
-        * tao/Policy_Set.{h,cpp.i}:
-        Made the get_policy_by_index const and fixed the
-        set_policy_overrides to work with the new sequences, as a result
-        the workarounds could be removed
+          Removed declarations of typecodes and Any operators
+          for the system exceptions.
 
-        * tao/Sequence_T.{cpp,i}:
-        Removed these files
+        * tao/AnyTypeCode/NVList.h:
 
-        * tao/Sequence_T.h:
-        Include all new sequence template files, makes it easy for old apps
-        to keep compiling
+          Added include of the new AnyTypeCode_methods.h file below.
 
-        * tao/String_Alloc.{h,cpp}:
-        All string allocation methods
+        * tao/AnyTypeCode/SystemExceptionA.cpp:
 
-        * tao/VarOut_T.h:
-        Removed THIS_OUT_TYPE typedef
+          Removed definition of static _tao_any_destructor()
+          methods for system exceptions.
 
-        * tao/DynamicInterface/Request.h:
-        Removed include of Sequence.h, not needed
+        * tao/AnyTypeCode/SystemExceptionA.h:
 
-        * tao/Profile.h:
-        Updated typedef for TAO_opaque
+          New file, contains typecode and Any operator declarations
+          for system exceptions.
 
-        * tao/Object_Reference_Sequence_Element_T.h:
-        * tao/Object_Reference_Traits_Base_T.h:
-        * tao/Object_Reference_Traits_T.h:
-        * tao/Range_Checking_T.h:
-        New files
+        * tao/AnyTypeCode/AnyTypeCode_methods.h:
 
-        * tao/Seq_Out_T.{h,inl}:
-        Removed TAO_MngSeq_Out_T, not needed anymore
+          New file, contains declarations of static CORBA is_nil()
+          and release() methods for NamedValue and NVList. This
+          move eliminated 'inconsistent dll linkage' warnings on
+          MSVC.
 
-        * tao/Sequence.{h,cpp,i}:
-        Removed
+        Thu Jul 28 22:40:26 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/Seq_Var_T.{h,cpp.inl}:
-        Removed TAO_MngSeq_Var_T, not needed anymore
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_context.cpp:
+        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp:
+        * TAO_IDL/be_include/be_visitor_context.h:
 
-        * tao/String_Manager_T.h:
-        TAO string manager as template, new file
+          Added logic to make the anyop export macro and export include
+          default to the corresponding stub values, if any, when the
+          former values have not been set on the command line, but -GA
+          is used. This behavior will enable the *A.* files to be
+          generated, but compiled into the same library as the stub
+          files, if desired.
 
-        * tao/String_Sequence_Element_T.h:
-        Element in a string sequence
+        Thu Jul 28 18:35:07 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/String_Traits_Base_T.h:
-        * tao/String_Traits_T.h:
-        String traits
+        * tao/Buffering_Constraint_Policy.{h,cpp}:
+        * tao/Messaging/Messaging_PolicyFactory.{h,cpp}:
+          Moved the create method to extract a BufferingConstraint out of
+          an Any to the Messaging lib. It is used there and not needed at
+          all in the core TAO lib. In the future we probably will move the
+          complete Buffering_Constraint_Policy to the Messaging lib
 
-        * tao/Unbounded_Array_Allocation_Traits_T.h
-        * tao/Unbounded_Array_Sequence_T.h
-        * tao/Unbounded_Basic_String_Sequence_T.h
-        * tao/Unbounded_Object_Reference_Sequence_T.h
-        * tao/Unbounded_Octet_Sequence_T.h
-        * tao/Unbounded_Reference_Allocation_Traits_T.h
-        * tao/Unbounded_Sequence_CDR_T.h
-        * tao/Unbounded_String_Sequence_T.h
-        * tao/Unbounded_Value_Allocation_Traits_T.h
-        * tao/Unbounded_Value_Sequence_T.h
-        * tao/Unbounded_Wstring_Sequence_T.h
-        Unbounded sequence files
+        Thu Jul 28 16:43:07 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tao/diffs/Object_Key.diff:
-        Updated
+        * TAO_IDL/be/be_codegen.cpp:
 
-        * tao/PI/ClientRequestInfo.cpp:
-        * tao/PI_Server/ServerRequestInfo.cpp:
-        Removed temporary object usage
+          Added code generation to include *A.h files (in the
+          *A.cpp file) for each included IDL file. If possible,
+          existence checks for these included files will be added
+          at a future date.
 
-        * tao/RTCORBA/RT_Stub.cpp:
-        * tao/RTScheduling/Request_Interceptor.cpp:
-        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
-        Updated for the fact that an object sequence now returns a _ptr
-        on the subscript operators instead of the _var which wasn't
-        confirming to the CORBA C++ mapping
+        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp:
 
-        * tao/RTScheduling/Current.h:
-        Updated IdType typedef
+          Switched generation of the typecode declaration to the
+          *A.h file, if the -GA option is used.
 
-        * tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h
-        * tao/Valuetype/Bounded_Valuetype_Sequence_T.h
-        * tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h
-        * tao/Valuetype/Unbounded_Valuetype_Sequence_T.h
-        * tao/Valuetype/Valuetype_Sequence_Element_T.h
-        * tao/Valuetype/Valuetype_Traits_Base_T.h
-        * tao/Valuetype/Valuetype_Traits_T.h
-        New sequence implementated for valuetypes
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
 
-        * tao/Valuetype/Sequence_T.{cpp,inl}:
-        Removed
+          Updated comment.
 
-        * tao/Valuetype/Sequence_T.h:
-        Just include the new files, easier for backward compatibility
+        * TAO_IDL/be/be_global.cpp:
+
+          Fixed typo in generated usage message.
+
+        * TAO_IDL/driver/drv_args.cpp:
+
+          Added usage messages for each individual recognized
+          -W[p|b] option.
+
+        * docs/compiler.html:
+
+          Updated command line option table with the new -Wb options
+          for export macro and export include in *A.h files.
 
-        * tao/Valuetype/Value_VarOut_T.{h,cpp}:
-        Just define an empty Value_Traits, make sure we get all
-        specializations
+        Thu Jul 28 12:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/AdapterActivatorA.cpp
+        * tao/PortableServer/ForwardRequestA.cpp
+        * tao/PortableServer/IdAssignmentPolicyA.cpp
+        * tao/PortableServer/IdUniquenessPolicyA.cpp
+        * tao/PortableServer/ImplicitActivationPolicyA.cpp
+        * tao/PortableServer/LifespanPolicyA.cpp
+        * tao/PortableServer/POAManagerA.cpp
+        * tao/PortableServer/PolicyS.cpp
+        * tao/PortableServer/PortableServerA.cpp
+        * tao/PortableServer/PS_ForwardA.cpp
+        * tao/PortableServer/RequestProcessingPolicyA.cpp
+        * tao/PortableServer/ServantActivatorA.cpp
+        * tao/PortableServer/ServantLocatorA.cpp
+        * tao/PortableServer/ServantManagerA.cpp
+        * tao/PortableServer/ServantRetentionPolicyA.cpp
+        * tao/PortableServer/ThreadPolicyA.cpp
+          Updated includes to the new AnyTypeCode library. Just a quick
+          search and replace to get this lib compiling again. Only have
+          an unresolved link error I have to investigate
+
+        Thu Jul 28 11:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
+          Generate post include in A.h file, updated generated
+          includes for moving of files
+
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+          Zapped starting spaces
+
+        * tao/PortableServer/Basic_SArgument_T.cpp:
+        * tao/PortableServer/Object_SArgument_T.cpp:
+        * tao/PortableServer/Special_Basic_SArgument_T.cpp:
+        * tao/PortableServer/UB_String_SArgument_T.cpp:
+          Only include DynamicParameter.h when interceptors are enabled
+
+        Thu Jul 28 11:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode.mpc:
+          New MPC file
+
+        * tao/Alias_TypeCode.cpp
+        * tao/Alias_TypeCode.h
+        * tao/Alias_TypeCode.inl
+        * tao/Alias_TypeCode_Static.cpp
+        * tao/Alias_TypeCode_Static.h
+        * tao/Alias_TypeCode_Static.inl
+        * tao/Any.cpp
+        * tao/Any.h
+        * tao/Any.i
+        * tao/AnySeq.pidl
+        * tao/AnySeqA.cpp
+        * tao/AnySeqC.cpp
+        * tao/AnySeqC.h
+        * tao/AnySeqS.h
+        * tao/Any_Arg_Traits.h
+        * tao/Any_Array_Impl_T.cpp
+        * tao/Any_Array_Impl_T.h
+        * tao/Any_Array_Impl_T.inl
+        * tao/Any_Basic_Impl.cpp
+        * tao/Any_Basic_Impl.h
+        * tao/Any_Basic_Impl_T.cpp
+        * tao/Any_Basic_Impl_T.h
+        * tao/Any_Basic_Impl_T.inl
+        * tao/Any_Dual_Impl_T.cpp
+        * tao/Any_Dual_Impl_T.h
+        * tao/Any_Dual_Impl_T.inl
+        * tao/Any_Impl.cpp
+        * tao/Any_Impl.h
+        * tao/Any_Impl_T.cpp
+        * tao/Any_Impl_T.h
+        * tao/Any_Impl_T.inl
+        * tao/Any_Special_Impl_T.cpp
+        * tao/Any_Special_Impl_T.h
+        * tao/Any_Special_Impl_T.inl
+        * tao/Any_SystemException.cpp
+        * tao/Any_SystemException.h
+        * tao/Any_Unknown_IDL_Type.cpp
+        * tao/Any_Unknown_IDL_Type.h
+        * tao/BooleanSeqA.cpp
+        * tao/Bounds.pidl
+        * tao/BoundsA.cpp
+        * tao/BoundsC.cpp
+        * tao/BoundsC.h
+        * tao/CONV_FRAMEA.cpp
+        * tao/CharSeqA.cpp
+        * tao/CurrentA.cpp
+        * tao/DomainA.cpp
+        * tao/DoubleSeqA.cpp
+        * tao/Dynamic.pidl
+        * tao/DynamicA.cpp
+        * tao/DynamicC.cpp
+        * tao/DynamicC.h
+        * tao/DynamicS.h
+        * tao/Dynamic_Parameter.pidl
+        * tao/Dynamic_ParameterA.cpp
+        * tao/Dynamic_ParameterC.cpp
+        * tao/Dynamic_ParameterC.h
+        * tao/Empty_Param_TypeCode.cpp
+        * tao/Empty_Param_TypeCode.h
+        * tao/Empty_Param_TypeCode.inl
+        * tao/Enum_TypeCode.cpp
+        * tao/Enum_TypeCode.h
+        * tao/Enum_TypeCode.inl
+        * tao/Enum_TypeCode_Static.cpp
+        * tao/Enum_TypeCode_Static.h
+        * tao/Enum_TypeCode_Static.inl
+        * tao/Fixed_TypeCode.cpp
+        * tao/Fixed_TypeCode.h
+        * tao/Fixed_TypeCode.inl
+        * tao/FloatSeqA.cpp
+        * tao/GIOPA.cpp
+        * tao/IIOPA.cpp
+        * tao/IIOP_EndpointsA.cpp
+        * tao/IOP_IORA.cpp
+        * tao/InvalidSlotA.cpp
+        * tao/LongDoubleSeqA.cpp
+        * tao/LongLongSeqA.cpp
+        * tao/LongSeqA.cpp
+        * tao/Marshal.cpp
+        * tao/Marshal.h
+        * tao/Marshal.i
+        * tao/Messaging_PolicyValueA.cpp
+        * tao/NVList.cpp
+        * tao/NVList.h
+        * tao/NVList.i
+        * tao/Null_RefCount_Policy.h
+        * tao/ObjectIdListA.cpp
+        * tao/Objref_TypeCode.cpp
+        * tao/Objref_TypeCode.h
+        * tao/Objref_TypeCode.inl
+        * tao/Objref_TypeCode_Static.cpp
+        * tao/Objref_TypeCode_Static.h
+        * tao/Objref_TypeCode_Static.inl
+        * tao/OctetSeqA.cpp
+        * tao/PICurrentA.cpp
+        * tao/ParameterModeA.cpp
+        * tao/PolicyA.cpp
+        * tao/Policy_ForwardA.cpp
+        * tao/Recursive_Type_TypeCode.cpp
+        * tao/Recursive_Type_TypeCode.h
+        * tao/Recursive_Type_TypeCode.inl
+        * tao/RefCount_Policy_Traits.h
+        * tao/Sequence_TypeCode.cpp
+        * tao/Sequence_TypeCode.h
+        * tao/Sequence_TypeCode.inl
+        * tao/Sequence_TypeCode_Static.cpp
+        * tao/Sequence_TypeCode_Static.h
+        * tao/Sequence_TypeCode_Static.inl
+        * tao/ShortSeqA.cpp
+        * tao/StringSeqA.cpp
+        * tao/String_TypeCode.cpp
+        * tao/String_TypeCode.h
+        * tao/String_TypeCode.inl
+        * tao/String_TypeCode_Static.cpp
+        * tao/String_TypeCode_Static.h
+        * tao/String_TypeCode_Static.inl
+        * tao/String_TypeCode_Traits.h
+        * tao/Struct_TypeCode.cpp
+        * tao/Struct_TypeCode.h
+        * tao/Struct_TypeCode.inl
+        * tao/Struct_TypeCode_Static.cpp
+        * tao/Struct_TypeCode_Static.h
+        * tao/Struct_TypeCode_Static.inl
+        * tao/SystemExceptionA.cpp
+        * tao/TAOA.cpp
+        * tao/TimeBaseA.cpp
+        * tao/True_RefCount_Policy.cpp
+        * tao/True_RefCount_Policy.h
+        * tao/True_RefCount_Policy.inl
+        * tao/TypeCode.cpp
+        * tao/TypeCode.h
+        * tao/TypeCode.inl
+        * tao/TypeCodeA.cpp
+        * tao/TypeCode_Base_Attributes.cpp
+        * tao/TypeCode_Base_Attributes.h
+        * tao/TypeCode_Base_Attributes.inl
+        * tao/TypeCode_CDR_Extraction.cpp
+        * tao/TypeCode_CDR_Extraction.h
+        * tao/TypeCode_Case.cpp
+        * tao/TypeCode_Case.h
+        * tao/TypeCode_Case.inl
+        * tao/TypeCode_Case_T.cpp
+        * tao/TypeCode_Case_T.h
+        * tao/TypeCode_Case_T.inl
+        * tao/TypeCode_Constants.cpp
+        * tao/TypeCode_Constants.h
+        * tao/TypeCode_Struct_Field.h
+        * tao/TypeCode_Traits.h
+        * tao/TypeCode_Value_Field.h
+        * tao/ULongLongSeqA.cpp
+        * tao/ULongSeqA.cpp
+        * tao/UShortSeqA.cpp
+        * tao/Union_TypeCode.cpp
+        * tao/Union_TypeCode.h
+        * tao/Union_TypeCode.inl
+        * tao/Union_TypeCode_Static.cpp
+        * tao/Union_TypeCode_Static.h
+        * tao/Union_TypeCode_Static.inl
+        * tao/Value_TypeCode.cpp
+        * tao/Value_TypeCode.h
+        * tao/Value_TypeCode.inl
+        * tao/Value_TypeCode_Static.cpp
+        * tao/Value_TypeCode_Static.h
+        * tao/Value_TypeCode_Static.inl
+        * tao/WCharSeqA.cpp
+        * tao/WStringSeqA.cpp
+        * tao/WrongTransactionA.cpp
+        * tao/append.cpp
+        * tao/skip.cpp
+          All these files are moved to the AnyTypeCode directory
+
+        * tao/UB_String_Argument_T.cpp:
+        * tao/Special_Basic_Argument_T.cpp:
+        * tao/Basic_Argument_T.cpp:
+        * tao/Object_Argument_T.cpp:
+        * tao/operation_details.cpp
+        * tao/Invocation_Base.cpp
+          Only include Dynamic_ParameterC.h when interceptors are enabled
+
+        * tao/SystemException.{h,cpp}:
+          Moved excp_factory to this file, we need it here, temporarily
+          removed _tao_type, we need to work on this.
+
+        * tao/RequestInfo_Util.{h,cpp}:
+          Don't build these when interceptors are disabled
+
+        * tao/ORB_Core.cpp
+          Include ace/Message_Block.h to get ACE_Data_Block
+
+        * tao/ORB_Core.h:
+          Added forward declaration of ACE_Data_Block
+
+        * tao/extra_core.mpb:
+          Removed NVList
+
+        * tao/corba.h:
+          Removed BoundsC.h
+
+        * tao/PortableInterceptorC.cpp
+        * tao/VisibilityC.cpp
+        * tao/orb_typesC.cpp
+        * tao/ORB.cpp
+        * tao/PI_ForwardC.cpp
+        * tao/InvalidSlotC.cpp
+        * tao/WrongTransactionC.cpp
+        * tao/GIOPC.cpp
+
+        * tao/Exception.{h,cpp}:
+          Commented out the Any operators, they should go to another lib,
+          will handle this later
+
+        * tao/Buffering_Constraint_Policy.cpp:
+          Commented out Any usage, needs to be addressed
+
+        * tao/WrongTransactionC.{h,cpp}:
+        * tao/PolicyC.cpp:
+          Commented out _tao_type for exceptions, we have to solve this
+          because exceptions now use TypeCode but we have subsetted that
+
+        * tao/UShortSeqC.h
+        * tao/ULongSeqC.h
+        * tao/WCharSeqC.h
+        * tao/Typecode_typesC.h
+        * tao/ULongLongSeqC.h
+        * tao/StringSeqC.h
+        * tao/TAOC.h
+        * tao/TimeBaseC.h
+        * tao/Policy_ForwardC.h
+        * tao/PortableInterceptorC.h
+        * tao/ShortSeqC.h
+        * tao/VisibilityC.h
+        * tao/LongDoubleSeqC.h
+        * tao/LongLongSeqC.h
+        * tao/LongSeqC.h
+        * tao/Messaging_PolicyValueC.h
+        * tao/ObjectIdListC.h
+        * tao/OctetSeqC.h
+        * tao/PICurrentC.h
+        * tao/PI_ForwardC.h
+        * tao/ParameterModeC.h
+        * tao/PolicyC.h
+        * tao/GIOPC.h
+        * tao/IIOPC.h
+        * tao/IIOP_EndpointsC.h
+        * tao/IOP_IORC.h
+        * tao/InvalidSlotC.h
+        * tao/DomainC.h
+        * tao/CharSeqC.h
+        * tao/CurrentC.h
+        * tao/DoubleSeqC.h
+        * tao/Exception.h
+        * tao/FloatSeqC.h
+        * tao/WStringSeqC.h
+        * tao/WrongTransactionC.h
+        * tao/orb_typesC.h
+        * tao/BooleanSeqC.h
+        * tao/CONV_FRAMEC.h
+          Removed TypeCode and Any operators, these are now all
+          in AnyTypeCode/*.h. This has been by hand, with the
+          change of Jeff below we can automate this
+
+        * tao.mpc
+          Removed a lot of files
+
+        Thu Jul 28 02:15:01 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_produce.cpp:
+        * TAO_IDL/be/be_visitor_context.cpp:
+        * TAO_IDL/be/be_visitor_array/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_root/any_op.cpp:
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_visitor_context.h:
+
+          Modified -GA option to generate a *A.h file as well as
+          a *A.cpp file, and added -Wb options 'anyop_export_macro'
+          and 'anyop_export_include' to optionally compile the *A.*
+          files into a separate library.
+
+        Wed Jul 27 17:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp:
+        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
+        * TAO_IDL/be/be_visitor_argument/paramlist.cpp:
+        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp:
+          Use ACE_OutputCDR::from_octet and ACE_InputCDR:to_octet instead
+          of CORBA::Any::from_octect and CORBA::Any::to_octet
+
+        Wed Jul 27 14:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+        * tao/GIOP_Message_Generator_Parser_12.cpp:
+        * tao/GIOP_Message_Lite.cpp:
+          Use ACE_OutputCDR::from_octet and ACE_InputCDR:to_octet
+
+Thu Aug 18 13:59:52 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/LogActivator.cpp:
+
+          Fixed emulated exception build failures.
+
+Thu Aug 18 13:46:38 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/LogActivator.cpp:
+
+          Changed to omit identifier name for unused parameters.
+
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+
+          Changed to use CORBA::RepositoryId_var for the return value of
+          create_log_repositoryid() so results will be freed on exit.
+
+        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+
+          Changed create_log_repositoryid() to duplicate string rather
+          than returning a string literal.
+
+Thu Aug 18 15:19:40 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp:
+
+          Removed more instances of generating a leading '::'
+          in front of ACE_NESTED_CLASS.
+
+Wed Aug 17 11:30:37 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp (create_with_id):
+
+          Fix bug where _nil() was returned instead of new object
+          reference.
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+
+          Add LogActivator.cpp to Source_Files in the DsLogAdmin_Serv
+          project.
+
+        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+
+          Changed create() and create_with_id() methods to invoke
+          create_log_reference() instead of create_log_object().  This is
+          not absolutely necessary, since a log is very likely to be used
+          after it is created.  However, it helps to ensure the servant
+          activator code path is exercised so it will work when a dynamic
+          logging strategy that needs it is loaded.
+
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+
+          Added USE_SERVANT_MANAGER request processing policy to the
+          log POA.
+
+        * orbsvcs/orbsvcs/Log/LogActivator.cpp:
+        * orbsvcs/orbsvcs/Log/LogActivator.h:
+
+          New files, servant activator class for creating new logs.  This
+          is useful for persistent log strategies so that servants can be
+          created when they are first accessed instead of at startup.
+
+Wed Aug 17 14:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Event_Service/Event_Service.cpp:
+          Removed explicit template instantiations
+
+Tue Aug 16 18:19:13 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp:
+
+          Removed generation of the leading double colon for typedef'd
+          basic type names in the exception constructor, since the
+          ACE_NESTED_CLASS macro could be used, and the double colon
+          will be incorrect for the VC6 expansion of the macro.
+
+Mon Aug 15 20:28:14 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 separate create_log_reference() implementations from
+          the derived factory classes into a single template method in the
+          base class.
+
+          Added new create_repositoryid() virtual method to return
+          the repository id for the specific log type.
+
+Mon Aug 15 16:41:57 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+
+          Add eventlog_serv_export.h to Header_Files section.
+
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+
+          Add log_serv_export.h to Header_Files section.
+
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+
+          Add notifylog_serv_export.h to Header_Files section.
+
+        * 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:
+
+          Combine identical create_log_objectid() implementations from the
+          derived factory classes into a single one in the base class.
+
+          Refactor separate create_log_object() implementations to
+          a single template method in the base class.
+
+Mon Aug 15 15:13:10 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/Concurrency/Makefile.am:
+
+          Remove tmplinst.cpp from list of files.
+
+        * 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.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 new virtual method create_log_servant() and factor out
+          implementation from create_log_object().  This change enables
+          making create_log_object() into a template method in the base
+          class and using a Servant Activator to avoid creating the log
+          servants until they're actually used.  I hope to make these
+          changes soon.
+
+Mon Aug 15 10:56:28 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+
+          Changed to inherit from utils.
+
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp (init):
+
+          Use TAO::Utils::PolicyList_Destroyer instead of plain
+          CORBA::PolicyList and an explicit loop to destroy the policies.
+          This ensures all policies will be destroyed if an exception is
+          thrown.
+
+Mon Aug 15 16:25:23 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_si.cpp:
+
+          Removed incorrect generation of '::' before CORBA::is_nil()
+          and CORBA::release().
+
+Mon Aug 15 16:08:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_valuetype.cpp:
+
+          Removed incorrect generation of '::' before generation of
+          CORBA::add_ref() and CORBA::remove_ref() declarations.
+
+Mon Aug 15 15:45:32 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
+
+          Modified changes in
+
+          Fri Aug 12 22:13:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          slightly to omit the generation of the leading double colon
+          if a field is a typedef of a basic type. In some of these
+          cases, the ACE_NESTED_MACRO will be generated, and the
+          leading double colon would be incorrect.
+
+Mon Aug 15 10:15:40 CDT 2005  Steve Totten  <totten_s@ociweb.com>
+
+        Committed the following change that came originally from
+        Dave Giovannini of OCI in OCI's TAO 1.4a.
+
+        Mon Jul 18 14:04:58 2005  David Giovannini  <giovannd@ociweb.com>
+
+        * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+
+          Add forward invocation to DII adaptor.
+
+Mon Aug 15 10:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Cubit/TAO/MT_Cubit/tmplinst.cpp:
+        * performance-tests/Cubit/TAO/IDL_Cubit/tmplinst.cpp:
+        * orbsvcs/tests/Concurrency/tmplinst.cpp:
+          Removed these files
+
+        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
+        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
+          Removed the files above
+
+Fri Aug 12 22:15:14 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/nested_scope.idl:
+
+          Added the IDL test file sent in by Nikolay Metchev
+          <n.metchev@teamphone.com> to the test suite.
+
+Fri Aug 12 22:13:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_predefined_type.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
         * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_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/paramlist.cpp:
+        * TAO_IDL/be/be_visitor_argument/vardecl_ss.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/array.cpp:
         * TAO_IDL/be/be_visitor_array/array_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.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_array/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_array/serializer_op_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_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_enum/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/serializer_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_exception/ctor_assign.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp:
+        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
+        * TAO_IDL/be/be_visitor_field/serializer_op_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_ss.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_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_cs.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/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.c
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.c
+        * TAO_IDL/be/be_visitor_operation/arglist.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_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/rettype.cpp:
+        * TAO_IDL/be/be_visitor_root/root.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/buffer_type.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_sequence/sequence_base.cpp:
         * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/sequence_cs.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/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_structure/serializer_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+        * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
+        * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp:
         * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ci.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_union/discriminant_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/discriminant_ci.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/union_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/union_cs.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_union_branch/serializer_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/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_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/ami_exception_holder_ch.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/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.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:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_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_include/be_visitor_traits.h:
-        Updated for new sequence implementation
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.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/valuetype_obv_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp:
+
+          Made sure the leading '::' appears before the 'CORBA'
+          scope of all generated basic type names. If application
+          IDL has a nested module named 'CORBA' there will be
+          confusion otherwise. Thanks to Nikolay Metchev
+          <n.metchev@teamphone.com> for sending in the example
+          IDL file that uncovered the bug.
+
+Fri Aug 12 14:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Miop/McastHello/McastHello.h:
+          Removed not needed msvc pragma push/pop
+
+        * orbsvcs/tests/Miop/McastHello/server.cpp:
+          Added a line feed to the error message
+
+Fri Aug 12 07:55:08 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_1551_Regression/Hello.cpp:
+
+          Added a line feed to the aborting message.
+
+        * tests/Collocation_Tests/Collocated_Test.cpp:
+        * tests/Collocation_Tests/Server_Task.cpp:
+
+          Destroy the server (and client) orb only after all threads have
+          finished.
+
+        * tests/Collocation_Tests/Hello.cpp:
+
+          Added a sleep of 1 second before the orb shutdown to avoid
+          BAD_INV_ORDER exceptions on fast dual processor machines.
+
+        * tests/OBV/Collocated/Forward/Client_Task.cpp:
+        * tests/OBV/Collocated/Forward/run_test.pl:
+
+          Changed this test to use if statements instead of ACE_ASSERT so
+          that the test runs the same on release builds as it does on debug
+          builds.
+
+        * tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl:
+
+          Check the correct variable to accurately display the test result.
 
-        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
-        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
-        * examples/Load_Balancing/Identity_Client.cpp:
-        * examples/Load_Balancing_persistent/Identity_Client.cpp:
-        * examples/POA/NewPOA/NewPOA.cpp:
-        * examples/POA/POA_BiDir/POA_BiDir.cpp:
-        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp:
-        * tests/DynAny_Test/test_dynsequence.cpp:
-        * tests/Sequence_Unit_Tests/*:
-        * tests/ORT/ServerRequestInterceptor.cpp:
-        * tests/Param_Test/big_union.cpp:
-        *
-        tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp:
-        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
-        * orbsvcs/orbsvcs/DsLogAdmin.idl:
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.{cpp,i}:
-        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.{h,cpp,i}
-        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
-        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/Container_i.cpp
-        * orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
-        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
-        * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
-        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
-        * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp:
-        * orbsvcs/orbsvcs/Log/Log_i.h:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.{h,cpp}
-        * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp:
-        * orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp:
-        * orbsvcs/tests/AVStreams/Component_Switching/sender.cpp:
-        * orbsvcs/tests/Bug_1393_Regression/client.cpp:
-        * orbsvcs/tests/FT_App/FT_Client.cpp:
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp:
-        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp:
-        *
-        orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp:
-        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp:
         * tests/RTScheduling/Current/Thread_Task.cpp:
-        * tests/RTScheduling/Thread_Cancel/Thread_Task.cpp:
-        Updated for sequence implementation
 
-        * tests/Sequence_Unit_Tests/*:
-        Removed files that are now in the core TAO lib
+          Added a sleep of 1 second before the orb shutdown to avoid
+          BAD_INV_ORDER exceptions on fast dual processor machines.
 
-Wed Apr 19 07:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Server_Connection_Purging/client.cpp:
 
-        * tests/Bug_2503_Regression/*:
-          New regression for bug 2503. Thanks to Carlos O'Ryan for creating
-          this test
+          Remove event handlers after finishing with the reactor loop to
+          avoid the possibility of using the handlers after they go out of
+          scope.  Also, added a parameter to an ACE_ERROR_RETURN that
+          expected one (by %p).
+
+
+        Committing the following changes from OCI.
+
+        Fri Sep 17 10:01:21 2004  Yan Dai   <dai_y@ociweb.com>
+
+        * tests/Bug_1361_Regression/Echo.h:
+
+          Make the abort_counter_ to be atomic. This would resolve the
+          problem of client timeout causes test failure.
+
+        Wed Sep  8 16:43:37 MST 2004  Yan Dai   <dai_y@ociweb.com>
+
+        * tests/Bug_1361_Regression/run_test.pl:
+
+          Made it wait longer for server shutdown since the server shutdown
+          needs more time on some platforms and corrected one syntex error
+          which uses undefined $client1.
+
+        Mon Apr 28 17:19:32 2003  Steve Totten  <totten_s@ociweb.com>
+
+        * tests/Stack_Recursion/run_test.pl:
+
+          Fixed typo in variable name used to print client status.
+
+        Wed Apr 23 13:05:48 2003  Steve Totten  <totten_s@ociweb.com>
+
+        * tests/Smart_Proxies/client.cpp:
+        * tests/Smart_Proxies/server.cpp:
+
+          Cleaned up some poor usage of ACE exception macros in client
+          and server.  Added a short sleep in client after it invokes
+          shutdown on server to make sure the request is written (this was
+          causing a problem on Windows XP).
+
+        * tests/Smart_Proxies/Policy/run_test.pl:
+
+          Fixed return-code checking.
+
+        * tests/Strategies/run_test.pl:
+
+          Fixed return-code checking.
+
+Fri Aug 12 08:07:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Collocation_Oneway_Tests/Client_Task.{h,cpp}:
+        * tests/Collocation_Oneway_Tests/Collocated_Test.cpp:
+          Changed the Client_Task enum, NONE is a macro on VxWorks
+
+Thu Aug 11 16:16:00 2005  Justin Michel  <michel_j@ociweb.com>
+
+        * orbsvcs/Notify_Service/Notify_Service.h:
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+
+          Reverted Mon Dec  6 23:08:12 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        The code requires use of to_name() to support creation of CosNaming::Name with
+        length > 1. For example :
+               CosNaming::Name_var n = to_name("a/b");
+          is basically equivalent to :
+               CosNaming::Name n(2);
+               n.length(2);
+               n[0].id = "a";
+               n[1].id = "b";
+
+          Thanks to Mike Chartier <mikec at compgen dot com> for
+        spotting this problem.
+        Rather than reverting the code to support both styles, I just made
+        the new code always use to_name().
+
+Thu Aug 11 13:48:57 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/orbconf.h:
+
+          Removed an unused and deprecated macro,
+          TAO_CONNECTION_CACHING_STRATEGY.  The macro that is used is
+          TAO_CONNECTION_PURGING_STRATEGY.
+
+Thu Aug 11 08:02:32 2005  Gary Maxey <gary.maxey@hp.com>
+
+        * tao/CORBANAME_Parser.cpp:
+          Change variable type because of warnings by some compilers.
+
+Wed Aug 10 08:46:55 2005  Gary Maxey <gary.maxey@hp.com>
+
+        * tao/CORBANAME_Parser.cpp:
+          Fixed problem where the following legal syntax was not allowed:
+             "corbaname:rir"
+          which should produce the object reference of the naming service.
+
+Wed Aug 10 11:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Collocation_Exception_Test/Client_Task.cpp:
+        * tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc:
+          No need to use messaging
+
+Tue Aug  9 19:28:15 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+        From J H Choi <jhchoi at sqisoft dot com>
+        * tao/TypeCode.cpp (equivalent):
+
+          Equivalence of two TypeCodes must be done between their
+          unaliased counterparts.  The code was incorrectly leaving one of
+          the TypeCodes aliased in the comparison.
+
+Mon Aug  8 18:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/advanced_resource.cpp:
+          Added include of tao/Protocol_Factory.h to not get compile errors
+          when all protocols are disabled. Thanks to Arvind S. Krishna
+          <arvindk at dre dot vanderbilt dot edu> for reporting this
+
+Mon Aug  8 10:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Collocation_Oneway_Tests/Collocation_Oneway_Tests.mpc:
+        * tests/Collocation_Exception_Test/Collocation_Excep_Test.mpc:
+          Made projects unique
+
+Mon Aug  8 08:55:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/ImplRepo/nestea_i.cpp:
+          Fixed invalid delete
+
+        * tao/PortableServer/Servant_Base.cpp:
+          Fixed bug when invoking collocated oneways with SYNC_WITH_SERVER
+          is set
+
+        * tests/Collocation_Oneway_Tests/*:
+          New test for collocated oneways. Thanks to Vito Bico
+          <vbica at qualcomm dot com> for making this test to reproduce
+          the bug in Servant_Base.
+
+        * tests/Collocation_Exception_Test/*:
+          New test for testing exceptions in collocated case
+
+        * rules.tao.GNU:
+          Removed TAO libraries, MPC now handles this.
+
+        * tests/Hello/Hello.mpc:
+          Added -St and -Sa as idl flags. This test doesn't need Any
+          and TypeCode and this way we can get the footprint down more
+          when AnyTypeCode refactoring is ready.
 
-Tue Apr 18 20:51:48 2006  Wallace Zhang  <zhangw@ociweb.com>
+Fri Aug 05 07:49:26 2005  Simon Massey  <sma@prismtech.com>
 
-        * TAO version 1.5.1 released.
+        * TAO version 1.4.7 released.
 
 Local Variables:
 mode: change-log
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index d1ee63b8357..b4f39f33ec5 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -856,7 +856,7 @@ AST_Generator::create_wstring (AST_Expression *ms)
                   AST_String (nt,
                               &n,
                               ms,
-                              sizeof (ACE_OS::WChar)),
+                              sizeof (wchar_t)),
                   0);
 
   return retval;
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index 710f8b1c8b8..c515722ae14 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -603,5 +603,3 @@ be_visitor_field_ch::visit_eventtype_fwd (
 {
   return this->visit_valuetype_fwd (node);
 }
-
-
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
index cd35ccf737b..29e474db40b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuebox,
-           cdr_op_ch,
+ACE_RCSID (be_visitor_valuebox, 
+           cdr_op_ch, 
            "$Id$")
 
 be_visitor_valuebox_cdr_op_ch::be_visitor_valuebox_cdr_op_ch (
@@ -64,3 +64,4 @@ be_visitor_valuebox_cdr_op_ch::visit_valuebox (be_valuebox *node)
   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 42b42489d69..3b4856930e5 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
@@ -52,13 +52,13 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node)
       << "// " << __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" << be_nl
       << "operator<< (" << be_idt << be_idt_nl
-      << "TAO_OutputCDR &strm, " << be_nl
+      << "TAO_OutputCDR &strm," << be_nl
       << "const " << node->full_name ()
       << " *_tao_valuebox" << be_uidt_nl
       << ")" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
index b8a025efc2b..c0f28c78a64 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
@@ -89,9 +89,6 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
   *os << "virtual const char* "
       << "_tao_obv_repository_id (void) const;"
       << be_nl << be_nl
-      << "virtual void "
-      << "_tao_obv_truncatable_repo_ids (Repository_Id_List &) const;"
-      << be_nl << be_nl
       << "static const char* "
       << "_tao_obv_static_repository_id (void);" << be_nl << be_nl;
 
@@ -128,8 +125,6 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node)
       << "_tao_marshal_v (TAO_OutputCDR &) const;" << be_nl;
   *os << "virtual ::CORBA::Boolean "
       << "_tao_unmarshal_v (TAO_InputCDR &);" << be_nl;
-  *os << "virtual ::CORBA::Boolean "
-      << "_tao_match_formal_type (ptrdiff_t ) const;" << be_nl;
 
   // Private unimplemented default assignment operator
   *os << be_uidt_nl << "private:" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
index 3f8fc95b0d1..4acc14aaca8 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
@@ -65,16 +65,6 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node)
       << "return \"" << node->repoID () << "\";" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  // _tao_match_formal_type method.  Generated because ValueBase interface
-  // requires it. Since value boxes do not support inheritence, this can
-  // simply return true.
-  *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
-      << node->name ()
-      << "::_tao_match_formal_type (ptrdiff_t ) const" << 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);
 
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 91218d66de0..6a66cc503ee 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -122,12 +122,6 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "void" << be_nl
-      << node->name () << "::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const" << be_nl
-      << "{" << be_idt_nl
-      << "ids.push_back (this->_tao_obv_static_repository_id ());" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
   AST_Type * at = node->boxed_type()->unaliased_type();
   be_type *bt = be_type::narrow_from_decl (at);
   bool is_array = false;
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 2cfe3923843..df4f4fa224f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
@@ -20,8 +20,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype,
-           cdr_op_ch,
+ACE_RCSID (be_visitor_valuetype, 
+           cdr_op_ch, 
            "$Id$")
 
 be_visitor_valuetype_cdr_op_ch::be_visitor_valuetype_cdr_op_ch (
@@ -52,7 +52,7 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                        "(%N:%l) be_visitor_valuetype_cdr_op_ch::"
                          "visit_valuetype - "
-                         "codegen for helper functions failed\n"),
+                         "codegen for helper functions failed\n"), 
                         -1);
     }
 
@@ -61,7 +61,7 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
       << "// " << __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;
@@ -71,7 +71,7 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
       << 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);
 
@@ -80,7 +80,7 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_cdr_op_ch::"
                          "visit_valuetype - "
-                         "codegen for scope failed\n"),
+                         "codegen for scope failed\n"), 
                         -1);
     }
 
@@ -101,3 +101,5 @@ be_visitor_valuetype_cdr_op_ch::visit_eventtype (be_eventtype *node)
 {
   return this->visit_valuetype (node);
 }
+
+
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 1b7ac0be4b3..8e41015613f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -73,13 +73,13 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
       << "// " << __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" << be_nl
       << "operator<< (" << be_idt << be_idt_nl
-      << "TAO_OutputCDR &strm, " << be_nl
+      << "TAO_OutputCDR &strm," << be_nl
       << "const " << node->full_name ()
       << " *_tao_valuetype" << be_uidt_nl
       << ")" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index ffeabdd4bb5..3632cdef765 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -58,29 +58,18 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
       *os << "strm";
     }
 
-  *os << ", TAO_ChunkInfo&";
-  // If the valuetype has no fields, and no stateful inherit,
-  // the chunking helper arg is unused.
-  if (inh != 0 || node->data_members_count () > 0)
-    {
-      *os << "ci";
-    }
-
   *os << ") const" << be_nl
       << "{" << be_idt_nl;
 
   if (inh)
     {
-      *os << "if (! ci.start_chunk (strm))" << be_idt_nl;
-      *os << "return false;" << be_uidt_nl << be_nl;
-
       if (inh->opt_accessor ())
         {
           *os << "if (!this->";
 
           this->class_name (inh, os);
 
-          *os << "::_tao_marshal_state (strm, ci))" << be_idt_nl
+          *os << "::_tao_marshal_state (strm))" << be_idt_nl
               << "{" << be_idt_nl
               << "return false;" << be_uidt_nl
               << "}" << be_uidt_nl << be_nl;
@@ -90,7 +79,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
         {
           *os << "if (! this->_tao_marshal__"
               <<       inh->flat_name ()
-              << " (strm, ci))" << be_idt_nl
+              << " (strm))" << be_idt_nl
               << "{" << be_idt_nl
               << "return false;" << be_uidt_nl
               << "}" << be_uidt_nl << be_nl;
@@ -101,32 +90,15 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
   be_visitor_valuetype_field_cdr_decl field_out_cdr (&new_ctx);
   field_out_cdr.visit_scope (node);
 
-  if (node->data_members_count () > 0)
-    {
-      *os << "if (! ci.start_chunk (strm))" << be_idt_nl;
-      *os << "return false;" << be_uidt_nl << be_nl;
-      *os << "CORBA::Boolean ret = " << be_idt << be_idt_nl;
+  *os << "return (" << be_idt << be_idt_nl;
 
   // All we have to do is to visit the scope and generate code.
   this->gen_fields (node,
                     *this->ctx_);
 
-      *os << ";" << be_uidt << be_uidt_nl;
-
-      *os << "if ( ! ret) " << be_idt_nl;
-      *os << "return false; " << be_uidt_nl << be_nl;
-      *os << "if (! ci.end_chunk (strm))" << be_idt_nl;
-      *os << "return false;" << be_uidt_nl << be_nl;
-    }
-
-  if (inh)
-    {
-      *os << "if (! ci.end_chunk (strm))" << be_idt_nl;
-      *os << "return false;" << be_uidt_nl << be_nl;
-    }
-
-  *os << "return true;" << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
+  *os << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
+      << "}" << be_nl << be_nl;
 
   // Set the substate as generating code for the input operator.
   this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT);
@@ -144,29 +116,18 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
       *os << "strm";
     }
 
-  *os << ", TAO_ChunkInfo&";
-  // If the valuetype has no fields, and no stateful inherit,
-  // the chunking helper arg is unused.
-  if (inh != 0 || node->data_members_count () > 0)
-    {
-      *os << "ci";
-    }
-
   *os << ")" << be_nl
       << "{" << be_idt_nl;
 
   if (inh)
     {
-      *os << "if (! ci.handle_chunking (strm))" << be_idt_nl;
-      *os << "return false;" << be_uidt_nl << be_nl;
-
       if (inh->opt_accessor ())
         {
           *os << "if (!this->";
 
           this->class_name (inh, os);
 
-          *os << "::_tao_unmarshal_state (strm, ci))" << be_idt_nl
+          *os << "::_tao_unmarshal_state (strm))" << be_idt_nl
               << "{" << be_idt_nl
               << "return false;" << be_uidt_nl
               << "}" << be_uidt_nl << be_nl;
@@ -175,7 +136,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
         {
           *os << "if (! this->_tao_unmarshal__"
               <<       inh->flat_name ()
-              << " (strm, ci))" << be_idt_nl
+              << " (strm))" << be_idt_nl
               << "{" << be_idt_nl
               << "return false;" << be_uidt_nl
               << "}" << be_uidt_nl << be_nl;
@@ -185,37 +146,15 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
   be_visitor_valuetype_field_cdr_decl field_in_cdr (&new_ctx);
   field_in_cdr.visit_scope (node);
 
-  if (node->data_members_count () > 0)
-    {
-      *os << "if (! ci.handle_chunking (strm))" << be_idt_nl;
-      *os << "return false;" << be_uidt_nl << be_nl;
-      *os << "CORBA::Boolean ret = " << be_idt << be_idt_nl;
+  *os << "return (" << be_idt_nl;
 
   // All we have to do is to visit the scope and generate code.
   this->gen_fields (node,
                     *this->ctx_);
 
-      *os << ";" << be_uidt << be_uidt_nl;
-
-      *os << "if ( ! ret) " << be_idt_nl;
-      *os << "return false; " << be_uidt_nl << be_nl;
-      *os << "if (this->require_truncation_)" << be_idt_nl;
-      *os << "return ci.skip_chunks (strm);" << be_uidt_nl << be_nl;
-      *os << "else" << be_idt_nl;
-      *os << "return ci.handle_chunking (strm);" << be_uidt_nl << be_nl;
-    }
-    else
-      *os << "return true;";
-  *os << be_uidt_nl << "}" << be_nl << be_nl;
-
-  *os << "void" << be_nl;
-
-  this->class_name (node, os);
-
-  *os << "::truncation_hook (void)" << be_nl
-      << "{" << be_idt_nl
-      << "this->require_truncation_ = true;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+  *os << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
+      << "}";
 
   return 0;
 }
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 650257a2ba5..1ceb6962140 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -204,9 +204,6 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       << "virtual const char* "
       << "_tao_obv_repository_id (void) const;"
       << be_nl << be_nl
-      << "virtual void "
-      << "_tao_obv_truncatable_repo_ids (Repository_Id_List &) const;"
-      << be_nl << be_nl
       << "static const char* "
       << "_tao_obv_static_repository_id (void);" << be_nl << be_nl;
 
@@ -277,8 +274,6 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
           << "_tao_marshal_v (TAO_OutputCDR &) const;" << be_nl;
       *os << "virtual ::CORBA::Boolean "
           << "_tao_unmarshal_v (TAO_InputCDR &);" << be_nl;
-      *os << "virtual ::CORBA::Boolean "
-          << "_tao_match_formal_type (ptrdiff_t ) const;" << be_nl;
     }
 
   // Private member:
@@ -309,9 +304,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
       *os << "::CORBA::Boolean "
           << "_tao_marshal_state (TAO_OutputCDR &) const;" << be_nl
           << "::CORBA::Boolean "
-          << "_tao_unmarshal_state (TAO_InputCDR &);" << be_nl
-          << "virtual void "
-          << "truncation_hook (void);"
+          << "_tao_unmarshal_state (TAO_InputCDR &);"
           << be_uidt_nl << be_nl;
       *os << "private:" << be_idt_nl;
 
@@ -327,21 +320,21 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
             {
               *os << "virtual ::CORBA::Boolean" << be_nl
                   << "_tao_marshal__" << node->flat_name ()
-                  << " (TAO_OutputCDR &, TAO_ChunkInfo &) const;"
+                  << " (TAO_OutputCDR &) const;"
                   << be_nl << be_nl;
               *os << "virtual ::CORBA::Boolean" << be_nl
                   << "_tao_unmarshal__" << node->flat_name ()
-                  << " (TAO_InputCDR &, TAO_ChunkInfo &);";
+                  << " (TAO_InputCDR &);";
             }
           else
             {
               *os << "virtual ::CORBA::Boolean" << be_nl
                   << "_tao_marshal__" << node->flat_name ()
-                  << " (TAO_OutputCDR &, TAO_ChunkInfo &) const = 0;"
+                  << " (TAO_OutputCDR &) const = 0;"
                   << be_nl << be_nl;
               *os << "virtual ::CORBA::Boolean" << be_nl
                   << "_tao_unmarshal__" << node->flat_name ()
-                  << " (TAO_InputCDR &, TAO_ChunkInfo &) = 0;";
+                  << " (TAO_InputCDR &) = 0;";
             }
         }
     }
@@ -541,3 +534,4 @@ be_visitor_valuetype_ch::gen_supported_ops (be_interface *,
 
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
index eed0287f2ff..9d1532b259c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype,
-           valuetype_ci,
+ACE_RCSID (be_visitor_valuetype, 
+           valuetype_ci, 
            "$Id$")
 
 // **************************************************
@@ -56,17 +56,8 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "ACE_INLINE" << be_nl;
-  *os << node->name () << "::" << node->local_name () << " (void)" << be_nl;
-
-  if (node->truncatable())
-    {
-      *os << "{" << be_idt_nl
-          << "this->is_truncatable_ = true;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
-    }
-  else
-    *os << "{}" << be_nl << be_nl;
-
+  *os << node->name () << "::" << node->local_name () << " (void)" << be_nl
+      << "{}" << be_nl << be_nl;
 
   *os << "ACE_INLINE const char* " << be_nl
       << node->name () << "::_tao_obv_static_repository_id ()" << be_nl
@@ -79,7 +70,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_ci::"
                          "visit_valuetype - "
-                         "codegen for scope failed\n"),
+                         "codegen for scope failed\n"), 
                         -1);
     }
 
@@ -92,7 +83,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_ci::"
                          "visit_valuetype - "
-                         "failed to generate _init construct.\n"),
+                         "failed to generate _init construct.\n"),  
                         -1);
     }
 
@@ -120,7 +111,7 @@ be_visitor_valuetype_ci::visit_field (be_field *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_valuetype_ci::"
                              "visit_field - "
-                             "visit_field failed\n"),
+                             "visit_field failed\n"), 
                             -1);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 6d2c4cf2e96..db8e1cfbccc 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -113,20 +113,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "void" << be_nl
-      << node->name () << "::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const" << be_nl
-      << "{" << be_idt_nl
-      << "ids.push_back (this->_tao_obv_static_repository_id ());";
-
-  if (node->truncatable ())
-    {
-      *os << be_nl;
-      *os << node->inherits_concrete ()->name () << "::_tao_obv_truncatable_repo_ids (ids);" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
-    }
-  else
-    *os << be_uidt_nl << "}" << be_nl << be_nl;
-
   if (be_global->any_support ())
     {
       *os << "void" << be_nl
@@ -157,12 +143,10 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   if (!node->is_abstract () && !is_an_amh_exception_holder)
     {
       // The virtual _tao_marshal_v method.
-      *os << "::CORBA::Boolean " << be_nl
-          << node->name ()
-          << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-          << "{" << be_idt_nl
-          << "TAO_ChunkInfo ci(this->is_truncatable_ || this->chunking_);"
+      *os << "::CORBA::Boolean " << node->name ()
+          << "::_tao_marshal_v (TAO_OutputCDR & strm) const"
           << be_nl
+          << "{" << be_idt_nl
           << "return ";
 
       if (node->opt_accessor ())
@@ -172,24 +156,21 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
 
           *os << scope->name () << "::"
               << node->local_name ()
-              << "::_tao_marshal_state (strm, ci);" << be_uidt_nl;
+              << "::_tao_marshal_state (strm);" << be_uidt_nl;
         }
       else
         {
           *os << "this->_tao_marshal__" << node->flat_name ()
-              << " (strm, ci);" << be_uidt_nl;
+              << " (strm);" << be_uidt_nl;
         }
 
       *os << "}" << be_nl << be_nl;
 
       // The virtual _tao_unmarshal_v method.
-      *os << "::CORBA::Boolean " << be_nl
-          << node->name ()
+      *os << "::CORBA::Boolean " << node->name ()
           << "::_tao_unmarshal_v (TAO_InputCDR & strm)"
           << be_nl
           << "{" << be_idt_nl
-          << "TAO_ChunkInfo ci(this->is_truncatable_ || this->chunking_ ,1);"
-          << be_nl
           << "return ";
 
       if (node->opt_accessor ())
@@ -199,25 +180,15 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
 
           *os << scope->name () << "::"
               << node->local_name ()
-              <<"::_tao_unmarshal_state (strm,ci);" << be_uidt_nl;
+              <<"::_tao_unmarshal_state (strm);" << be_uidt_nl;
         }
       else
         {
           *os << "this->_tao_unmarshal__" << node->flat_name ()
-              << " (strm,ci);" << be_uidt_nl;
+              << " (strm);" << be_uidt_nl;
         }
 
       *os << "}" << be_nl << be_nl;
-
-      *os << "::CORBA::Boolean " << be_nl
-          << node->name ()
-          << "::_tao_match_formal_type (ptrdiff_t formal_type_id) const"
-          << be_nl
-          << "{" << be_idt_nl
-          << "return formal_type_id == reinterpret_cast<ptrdiff_t> ("
-          << node->name() << "::_downcast);" << be_uidt_nl
-          << "}" << be_nl << be_nl;
-
     }
   else if (is_an_amh_exception_holder)
     {
@@ -242,28 +213,19 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << "return true;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
-      // The virtual _tao_match_formal_type method.
-      *os << "::CORBA::Boolean " << be_nl
-          << node->name ()
-          << "::_tao_match_formal_type (ptrdiff_t ) const"
-          << be_nl
-          << "{" << be_idt_nl
-          << "return 0;"<< be_uidt_nl
-          << "}" << be_nl << be_nl;
-
 
       if (!node->opt_accessor () && !node->is_abstract ())
         {
           *os << "::CORBA::Boolean" << be_nl
               << node->name () << "::_tao_marshal__" << node->flat_name ()
-              << " (TAO_OutputCDR &, TAO_ChunkInfo&) const" << be_nl
+              << " (TAO_OutputCDR &) const" << be_nl
               << "{" << be_idt_nl
               << "return true;" << be_uidt_nl
               << "}" << be_nl << be_nl;
 
           *os << "::CORBA::Boolean" << be_nl
               << node->name () << "::_tao_unmarshal__" << node->flat_name ()
-              << " (TAO_InputCDR &, TAO_ChunkInfo&)" << be_nl
+              << " (TAO_InputCDR &)" << be_nl
               << "{" << be_idt_nl
               << "return true;" << be_uidt_nl
               << "}" << be_nl << be_nl;
@@ -279,20 +241,35 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::ValueBase *base = 0;" << be_nl
+      << "::CORBA::ValueFactory_var factory;" << be_nl
       << "::CORBA::Boolean retval =" << be_idt_nl
       << "::CORBA::ValueBase::_tao_unmarshal_pre (" << be_idt << be_idt_nl
       << "strm," << be_nl
+      << "factory.out ()," << be_nl
       << "base," << be_nl
       << node->local_name () << "::_tao_obv_static_repository_id ()" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl << be_nl
-      << "if (!retval)" << be_idt_nl
-      << "return false;" << be_uidt_nl << be_nl
-      << "if (base != 0 && ! base->_tao_unmarshal_v (strm))" << be_idt_nl
-      << "return false;" << be_uidt_nl << be_nl
+      << "if (retval == false)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "return false;" << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
+      << "if (factory.in () != 0)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "base = factory->create_for_unmarshal ();" << be_nl << be_nl
+      << "if (base == 0)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "return false;  // %! except.?" << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
+      << "retval = base->_tao_unmarshal_v (strm);" << be_nl << be_nl
+      << "if (retval == false)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "return false;" << be_uidt_nl
+      << "}" << be_uidt << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
       << "// Now base must be null or point to the unmarshaled object." << be_nl
       << "// Align the pointer to the right subobject." << be_nl
       << "new_object = " << node->local_name () << "::_downcast (base);" << be_nl
-      << "return true;" << be_uidt_nl
+      << "return retval;" << be_uidt_nl
       << "}";
 
   // If we inherit from CORBA::Object and/or CORBA::AbstractBase
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 3a04f825b06..843711ebdb3 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -174,9 +174,9 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
         {
           this->begin_public ();
         }
-
+      
       *os << be_nl;
-
+      
       // Default constructor.
       if (! node->is_nested ())
         {
@@ -184,19 +184,19 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
         }
 
       *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);
 
@@ -221,20 +221,16 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
 
           *os << "virtual ::CORBA::Boolean" << be_nl
               << "_tao_marshal__" << node->flat_name ()
-              << " (TAO_OutputCDR &, TAO_ChunkInfo &) const;" << be_nl << be_nl;
+              << " (TAO_OutputCDR &) const;" << be_nl << be_nl;
 
           *os << "virtual ::CORBA::Boolean" << be_nl
               << "_tao_unmarshal__" << node->flat_name ()
-              << " (TAO_InputCDR &, TAO_ChunkInfo &);" << be_nl << be_nl;
+              << " (TAO_InputCDR &);" << be_nl << be_nl;
 
           *os << "::CORBA::Boolean "
-              << "_tao_marshal_state (TAO_OutputCDR &, TAO_ChunkInfo &) const;"
-              << be_nl
+              << "_tao_marshal_state (TAO_OutputCDR &) const;" << be_nl
               << "::CORBA::Boolean "
-              << "_tao_unmarshal_state (TAO_InputCDR &, TAO_ChunkInfo &);"
-              << be_nl
-              << "virtual void "
-              << "truncation_hook (void);"
+              << "_tao_unmarshal_state (TAO_InputCDR &);"
               << be_uidt_nl << be_nl;
 
           *os << "private:" << be_idt;
@@ -242,9 +238,8 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
           this->gen_pd (node);
         }
 
-      *os << be_nl
-          << "CORBA::Boolean require_truncation_;" << be_uidt_nl
-          << "};";
+      *os << be_uidt_nl;
+      *os << "};";
 
       os->gen_endif ();
     }
@@ -292,13 +287,13 @@ 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;
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 b5123ed6be4..9a77076dcfd 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -65,8 +65,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
       *os << "OBV_";
     }
 
-  *os << node->local_name () << " (void)" << be_nl;
-  *os << ": require_truncation_ (false)" << be_nl
+  *os << node->local_name () << " (void)" << be_nl
       << "{}" << be_nl << be_nl;
 
   // Initializing constructor.
@@ -86,7 +85,6 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
 
       *os << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
-          << ": require_truncation_ (false)" << be_nl
           << "{" << be_idt;
 
       this->gen_obv_init_constructor_inits (node);
@@ -114,17 +112,17 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
       *os << be_nl << be_nl << "::CORBA::Boolean" << be_nl
           << node->full_obv_skel_name ()
           << "::_tao_marshal__" << node->flat_name ()
-          <<    " (TAO_OutputCDR &strm, TAO_ChunkInfo& ci) const" << be_nl
+          <<    " (TAO_OutputCDR &strm) const" << be_nl
           << "{" << be_idt_nl
-          << "return _tao_marshal_state (strm, ci);" << be_uidt_nl
+          << "return _tao_marshal_state (strm);" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       *os << "::CORBA::Boolean" << be_nl
           << node->full_obv_skel_name ()
           << "::_tao_unmarshal__" << node->flat_name ()
-          << " (TAO_InputCDR &strm, TAO_ChunkInfo& ci)" << be_nl
+          << " (TAO_InputCDR &strm)" << be_nl
           << "{" << be_idt_nl
-          << "return _tao_unmarshal_state (strm, ci);" << be_uidt_nl
+          << "return _tao_unmarshal_state (strm);" << be_uidt_nl
           << "}";
 
       if (this->visit_scope (node) == -1)
@@ -203,7 +201,7 @@ be_visitor_valuetype_obv_cs::gen_obv_init_base_constructor_args (
         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())
@@ -211,14 +209,14 @@ be_visitor_valuetype_obv_cs::gen_obv_init_base_constructor_args (
       // 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 ();
+          << "_tao_init_" << f->local_name ();          
     }
 }
 
@@ -236,22 +234,24 @@ be_visitor_valuetype_obv_cs::gen_obv_init_constructor_inits (
       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/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
index 8c19388a325..cb45192558c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
@@ -21,8 +21,8 @@
 //
 // ================================================================
 
-ACE_RCSID (be_visitor_valuetype_fwd,
-           cdr_op_ch,
+ACE_RCSID (be_visitor_valuetype_fwd, 
+           cdr_op_ch, 
            "$Id$")
 
 be_visitor_valuetype_fwd_cdr_op_ch::be_visitor_valuetype_fwd_cdr_op_ch (
@@ -61,7 +61,7 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd (
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  be_valuetype *fvd =
+  be_valuetype *fvd = 
     be_valuetype::narrow_from_decl (node->full_definition ());
 
   if (fvd->gen_helper_header () == -1)
@@ -69,7 +69,7 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd (
       ACE_ERROR_RETURN ((LM_ERROR,
                        "(%N:%l) be_visitor_valuetype_fwd_cdr_op_ch::"
                          "visit_valuetype_fwd - "
-                         "codegen for helper functions failed\n"),
+                         "codegen for helper functions failed\n"), 
                         -1);
     }
 
@@ -87,7 +87,7 @@ 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);
@@ -101,3 +101,4 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_eventtype_fwd (be_eventtype_fwd *node)
 {
   return this->visit_valuetype_fwd (node);
 }
+
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index 3dff54991bd..f73ca581725 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -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/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 6f313270540..46eb5e1ac98 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -847,6 +847,17 @@ value_header :
         {
 // value_header : value_decl inheritance_spec
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
+
+          if ($2 != 0 && $2->truncatable ())
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("warning in %s line %d\n"),
+                          idl_global->filename ()->get_string (),
+                          idl_global->lineno ()));
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("truncatable modifier not supported ")
+                          ACE_TEXT ("and is ignored\n")));
+            }
         }
         supports_spec
         {
@@ -5174,6 +5185,17 @@ event_rest_of_header :
         {
 // event_rest_of_header : inheritance_spec
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
+
+          if ($1 != 0 && $1->truncatable ())
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("warning in %s line %d\n"),
+                          idl_global->filename ()->get_string (),
+                          idl_global->lineno ()));
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("truncatable modifier not supported ")
+                          ACE_TEXT ("and is ignored\n")));
+            }
         }
         supports_spec
         {
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 6acb820bfa3..d39fc8c66e0 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -2708,6 +2708,17 @@ tao_yyreduce:
     {
 // value_header : value_decl inheritance_spec
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
+
+          if (tao_yyvsp[0].nlval != 0 && tao_yyvsp[0].nlval->truncatable ())
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("warning in %s line %d\n"),
+                          idl_global->filename ()->get_string (),
+                          idl_global->lineno ()));
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("truncatable modifier not supported ")
+                          ACE_TEXT ("and is ignored\n")));
+            }
         }
     break;
 
@@ -7466,6 +7477,16 @@ tao_yyreduce:
 // event_rest_of_header : inheritance_spec
           idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
 
+          if (tao_yyvsp[0].nlval != 0 && tao_yyvsp[0].nlval->truncatable ())
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("warning in %s line %d\n"),
+                          idl_global->filename ()->get_string (),
+                          idl_global->lineno ()));
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("truncatable modifier not supported ")
+                          ACE_TEXT ("and is ignored\n")));
+            }
         }
     break;
 
@@ -7830,3 +7851,4 @@ tao_yyerror (const char *msg)
               "%s\n",
               msg));
 }
+
diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp
index 54ea445086e..b372aa4cfba 100644
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ b/TAO/TAO_IDL/tao_idl.cpp
@@ -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);
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 2fb895074f4..48d4049f05d 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -6,6 +6,7 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
   libs        += TAO_IDL_BE TAO_IDL_FE
   install      = $(ACE_ROOT)/bin
   after       += TAO_IDL_BE TAO_IDL_FE gperf
+  avoids      += uses_wchar
 
   specific (automake) {
     includes    += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe
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/docs/Options.html b/TAO/docs/Options.html
index 22197133429..c5151b03d56 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -531,18 +531,11 @@ is <code>0</code>. This option is disabled (<code>0</code>) by default.</td>
             Note: If none of the preferred interfaces apply to an outgoing connection
             then they will not be enforced.  For this option to have
             any effect, therefore, the connection through a legal preferred interface must fail.
-      </tr>
+        </tr>
       <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 used by IIOP.
-        The default is <code>0</code> (false).
-        </td>
-      </tr>
-      <tr>
-        <td><code>-ORBDontRoute</code> <em>boolean (0|1)</em></td>
-        <td><a name="-ORBDontRoute"></a>This option allows users to specify
-        that the SO_DONTROUTE option is set on TCP sockets used by IIOP.
+        <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>
@@ -701,16 +694,6 @@ listen endpoints should be encoded into IORs when <code>-ORBUseIMR</code>
 is set. The default is true. </td>
       </tr>
       <tr>
-        <td><code>-ORBUseParallelConnects</code> <em>boolean (0|1)</em></td>
-        <td><a name="-ORBUseParallelConnects"></a>This option allows users to
-        specify the ORB attempt to connect simultaniously to all endpoints
-        listed in profiles, rather than stepping through individual endpoints,
-        trying and possibly failing, before moving on to the next. For this
-        feature to work, the server must be using shared profiles.
-        The default is <code>0</code> (false).
-        </td>
-      </tr>
-      <tr>
         <td><code>-ORBUseSharedProfile</code> <em>boolean (0|1)</em></td>
         <td><a name="-ORBUseSharedProfile"></a>
           This option allows multiple implicit or explicit endpoints to be
@@ -724,18 +707,6 @@ is set. The default is true. </td>
         </td>
       </tr>
       <tr>
-        <td><code>-ORBParallelConnectDelay</code> <em>unsigned long msec</em></td>
-        <td><a name="-ORBParallelConnectDelay"></a>When using parallel
-        connection attempts, this option defines the number of milliseconds to
-        delay when polling previously started connection attempts. If a server
-        is likely to be busy, this client side option will help avoid creating
-        redundant connections that must be accepted, only to be closed a moment
-        later. However, if the first reachable endpoint is far down the list,
-        this option will increase the delay before that endpoint is reached.
-        The default is <code>0</code>.
-        </td>
-      </tr>
-      <tr>
         <td><code>-ORBPreferIPV6Interfaces</code> <em>boolean (0|1)</em></td>
         <td><a name="-ORBPreferIPV6Interfaces"></a>
           If option is <CODE>1</CODE> (true) it directs the default
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/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/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/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/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/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/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/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/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/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/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/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/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp
index b8e0b3db2e5..994e668d249 100644
--- a/TAO/examples/Advanced/ch_3/client.cpp
+++ b/TAO/examples/Advanced/ch_3/client.cpp
@@ -21,29 +21,33 @@
 
 #include "timeC.h"
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
+
+#include "tao/Policy_ForwardC.h"
 
 // The following header is #included automatically by ACE+TAO.
 // Therefore, they don't need to be included explicitly.
 //#include <iostream.h>
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  try 
+  ACE_Argv_Type_Converter convert (argc, argv);
+  try
     {
       // Check arguments
-      if  (argc != 2) 
+      if  (argc != 2)
         {
           cerr << "Usage: client IOR_string" << endl;
           throw 0;
         }
 
       // 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]);
-      if  (CORBA::is_nil (obj.in ())) 
+      CORBA::Object_var obj = orb->string_to_object (convert.get_ASCII_argv()[1]);
+      if  (CORBA::is_nil (obj.in ()))
         {
           cerr << "Nil Time reference" << endl;
           throw 0;
@@ -52,7 +56,7 @@ main (int argc, char *argv[])
       // Narrow
       Time_var tm = Time::_narrow (obj.in ());
 
-      if  (CORBA::is_nil (tm.in ())) 
+      if  (CORBA::is_nil (tm.in ()))
         {
           cerr << "Argument is not a Time reference" << endl;
           throw 0;
@@ -71,14 +75,14 @@ main (int argc, char *argv[])
            << setw (2) << setfill ('0') << tod.minute << ":"
            << setw (2) << setfill ('0') << tod.second << endl;
     }
-  catch  (const CORBA::Exception &x) 
+  catch  (const CORBA::Exception &x)
     {
       ACE_PRINT_EXCEPTION (x,
                            "Who is the culprit \n");
       cerr << "Uncaught CORBA exception" << endl;
       return 1;
     }
-  catch  (...) 
+  catch  (...)
     {
       return 1;
     }
diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp
index fb8fbd74601..82d603e836a 100644
--- a/TAO/examples/Advanced/ch_3/server.cpp
+++ b/TAO/examples/Advanced/ch_3/server.cpp
@@ -20,7 +20,12 @@
 // ============================================================================
 
 #include "server.h"
+
+#include "tao/CORBA_String.h"
+
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
+
 
 // The following headers are #included automatically by ACE+TAO.
 // Therefore, they don't need to be included explicitly.
@@ -47,12 +52,13 @@ get_gmt (void) throw (CORBA::SystemException)
 // ______________________________________________________
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  try 
+  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
@@ -76,18 +82,10 @@ main (int argc, char *argv[])
       // Accept requests
       orb->run ();
     }
-  catch (const CORBA::Exception &) 
+  catch (const CORBA::Exception &)
     {
       cerr << "Uncaught CORBA exception" << endl;
       return 1;
     }
   return 0;
 }
-
-
-
-
-
-
-
-
diff --git a/TAO/examples/Advanced/ch_8_and_10/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/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index f74694e7d6e..9a0f6eaeb6d 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -14,11 +14,15 @@
 // ================================================================
 
 #include "testS.h"
+
+#include "tao/Policy_ForwardC.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/TAOA.h"
+
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Buffered_AMI,
            client,
@@ -106,7 +110,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 +262,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..fc42ba1afc5 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -1,8 +1,11 @@
 // $Id$
 
+#include "tao/CORBA_String.h"
+
 #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 +16,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 +40,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 +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 servant (orb.in ());
@@ -78,7 +81,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/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/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
index b55bdff6842..587407e555f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
@@ -18,7 +18,7 @@ ClientApp::~ClientApp()
 int
 ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 {
-  CORBA::ORB_var orb 
+  CORBA::ORB_var orb
     = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -32,7 +32,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  CORBA::Object_var obj 
+  CORBA::Object_var obj
     = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -81,7 +81,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       {
         ACE_DEBUG((LM_DEBUG,
                   "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
+
       }
       ACE_ENDTRY;
     }
@@ -139,4 +139,3 @@ ClientApp::usage_statement()
              "\t[-?]\n\n",
              this->exe_name_.c_str()));
 }
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
index a2cd204a762..82f03b349d5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
@@ -142,7 +142,7 @@ ClientTask::svc()
 
       Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
       CORBA::String_var buffer1 = CORBA::string_dup ("BOUNDED VAR SIZE CHAR");
-      bd_var_size_string->replace (ACE_OS::strlen (buffer1) + 1, buffer1);
+      bd_var_size_string->replace (ACE_OS::strlen (buffer1.in()) + 1, buffer1);
       this->foo_->test_bounded_var_size_arg (bd_var_size_string.in ()
                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -150,7 +150,7 @@ ClientTask::svc()
       CORBA::String_var buffer2 = CORBA::string_dup ("UNBOUNDED VAR SIZE CHAR");
       Unbounded_Var_Size_var ub_var_size_string = new Unbounded_Var_Size(100);
       ub_var_size_string->replace (ub_var_size_string->maximum (),
-                                   ACE_OS::strlen (buffer2) + 1,
+                                   ACE_OS::strlen (buffer2.in()) + 1,
                                    buffer2);
       this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ()
                                                ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
index 49c5cc14841..b5cbbd9a272 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
@@ -157,7 +157,7 @@ ClientTask::svc()
 
       Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
       CORBA::String_var  buffer1 = CORBA::string_dup ("BOUNDED VAR SIZE CHAR");
-      bd_var_size_string->replace (ACE_OS::strlen (buffer1) + 1,
+      bd_var_size_string->replace (ACE_OS::strlen (buffer1.in()) + 1,
                                    buffer1);
       this->foo_->test_bounded_var_size_arg (bd_var_size_string.in ()
                                              ACE_ENV_ARG_PARAMETER);
@@ -166,7 +166,7 @@ ClientTask::svc()
       CORBA::String_var  buffer2 = CORBA::string_dup ("UNBOUNDED VAR SIZE CHAR");
       Unbounded_Var_Size_var ub_var_size_string = new Unbounded_Var_Size(100);
       ub_var_size_string->replace (ub_var_size_string->maximum (),
-                                   ACE_OS::strlen (buffer2) + 1,
+                                   ACE_OS::strlen (buffer2.in()) + 1,
                                    buffer2);
       this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ()
                                                ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Callback_Quoter/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/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/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/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/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index 832e96b6732..5052e229ce2 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_ (),
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/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/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/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/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/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/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/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/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 7948ab73785..2a8d5776792 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_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_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 0ffc8625639..d122b750da3 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..311b6c25c61 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);
 
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/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_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/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/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/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/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/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/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/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 3d811df3b1b..a7e69aafb9a 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/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/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/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 be4283821ee..1a4293ecc61 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/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..118c807c2c6 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 =
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/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 df22f01b0a9..cfe114ea1ea 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/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/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/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/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/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/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/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index 8c5b4c7bd21..0f8f2217a1d 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -19,6 +19,7 @@
 #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
@@ -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..6fe540360ff 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"
 
@@ -33,13 +34,13 @@
 
 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 +81,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 f8b7c4a070e..8c3afbbbffe 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 eb1bfe506ab..fca74893051 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/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 973111c3e7e..7b8d054358b 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..f4f40d917a1 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -1,7 +1,9 @@
 //$Id$
+
+
 #include "Activity.h"
-#include "Thread_Task.h"
 #include "Job_i.h"
+#include "Thread_Task.h"
 #include "POA_Holder.h"
 #include "Builder.h"
 
@@ -12,7 +14,7 @@
 #include "ace/Barrier.h"
 #include "ace/Timer_Heap.h"
 #include "ace/Service_Config.h"
-#include "ace/Arg_Shifter.h"
+//#include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Signal.h"
@@ -65,10 +67,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 +403,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 +432,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 +444,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/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..10e77ebc9a3 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.h
+++ b/TAO/examples/RTCORBA/Activity/Builder.h
@@ -19,12 +19,9 @@
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 #include "activity_export.h"
+#include "ace/Arg_Shifter.h"
 
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 class Activity;
 class Periodic_Task;
 class Job_i;
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index 69320dc5323..98f0fee4a44 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -23,8 +23,11 @@ Job_i::poa (void)
 }
 
 int
-Job_i::init (ACE_Arg_Shifter& arg_shifter)
+Job_i::init (ACE_TArg_Shifter<char>& arg_shifter)
 {
+  int tmpInt = 1;
+  char ** tmp;
+  ACE_TArg_Shifter<char> arg_shifter_(tmpInt, tmp);
   job_name_ = arg_shifter.get_current (); // Read the name of the Job
   arg_shifter.consume_arg ();
 
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index 8ca42bb86b5..3594aa49416 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -16,9 +16,10 @@
 #include "JobS.h"
 #include "activity_export.h"
 #include "ace/SString.h"
+#include "ace/Arg_Shifter.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
+//class ACE_TArg_Shifter<char>;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -34,7 +35,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..1e44b40d6b1 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -17,9 +17,10 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "activity_export.h"
 #include "ace/SString.h"
+#include "ace/Arg_Shifter.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
+//class ACE_TArg_Shifter<char>;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -35,7 +36,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..3fb8ed12a82 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -19,10 +19,10 @@
 #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 +41,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/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index 4a7db7dd4ab..6a27728be15 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -8,10 +8,12 @@
 #include "DT_Creator.h"
 #include "tao/RTScheduling/Current.h"
 
+#include "ace/Arg_Shifter.h"
+
 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 +22,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 +72,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;
@@ -136,7 +138,7 @@ DT_Creator::init (int argc, char *argv [])
 	      delete this->job_list_[job_count];
 	      return -1;
 	    }
-	  else 
+	  else
 	    job_count++;
 	}
       else if ((current_arg = arg_shifter.get_the_parameter ("-OutFile")))
@@ -216,10 +218,10 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
 	      "Synch Name %s\n",
 	      synch_name.c_str ()));
-  
+
   ACE_NEW (synch_,
 	   Synch_i);
-  
+
   Synch_var synch = synch_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -274,7 +276,7 @@ DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL)
 				 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   for (int i = 0; i < poa_count_; ++i)
     {
       poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in ()
@@ -454,13 +456,13 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
 
   ACE_DEBUG ((LM_DEBUG,
               "Waiting to Synch\n"));
-  
+
   while (!this->synch ()->synched ())
     {
       this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  
+
   CORBA::Policy_var sched_param;
   sched_param = CORBA::Policy::_duplicate (this->sched_param (100));
   const char * name = 0;
@@ -587,7 +589,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/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..b8aee4ede56 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 ();
@@ -75,7 +75,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 +137,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 +150,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..6b290a7e7a6 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -17,8 +17,10 @@
 #include "Task_Stats.h"
 #include "ace/SString.h"
 
+#include "ace/Arg_Shifter.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
+//class ACE_TArg_Shifter<char>;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 class DT_Creator;
@@ -38,7 +40,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_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/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..b155203b515 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -17,11 +17,12 @@
 
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/PortableServer/PortableServer.h"
-//#include "activity_export.h"
 #include "ace/SString.h"
 
+#include "ace/Arg_Shifter.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
+//class ACE_TArg_Shifter<char>;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -38,7 +39,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/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/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/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/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/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/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/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/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/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/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/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 e14e834f16c..2a760e659f3 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/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/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/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..a91683c5637 100644
--- a/TAO/examples/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp
@@ -14,17 +14,19 @@
 
 #include "corbalocC.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/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/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/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/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..621ff2fb675 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -27,6 +27,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
+#include "ace/String_Base.h"
+
 #include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/Concurrency/Concurrency_Utils.h"
 #include "orbsvcs/Naming/Naming_Client.h"
@@ -74,10 +76,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/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/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/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index b4febf2f835..fd6725e9b77 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);
       }
     }
   }
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/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/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index 03fc838db47..770d8ef9870 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
@@ -70,12 +70,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 +109,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 +123,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 +137,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;
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 5a08f15d6d9..5a6a3043b65 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -145,9 +145,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 +157,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 +171,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 +181,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 +230,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 +245,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 +258,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,8 +288,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")
     ));
 }
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
index 3f101f27dea..ac26ed56e19 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
@@ -51,9 +51,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 +60,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 +70,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,9 +82,8 @@ 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
     ));
   }
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index bfc77eb5a46..81c83a7f821 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -95,7 +95,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 +208,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 +402,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 +435,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 +453,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 +463,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 (
@@ -1076,7 +1070,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 (
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index 4606008727c..5a6788d8cc4 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -68,9 +68,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 +159,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 +177,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 +192,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 +223,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 +253,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 +283,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 +313,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 +343,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 +358,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 +410,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 +423,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 +441,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 +450,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 +491,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 +524,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 +536,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 +550,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 +562,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 +580,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 +592,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 +610,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 +622,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 +640,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 +651,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 +672,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 +706,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 +814,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);
     }
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index 0efefef03cd..977cd36be76 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -107,7 +107,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 +128,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)
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index e120b9a2cc7..76ed9f3bb32 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -128,7 +128,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 +149,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)
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/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..2629a4c8c39 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -33,7 +33,7 @@ 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);
 
@@ -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,7 +143,7 @@ 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.
@@ -154,10 +154,9 @@ Activator_Options::init (int argc, char *argv[])
     }
 
   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,37 +193,38 @@ 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);
 
-  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);
+  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, "DebugLevel", 0, REG_DWORD,
-    (LPBYTE) &this->debug_ , sizeof (this->debug_));
-  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, "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("DebugLevel"), 0, REG_DWORD,
+    (LPBYTE) &this->debug_ , sizeof(this->debug_));
+  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);
@@ -244,16 +244,18 @@ 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,
-    (LPBYTE) tmpstr, &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("ORBInitOptions"), 0, &type,
+                                 (LPBYTE) tmpstr, &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_SZ);
@@ -262,17 +264,19 @@ Activator_Options::load_registry_options ()
     }
 
   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)
     {
@@ -280,18 +284,20 @@ Activator_Options::load_registry_options ()
     }
 
   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)
     {
@@ -335,9 +341,8 @@ 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 ();
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
index 45f351a0f44..0c687f5e198 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h
@@ -43,7 +43,7 @@ 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();
 
@@ -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/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index 34da1320caf..e40c8e6028a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -123,11 +123,11 @@ run_service_command (Activator_Options& opts)
 #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];
+  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"))
@@ -141,7 +141,7 @@ run_service_command (Activator_Options& opts)
         int ret = -1;
         if (opts.service_command () == Activator_Options::SC_INSTALL)
           {
-            const char* DEPENDS_ON = "TAOImR"; // Must match Locator_NT_Service.h
+            const ACE_TCHAR* DEPENDS_ON = ACE_TEXT("TAOImR"); // Must match Locator_NT_Service.h
 
             ret =  SERVICE::instance ()->insert (SERVICE_DEMAND_START,
                                                 SERVICE_ERROR_NORMAL,
@@ -192,7 +192,7 @@ run_service_command (Activator_Options& opts)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Activator_Options opts;
 
@@ -213,4 +213,3 @@ main (int argc, char *argv[])
 
   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..74f2dea1b4d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -11,6 +11,7 @@
 #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 ()
 {
@@ -114,79 +115,80 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
     }
 
   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)
     {
-      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 ()));
+      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);
+      }
+    }
 
-      // 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
 
-      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;
 
-      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 ()));
+    }
 
-      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(), 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);
 
-      // 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_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::init_with_orb");
@@ -200,15 +202,19 @@ 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);
@@ -315,17 +321,18 @@ 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)
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 12be58dd8cd..6ee3210d575 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -125,7 +125,7 @@ run_service_command (Options& opts)
   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);
       if (length == 0 || length >= MAX_PATH_LENGTH - sizeof(" -s"))
@@ -175,7 +175,7 @@ run_service_command (Options& opts)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Options opts;
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 7884c6c36c7..63974066cfd 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -17,6 +17,7 @@
 #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;
 
@@ -178,17 +179,17 @@ 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;
 }
@@ -196,16 +197,20 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
 int
 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 ();
+  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);
 
-  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);
   return err;
 }
 
@@ -213,22 +218,23 @@ int
 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);
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..cdd4d0939ee 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);
 
@@ -209,7 +209,7 @@ 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.
@@ -220,9 +220,10 @@ Options::init (int argc, char *argv[])
     }
 
   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;
 }
 
@@ -264,57 +265,61 @@ 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);
 
-  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);
+  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, "DebugLevel", 0, REG_DWORD,
-    (LPBYTE) &debug_ , sizeof (debug_));
+  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, "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("DebugLevel"), 0, REG_DWORD,
+    (LPBYTE) &debug_ , sizeof(debug_));
+  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);
+  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, 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);
@@ -342,8 +347,9 @@ Options::load_registry_options ()
   ACE_TCHAR tmpstr[4096];
   DWORD sz = sizeof (tmpstr);
   DWORD type = 0;
-  err = ACE_TEXT_RegQueryValueEx (key, "ORBInitOptions", 0, &type,
-    (LPBYTE) tmpstr, &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("ORBInitOptions"), 0, &type,
+                                 (LPBYTE) tmpstr, &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_SZ);
@@ -352,8 +358,9 @@ Options::load_registry_options ()
     }
 
   sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx (key, "IORFile", 0, &type,
-    (LPBYTE) tmpstr, &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("IORFile"), 0, &type,
+                                 (LPBYTE) tmpstr, &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_SZ);
@@ -362,8 +369,9 @@ Options::load_registry_options ()
     }
 
   sz = sizeof(debug_);
-  err = ACE_TEXT_RegQueryValueEx (key, "DebugLevel", 0, &type,
-    (LPBYTE) &this->debug_ , &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("DebugLevel"), 0, &type,
+                                 (LPBYTE) &this->debug_ , &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_DWORD);
@@ -371,8 +379,9 @@ Options::load_registry_options ()
 
   DWORD tmp = 0;
   sz = sizeof(tmp);
-  err = ACE_TEXT_RegQueryValueEx (key, "PingInterval", 0, &type,
-    (LPBYTE) &tmp, &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PingInterval"), 0, &type,
+                                 (LPBYTE) &tmp, &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_DWORD);
@@ -381,8 +390,9 @@ Options::load_registry_options ()
 
   tmp = 0;
   sz = sizeof(tmp);
-  err = ACE_TEXT_RegQueryValueEx (key, "Lock", 0, &type,
-    (LPBYTE) &tmp, &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Lock"), 0, &type,
+                                 (LPBYTE) &tmp, &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_DWORD);
@@ -390,8 +400,9 @@ Options::load_registry_options ()
     }
 
   sz = sizeof(this->repo_mode_);
-  err = ACE_TEXT_RegQueryValueEx (key, "PersistType", 0, &type,
-    (LPBYTE) &this->repo_mode_, &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistType"), 0, &type,
+                                 (LPBYTE) &this->repo_mode_, &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_DWORD);
@@ -399,8 +410,9 @@ Options::load_registry_options ()
 
   tmp = 0;
   sz = sizeof(tmp);
-  err = ACE_TEXT_RegQueryValueEx (key, "Timeout", 0, &type,
-    (LPBYTE) &tmp, &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Timeout"), 0, &type,
+                                 (LPBYTE) &tmp, &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_DWORD);
@@ -409,8 +421,9 @@ Options::load_registry_options ()
 
   tmp = 0;
   sz = sizeof(tmp);
-  err = ACE_TEXT_RegQueryValueEx (key, "Multicast", 0, &type,
-    (LPBYTE) &tmp, &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("Multicast"), 0, &type,
+                                 (LPBYTE) &tmp, &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_DWORD);
@@ -418,8 +431,9 @@ Options::load_registry_options ()
     }
 
   sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx (key, "PersistFile", 0, &type,
-    (LPBYTE) tmpstr, &sz);
+
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistFile"), 0, &type,
+                                 (LPBYTE) tmpstr, &sz);
   if (err == ERROR_SUCCESS)
     {
       ACE_ASSERT (type == REG_SZ);
@@ -445,7 +459,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 +477,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_;
 }
@@ -502,4 +516,3 @@ Options::readonly (void) const
 {
   return this->readonly_;
 }
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index 4d7019bccf3..fbbd9077915 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;
@@ -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..a125cf0fd53 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -11,20 +11,20 @@
 
 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)
@@ -42,27 +42,31 @@ static void loadActivatorsAsBinary (ACE_Configuration& config, Locator_Repositor
   ACE_Configuration_Section_Key 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)
@@ -70,42 +74,50 @@ static void loadServersAsBinary(ACE_Configuration& config, Locator_Repository::S
   ACE_Configuration_Section_Key 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)
@@ -165,16 +177,16 @@ 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);
 
@@ -206,9 +218,9 @@ static int loadAsXML (const ACE_CString& fname, Locator_Repository& repo)
 }
 
 // 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()));
@@ -219,40 +231,40 @@ static void saveAsXML (const ACE_CString& fname, Locator_Repository& repo)
 
   // 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\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);
+    ACE_OS::fprintf(fp,ACE_TEXT("\t</%s>\n"), Locator_XMLHandler::SERVER_INFO_TAG);
     }
 
   // Save Activators
@@ -314,8 +326,12 @@ Locator_Repository::init(const Options& opts)
           {
             ACE_Configuration_Win32Registry config ( HKEY_LOCAL_MACHINE );
             ACE_Configuration_Section_Key root;
+            config.open_section( config.root_section(), ACE_TEXT("Software\\TAO"), 0, root );
+            config.remove_section( root, ACE_TEXT("ImplementationRepository"), 1 );
+            /*
             config.open_section (config.root_section(), "Software\\TAO", 0, root);
             config.remove_section (root, "ImplementationRepository", 1);
+            */
           }
         HKEY root = ACE_Configuration_Win32Registry::
           resolve_key (HKEY_LOCAL_MACHINE, WIN32_REG_KEY);
@@ -407,28 +423,30 @@ Locator_Repository::update_server (const Server_Info& info)
           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);
+    err = cfg.open_section (root, ACE_TEXT_TO_TCHAR_IN(info.name.c_str()), 1, key);
+    if (err != 0)
+      {
+        ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", info.name.c_str()));
+        return err;
+      }
+
+    ACE_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());
+    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);
-    }
+  {
+    saveAsXML(this->fname_, *this);
+  }
+
   return 0;
 }
 
@@ -449,7 +467,8 @@ Locator_Repository::update_activator (const Activator_Info& info)
           ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", ACTIVATORS_ROOT_KEY));
           return err;
         }
-      err = cfg.open_section (root, info.name.c_str (), 1, key);
+      //err = cfg.open_section (root, info.name.c_str (), 1, key);
+      err = cfg.open_section (root, ACE_TEXT_TO_TCHAR_IN(info.name.c_str()), 1, key);
       if (err != 0)
         {
           ACE_ERROR((LM_ERROR, "Unable to open config section:%s\n", info.name.c_str()));
@@ -457,12 +476,13 @@ Locator_Repository::update_activator (const Activator_Info& info)
         }
 
       cfg.set_integer_value (key, TOKEN, info.token);
-      cfg.set_string_value (key, IOR, info.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);
+    saveAsXML(this->fname_, *this);
     }
+
   return 0;
 }
 
@@ -508,7 +528,8 @@ Locator_Repository::remove_server (const ACE_CString& name)
         {
           return 0; // Already gone.
         }
-      ret = cfg.remove_section (root, name.c_str (), 1);
+
+      ret = cfg.remove_section (root, ACE_TEXT_TO_TCHAR_IN(name.c_str()), 1);
     }
   else if (rmode_ == Options::REPO_XML_FILE)
     {
@@ -536,7 +557,8 @@ Locator_Repository::remove_activator (const ACE_CString& name)
       {
         return 0; // Already gone.
       }
-      ret = cfg.remove_section (root, name.c_str (), 1);
+
+      ret = cfg.remove_section (root, ACE_TEXT_TO_TCHAR_IN(name.c_str()), 1);
     }
   else if (rmode_ == Options::REPO_XML_FILE)
   {
@@ -557,8 +579,8 @@ Locator_Repository::activators (void)
   return activator_infos_;
 }
 
-const char*
-Locator_Repository::repo_mode ()
+const ACE_TCHAR*
+Locator_Repository::repo_mode()
 {
   switch (rmode_)
   {
@@ -566,9 +588,9 @@ Locator_Repository::repo_mode ()
   case Options::REPO_HEAP_FILE:
     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..1a60f46ae26 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -5,10 +5,10 @@
 
 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)
@@ -31,37 +31,39 @@ Locator_XMLHandler::startElement (const ACEXML_Char*,
 
       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);
+          this->server_name_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)0)));
+          this->activator_name_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)1)));
+          this->command_line_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)2)));
+          this->working_dir_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)3)));
+          this->activation_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)4)));
+
+            this->env_vars_.clear();
+
+            int limit = ACE_OS::atoi (attrs->getValue((size_t)5));
+            this->start_limit_ = limit;
+            this->partial_ior_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)6)));
+            this->server_object_ior_.set (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)7)));
         }
     }
   else if (ACE_OS::strcasecmp (qName, ACTIVATOR_INFO_TAG) == 0)
   {
     if (attrs != 0 && attrs->getLength () == 3)
-      {
-        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);
+          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);
         }
     }
 }
@@ -94,4 +96,3 @@ 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..f63f2fa9d85 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;
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 9febb1ae406..a65f0aefd38 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 ())
@@ -36,28 +37,28 @@ TAO_IMR_i::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;
+  {
+    // 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;
 
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
+    // Parse command line and verify parameters.
+    if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1)
+      return -1;
 
-      // Get the ImplRepo object
-      CORBA::Object_var obj =
-        orb_->resolve_initial_references ("ImplRepoService" 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;
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -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);
 }
 
 
@@ -285,9 +286,9 @@ TAO_IMR_Op_Activate::parse (int argc, ACE_TCHAR **argv)
     }
 
   // 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)
@@ -318,7 +319,7 @@ 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;
 
@@ -364,9 +365,9 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv)
     }
 
   // 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"));
@@ -379,19 +380,20 @@ TAO_IMR_Op_IOR::parse (int argc, ACE_TCHAR **argv)
   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;
-      }
+        {
+        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,12 +418,12 @@ 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;
 
@@ -466,9 +468,9 @@ TAO_IMR_Op_Remove::parse (int argc, ACE_TCHAR **argv)
     }
 
   // 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)
@@ -509,9 +511,9 @@ TAO_IMR_Op_Shutdown::parse (int argc, ACE_TCHAR **argv)
     }
 
   // 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)
@@ -557,7 +559,7 @@ TAO_IMR_Op_ShutdownRepo::parse (int argc, ACE_TCHAR **argv)
     }
 
   // 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;
 
@@ -587,8 +589,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 ());
@@ -627,64 +629,65 @@ TAO_IMR_Op_Register::parse (int argc, ACE_TCHAR **argv)
     }
 
   // 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)
-      {
-      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)
+        case 'c':  // Command line arguments
+          this->set_command_line_ = true;
+          this->command_line_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()));
+          break;
+        case 'e':  // set environment variables
+          this->set_environment_vars_ = true;
+          this->addenv( get_opts.opt_arg () );
+          break;
+        case 'w':  // Working Directory
+          this->set_working_dir_ = true;
+          this->working_dir_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()));
+          break;
+        case 'a':  // Activation Mode
+          this->set_activation_ = true;
+          if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("NORMAL")) == 0)
+            this->activation_ = ImplementationRepository::NORMAL;
+          else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("MANUAL")) == 0)
+            this->activation_ = ImplementationRepository::MANUAL;
+          else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("PER_CLIENT")) == 0)
+            this->activation_ = ImplementationRepository::PER_CLIENT;
+          else if (ACE_OS::strcasecmp (get_opts.opt_arg (), ACE_TEXT("AUTO_START")) == 0)
+            this->activation_ = ImplementationRepository::AUTO_START;
+          else
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Unknown Activation Mode <%s>.\n",
+                               get_opts.opt_arg ()),
+                              -1);
+          break;
+        case 'r':
+        case 'R':   // startup/ping Retry Count
+          {
+            this->set_retry_count_ = true;
+            int rc = ACE_OS::atoi(get_opts.optarg);
+            if (rc > 0)
             this->retry_count_ = rc;
+          }
+          break;
+        case 'l': /// hostname of the activator
+          this->activator_.set (ACE_TEXT_TO_CHAR_IN (get_opts.optarg));
+          this->set_activator_ = true;
+          break;
+        case 'h':  // display help
+          this->print_usage ();
+          return -1;
+        default:
+          ACE_ERROR((LM_ERROR, "ERROR : Unknown option '%c'\n", (char) c));
+          this->print_usage ();
+          return -1;
         }
-        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;
-      }
+
     }
   return 0;
 }
@@ -834,16 +837,16 @@ TAO_IMR_Op_IOR::run (void)
       ACE_DEBUG ((LM_DEBUG, "%s\n", ior.c_str ()));
 
       if (this->filename_.length () > 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);
-        }
+          FILE *file = ACE_OS::fopen (this->filename_.c_str (), ACE_TEXT("w"));
+
+          if (file == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "Error: Unable to open %s for writing: %p\n",
+                                 this->filename_.c_str ()),
+                                -1);
+            }
 
         ACE_OS::fprintf (file, "%s", ior.c_str ());
         ACE_OS::fclose (file);
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/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/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/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_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/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_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index e7d95c4dd99..781bb0851b1 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -35,8 +35,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);
@@ -76,11 +76,13 @@ int
 TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
                                  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;
 
@@ -315,7 +317,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
     {
       if (0 != (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)
@@ -350,7 +352,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
         }
       else if (0 != (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)
@@ -417,7 +419,7 @@ Worker::svc (void)
   // 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);
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index a32e6747b2a..33e1c5c86a3 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -87,7 +87,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/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/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/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/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/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/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/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/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/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 9b2da4d88c8..a96a0c6c277 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -31,7 +31,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)
   {
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
index 0b01378ccf8..da11974ffca 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)
   {
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/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..807f4a68a0f 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -6,9 +6,12 @@
 #include "ace/SString.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
+
 #include <stdexcept>
 #include <string>
 
+
 #define assertTrue(CONDITION) \
     if (CONDITION == false) { \
       ACE_CString str ("Error : "#CONDITION" "__FILE__":"); \
@@ -19,13 +22,13 @@
 
 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 ());
@@ -34,12 +37,12 @@ main (int argc, char* argv[])
       Long n = test->get ();
       Long m = test->get ();
       assertTrue (m == n + 1);
- 
+
       ACE_DEBUG ((LM_DEBUG, "All tests ran successfully.\n"));
 
       return 0;
-    } 
-  catch (CORBA::Exception& e) 
+    }
+  catch (CORBA::Exception& e)
     {
       ACE_PRINT_EXCEPTION (e, "test:");
     }
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/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/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/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/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/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/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/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/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 2cd8117b443..4fc119dfc39 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -68,7 +68,7 @@ Server_IORInterceptor::components_established (
 
 void
 Server_IORInterceptor::adapter_manager_state_changed (
-    const char *,
+    PortableInterceptor::AdapterManagerId,
     PortableInterceptor::AdapterState
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index da243325d05..a77551ad136 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -55,7 +55,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
-      const char * id,
+      PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
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/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/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/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/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/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/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 97756114183..1a686da4f39 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -1853,8 +1853,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
           for (u_int i=0;i<peer_protocols.length ();i++)
             {
               for (u_int j=0;j<this->protocols_.length ();j++)
-                if (ACE_OS::strcmp (peer_protocols [i],
-                                    this->protocols_[j]) == 0)
+                if (ACE_OS::strcmp (static_cast<const char*>(peer_protocols [i]),
+                                    static_cast<const char*>(this->protocols_[j])) == 0)
                   {
                     // we'll agree upon the first protocol that matches.
                     this->protocol_ = CORBA::string_dup (peer_protocols [i]);
@@ -2069,7 +2069,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
                forward_begin != end; ++forward_begin)
             {
               TAO_FlowSpec_Entry *entry = *forward_begin;
-              if (ACE_OS::strcmp (entry->flowname (), flow_spec [i]) == 0)
+              if (ACE_OS::strcmp (entry->flowname (), static_cast<const char*>(flow_spec [i])) == 0)
                 {
                   //                  entry->protocol_object ()->start ();
                   if (entry->handler () != 0)
@@ -2088,7 +2088,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
                reverse_begin != end; ++reverse_begin)
             {
               TAO_FlowSpec_Entry *entry = *reverse_begin;
-              if (ACE_OS::strcmp (entry->flowname (), flow_spec [i]) == 0)
+              if (ACE_OS::strcmp (entry->flowname (), static_cast<const char*>(flow_spec [i])) == 0)
                 {
                   //                  entry->protocol_object ()->start ();
                   if (entry->handler () != 0)
@@ -2624,7 +2624,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name
       // redefine the "Flows" property
       AVStreams::flowSpec new_flows (this->flows_.length ());
       for (u_int i=0, j=0 ; i <this->flows_.length (); i++)
-        if (ACE_OS::strcmp (flow_name, this->flows_[i]) != 0)
+        if (ACE_OS::strcmp (flow_name, static_cast<const char*>(this->flows_[i])) != 0)
           new_flows[j++] = this->flows_[i];
 
       CORBA::Any flows;
@@ -2877,7 +2877,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);
@@ -2902,7 +2902,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;
@@ -3848,7 +3848,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name
 
       AVStreams::flowSpec new_flows (this->flows_.length ());
       for (u_int i=0, j=0 ; i <this->flows_.length (); i++)
-        if (ACE_OS::strcmp (flow_name, this->flows_[i]) != 0)
+        if (ACE_OS::strcmp (flow_name, static_cast<const char*>(this->flows_[i])) != 0)
           new_flows[j++] = this->flows_[i];
 
       CORBA::Any flows;
@@ -4248,7 +4248,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);
             }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 4d15bdd853a..866a1386f9e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -107,11 +107,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_));
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index 76476dafb8b..772a72b9356 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -206,7 +206,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 ()));
@@ -470,16 +470,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 +600,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 +640,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 +667,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 +752,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 +927,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 +949,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 += "=";
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 19aba484619..57c734d5c9b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -215,61 +215,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 +492,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 +704,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 +833,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 +957,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 +1061,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 +1241,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 +1357,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);
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index 24eeb1f0930..10547d39fef 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -535,7 +535,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 +596,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 +661,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));
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 827079c3c90..8f6953ca8b1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -270,7 +270,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 +377,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 +544,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 +646,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 +679,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 +751,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 +890,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)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index b12a3a41e57..67f2284ace1 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -15,6 +15,7 @@
 
 #include "orbsvcs/Concurrency/Concurrency_Loader.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Concurrency, Concurrency_Loader, "$Id$")
 
@@ -29,14 +30,16 @@ TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void)
 }
 
 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))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index b49ae60f6f8..50083e67f28 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -41,7 +41,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 +50,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
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index dfd6db30524..57bb93b8fab 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -258,7 +258,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 ();
             }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index a627d07245e..2b02ea077fe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -103,7 +103,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,10 +160,10 @@ 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
@@ -266,7 +266,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)
             {
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll
index bfbe15ddd2a..1fbff1cbffc 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.ll
@@ -1,7 +1,7 @@
 %option noyywrap
 
 %{
-// ETCL.ll,v 1.5 2005/11/16 07:53:24 ossama Exp
+// ETCL.ll,v 1.3.176.1 2006/04/26 19:52:34 john_c Exp
 // ========================================================================
 //
 // = LIBRARY
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index 723466ea888..d9a82b5fe5a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -115,7 +115,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 +166,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 +315,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 +436,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 +444,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);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index c10cfbbb4cd..b51714d2f4b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -93,7 +93,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 +124,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 +143,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 +158,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 +177,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 +194,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 +303,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 +322,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 +334,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 +351,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 +368,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 +448,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 ();
             }
         }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 93b6952aa8d..5c17293ac4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -34,7 +34,7 @@ TAO_EC_Simple_Queue_Full_Action::init_svcs (void)
 }
 
 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 +47,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
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 7aaedd68071..370bc10524a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -65,7 +65,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,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index ec6b0f935ca..89a9ddb76ee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -52,7 +52,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 +60,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 +76,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 +113,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 ();
             }
         }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
index 2a1c30a10a0..1fbd4a03b2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
@@ -48,7 +48,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);
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 087ffc53b03..4e96a5ce513 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -23,7 +23,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);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
index a76bc59f73d..c85724ed43b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h
@@ -46,7 +46,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*);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
index c8e822ed5b9..ab1cc0a43f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp
@@ -36,15 +36,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 +60,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;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
index c65e5be61cc..6b17d72660f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.h
@@ -43,7 +43,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*
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 88dedebea60..0739fe2f51d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -111,8 +111,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))
              {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index adac1b323a4..febf8fbe014 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -47,7 +47,7 @@ namespace TAO_FTRT {
       {
         curarg++;
         if (curarg < argc)
-          transaction_depth = atoi(argv[curarg]);
+          transaction_depth = ACE_OS::atoi(argv[curarg]);
       }
 
 
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 0bae38d051d..8dc99941883 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -120,7 +120,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 +167,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());
    }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 50a4a5f4dff..319840261ec 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -32,7 +32,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 +45,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 +92,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 +114,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());
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 80c7ba30a06..2b92cb3cf38 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -77,7 +77,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 +117,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 +131,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 +238,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 +269,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 +319,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
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
index a7cc3c7a391..7e225602e4b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
@@ -42,7 +42,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,7 +67,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;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
index bcf68ca9e98..573a6cb8464 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
@@ -30,10 +30,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;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index ee750df8f22..cb23d1aa537 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -192,7 +192,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()) {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index 779396ce1ee..7ff6e8951e4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -224,7 +224,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;
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 63d7801689e..94b7ca5acb7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -153,7 +153,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);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 7b356e36f4d..78fe674a026 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -43,7 +43,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);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index 753cd359248..dacd04341ae 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -68,11 +68,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 +108,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,21 +170,21 @@ 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;
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
index 6319f696946..44476a3fc23 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
@@ -17,7 +17,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);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
index 120a88f6557..7008345edee 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
@@ -22,7 +22,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
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index 8d8cddc96f8..190285b3b0f 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -452,7 +452,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 +542,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 ()));
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
index 00a99a84351..ad4b080297b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp
@@ -252,8 +252,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
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index c2a2dde9735..0cdab0c09ef 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -147,7 +147,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,12 +156,12 @@ 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)
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
index 8542907269b..9f8d638a5b6 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
@@ -80,7 +80,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]));
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
index 26f71866bfd..cc505817e48 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
@@ -27,7 +27,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)
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 73a947638cf..ea4ae89e71a 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -125,7 +125,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
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 3e6d76a10aa..3e12f2f41e9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -35,7 +35,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 +47,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 +55,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 +67,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 +75,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]);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 3f555d17a5c..6af1cad1b42 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -95,7 +95,7 @@ TAO_LB_IORInterceptor::components_established (
 
 void
 TAO_LB_IORInterceptor::adapter_manager_state_changed (
-    const char *,
+    PortableInterceptor::AdapterManagerId,
     PortableInterceptor::AdapterState state
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 6b93c951912..ca4b6f7ea01 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -92,7 +92,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
-      const char * id,
+      PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index 25354e8328a..4155a5cf494 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -357,7 +357,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
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
index 403e105bf7d..c7de112dd11 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
@@ -5,6 +5,7 @@
 //-----------------------------------------------------------------------------
 #include "orbsvcs/Naming/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"
@@ -32,7 +33,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 +61,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 +248,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 +269,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 +291,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);
@@ -354,7 +349,7 @@ TAO_NS_FlatFileFactory::create_stream (const ACE_CString & file,
   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;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 5ea0c3bbc03..db1876ab5f8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -171,7 +171,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 +208,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 */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index 467086d3cd6..3f2c4253a0f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -422,7 +422,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 +534,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 +725,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 ());
@@ -1499,8 +1499,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 +1524,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();
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index b2bb63bf6cf..c37f66d6b8a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -62,8 +62,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);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index e86593e9583..3ad1b7d988c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -104,8 +104,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 +115,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 +124,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;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
index 7d1109eb65e..efda609e5f1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
@@ -64,7 +64,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)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 53e825c0939..310b693d2aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -46,6 +46,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //
 namespace TAO_Notify
 {
+
   class Topology_Saver;
   class Topology_Parent;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 7dd33e5deb6..f880fc28ecb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -32,14 +32,16 @@ namespace {
     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);
+      const ACE_TCHAR * name = attrs->getQName (i);
+      const ACE_TCHAR * value = attrs->getValue (i);
       if (ACE_OS::strcmp (name,
-                         TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::TOPOLOGY_ID_NAME) == 0)
+                          //TOPOLOGY_ID_NAME) == 0)
+                          TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::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;
   }
@@ -81,7 +83,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 +134,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);
@@ -194,7 +196,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 +205,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;
       }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index f6f0864b46f..da7302b66d1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -131,7 +131,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 +173,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(), "\"");
     }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
index 8b263987fe8..632ba0f0949 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
@@ -68,17 +68,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 +88,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 +100,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 +112,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 +124,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)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 804e235f797..829ca0cdef9 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -38,8 +38,8 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  PortableServer::ObjectId_var obj_id =
-    this->reference_to_id (obj_ref.in () ACE_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var obj_id = this->reference_to_id (obj_ref.in ()
+                                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Associate the object reference with the group reference.
@@ -102,23 +102,23 @@ TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref,
 
 
 TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name,
-                  PortableServer::POAManager_ptr poa_manager,
-                  const TAO_POA_Policy_Set &policies,
-                  TAO_Root_POA *parent,
-                  ACE_Lock &lock,
-                  TAO_SYNCH_MUTEX &thread_lock,
-                  TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
+                        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)
+             poa_manager,
+             policies,
+             parent,
+             lock,
+             thread_lock,
+             orb_core,
+             object_adapter
+             ACE_ENV_ARG_PARAMETER)
 {
 }
 
@@ -128,27 +128,27 @@ TAO_GOA::~TAO_GOA (void)
 
 TAO_Root_POA *
 TAO_GOA::new_POA (const String &name,
-                  PortableServer::POAManager_ptr poa_manager,
-                  const TAO_POA_Policy_Set &policies,
-                  TAO_Root_POA *parent,
-                  ACE_Lock &lock,
-                  TAO_SYNCH_MUTEX &thread_lock,
-                  TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
+                     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_GOA *poa = 0;
 
   ACE_NEW_THROW_EX (poa,
                     TAO_GOA (name,
-                             poa_manager,
-                             policies,
-                             parent,
-                             lock,
-                             thread_lock,
-                             orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
+                                poa_manager,
+                                policies,
+                                parent,
+                                lock,
+                                thread_lock,
+                                orb_core,
+                                object_adapter
+                                ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index d5bbdeb04dd..12af8d574a5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -264,7 +264,7 @@ public:
   // End standard POA interface methods.
 
   TAO_GOA (const String &name,
-           PortableServer::POAManager_ptr poa_manager,
+           TAO_POA_Manager &poa_manager,
            const TAO_POA_Policy_Set &policies,
            TAO_Root_POA *parent,
            ACE_Lock &lock,
@@ -282,7 +282,7 @@ protected:
 
   /// Template method for creating new POA's of this type.
   virtual TAO_Root_POA *new_POA (const String &name,
-                                 PortableServer::POAManager_ptr poa_manager,
+                            TAO_POA_Manager &poa_manager,
                             const TAO_POA_Policy_Set &policies,
                             TAO_Root_POA *parent,
                             ACE_Lock &lock,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 330d3984006..8a901db4e19 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -66,7 +66,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 +714,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);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 4b3504795e2..1c2b3a94b21 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -15,7 +15,7 @@ TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void)
 
 TAO_Root_POA *
 TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
-                                            PortableServer::POAManager_ptr poa_manager,
+                                            TAO_POA_Manager &poa_manager,
                                             const TAO_POA_Policy_Set &policies,
                                             ACE_Lock &lock,
                                             TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
index a5718c240cc..c8c80d87a7f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
@@ -57,7 +57,7 @@ public:
 
   /// Factory method for creating new POA's.
   TAO_Root_POA *create_Root_POA (const ACE_CString &name,
-                                 PortableServer::POAManager_ptr poa_manager,
+                                 TAO_POA_Manager &poa_manager,
                                  const TAO_POA_Policy_Set &policies,
                                  ACE_Lock &lock,
                                  TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 73745a4460b..a3515d8cf37 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -172,7 +172,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;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index 3f02a649f72..b006f1d1e1e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -58,7 +58,7 @@ TAO_UIPMC_Protocol_Factory::make_acceptor (void)
 
 int
 TAO_UIPMC_Protocol_Factory::init (int /* argc */,
-                                  char* /* argv */ [])
+                                  ACE_TCHAR* /* argv */ [])
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
index 8b7ab75adf2..b914111489e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
@@ -38,7 +38,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);
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 817d0726b4b..7b0e4d0db2e 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -45,8 +45,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
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 49a369925e7..058f0aebf01 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -118,7 +118,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;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
index 169e12b7bf2..4ca7a9cf601 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
@@ -64,7 +64,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);
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 69b1e25ddca..90ec0a81889 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -450,7 +450,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 +458,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 +1555,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 +1572,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 +1657,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 +1931,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 +1942,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 +2026,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 +2151,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 +2162,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 +2241,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 +2370,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;
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 44ebd3e82b3..a4b7171a697 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -352,7 +352,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;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 74b6cb25967..edb16fd97b9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -243,7 +243,7 @@ visit_exist (TAO_Unary_Constraint* unary_exist)
 {
   TAO_Property_Constraint* operand =
     (TAO_Property_Constraint*) unary_exist->operand ();
-  CORBA::String_var property_name ((const char*) operand->name ());
+  TAO_String_Hash_Key property_name ((const char*) operand->name ());
 
   // Determine if a property is defined on this offer.
 
@@ -1151,7 +1151,7 @@ TAO_Constraint_Validator::extract_type (TAO_Constraint* expr,
   if (type == TAO_IDENT)
     {
       TAO_Property_Constraint* prop = (TAO_Property_Constraint*) expr;
-      CORBA::String_var prop_name (prop->name ());
+      TAO_String_Hash_Key prop_name (prop->name ());
 
       if (this->type_map_.find (prop_name, return_value) == 0)
         type = TAO_Literal_Constraint::comparable_type (return_value);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 993d47ad0e0..8ee0351020a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -1,9 +1,53 @@
 // $Id$
 
 #include "orbsvcs/Trader/Interpreter_Utils.h"
+#include "ace/ACE.h"
+#include "ace/OS_NS_string.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+// = Methods to deal with ACE_Hash_Map_Manager.
+
+TAO_String_Hash_Key::TAO_String_Hash_Key (void)
+{
+}
+
+TAO_String_Hash_Key::TAO_String_Hash_Key (char * name)
+  : CORBA::String_var (name)
+{
+}
+
+TAO_String_Hash_Key::TAO_String_Hash_Key (const char * name)
+  : CORBA::String_var (name)
+{
+}
+
+TAO_String_Hash_Key::TAO_String_Hash_Key (const CORBA::String_var &src)
+  : CORBA::String_var (src)
+{
+}
+
+bool
+TAO_String_Hash_Key::operator == (const TAO_String_Hash_Key &hash_key) const
+{
+  return ACE_OS::strcmp (this->in (), hash_key.in ()) == 0;
+}
+
+bool
+operator < (const TAO_String_Hash_Key &left,
+            const TAO_String_Hash_Key &right)
+{
+  return ACE_OS::strcmp (left.in (), right.in ()) < 0;
+}
+
+
+u_long
+TAO_String_Hash_Key::hash (void) const
+{
+  u_long ret = ACE::hash_pjw (this->in ());
+  return ret;
+}
+
 // TAO_Sequence_Extracter_Base
 
 CORBA::TCKind
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index e59fa4a10ab..bd076791149 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -15,9 +15,6 @@
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
-#include "ace/Functor.h"
-#include "ace/ACE.h"
-#include "ace/OS_NS_string.h"
 
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/CORBA_String.h"
@@ -27,49 +24,53 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template<>
-class TAO_Trading_Serv_Export ACE_Hash<CORBA::String_var>
-{
-public:
-  unsigned long operator () (const CORBA::String_var& string) const
-  {
-    unsigned long ret = ACE::hash_pjw (string.in ());
-    return ret;
-  }
-};
+// =  Classes to deal with the ACE_Hash_Map_Manager.
 
-template<>
-class TAO_Trading_Serv_Export ACE_Less_Than<CORBA::String_var>
+/**
+ * Key for the Hash Table. The EXT_ID of the
+ * ACE_Hash_Map_Manager.
+ */
+class TAO_Trading_Serv_Export TAO_String_Hash_Key : public CORBA::String_var
 {
 public:
-  int operator () (const CORBA::String_var &lhs,
-                   const CORBA::String_var &rhs) const
-  {
-    return ACE_OS::strcmp (lhs.in (), rhs.in ()) < 0;
-  }
-};
+  // = Initialization and termination methods.
+  TAO_String_Hash_Key (void);
+  // Default constructor.
 
-template<>
-class TAO_Trading_Serv_Export ACE_Equal_To<CORBA::String_var>
-{
-public:
-  int operator () (const CORBA::String_var &lhs,
-                   const CORBA::String_var &rhs) const
-  {
-    return ACE_OS::strcmp (lhs.in (), rhs.in ()) == 0;
-  }
+  TAO_String_Hash_Key (char * name);
+  // Constructor from a const string.
+
+  TAO_String_Hash_Key (const char * name);
+  // Constructor from a const string.
+
+  TAO_String_Hash_Key (const CORBA::String_var &hash_key);
+  // Copy constructor.
+
+  bool operator == (const TAO_String_Hash_Key &hash_key) const;
+  // The operator for hash binding and "find"ing.
+
+  friend bool operator < (const TAO_String_Hash_Key &left,
+                          const TAO_String_Hash_Key &right);
+  // The operator for hash binding and "find"ing.
+
+  u_long hash (void) const;
+  // The function that computes a hash value.
 };
 
-typedef ACE_Hash_Map_Manager_Ex<CORBA::String_var,
+#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
+  template class TAO_Trading_Serv_Export TAO::String_var <char>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
+
+typedef ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key,
                                 int,
-                                ACE_Hash<CORBA::String_var>,
-                                ACE_Equal_To<CORBA::String_var>,
+                                ACE_Hash<TAO_String_Hash_Key>,
+                                ACE_Equal_To<TAO_String_Hash_Key>,
                                 ACE_Null_Mutex>
   TAO_Lookup_Table;
-typedef ACE_Hash_Map_Manager_Ex<CORBA::String_var,
+typedef ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key,
                                 CORBA::TypeCode_ptr,
-                                ACE_Hash<CORBA::String_var>,
-                                ACE_Equal_To<CORBA::String_var>,
+                                ACE_Hash<TAO_String_Hash_Key>,
+                                ACE_Equal_To<TAO_String_Hash_Key>,
                                 ACE_Null_Mutex>
   TAO_Typecode_Table;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index 9401c5366c0..367f7b9a9c5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -52,7 +52,7 @@ insert_offer (const char* type, CosTrading::Offer* offer)
 {
   CosTrading::OfferId return_value = 0;
   ACE_TYPENAME Offer_Database::ENTRY* database_entry = 0;
-  CORBA::String_var service_type (type);
+  TAO_String_Hash_Key service_type (type);
 
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
 
@@ -102,7 +102,7 @@ remove_offer (const char* type, CORBA::ULong id)
 
   int return_value = -1;
   ACE_TYPENAME Offer_Database::ENTRY* db_entry = 0;
-  CORBA::String_var service_type (type);
+  TAO_String_Hash_Key service_type (type);
 
   if (this->offer_db_.find (service_type, db_entry) == 0)
     {
@@ -220,7 +220,7 @@ lookup_offer (const char* type, CORBA::ULong id)
 
   CosTrading::Offer* return_value = 0;
   ACE_TYPENAME Offer_Database::ENTRY* db_entry = 0;
-  CORBA::String_var service_type (type);
+  TAO_String_Hash_Key service_type (type);
 
   if (this->offer_db_.find (service_type, db_entry) == 0)
     {
@@ -325,7 +325,7 @@ TAO_Service_Offer_Iterator (const char* type,
     offer_iter_ (0),
     type_ (type)
 {
-  CORBA::String_var service_type (type);
+  TAO_String_Hash_Key service_type (type);
 
   if (this->stm_.db_lock_.acquire_read () == -1)
     return;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 3087ea49d94..b7ad154a2ef 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -102,10 +102,10 @@ public:
 
   typedef ACE_Hash_Map_Manager_Ex
     <
-    CORBA::String_var,
+    TAO_String_Hash_Key,
     Offer_Map_Entry*,
-    ACE_Hash<CORBA::String_var>,
-    ACE_Equal_To<CORBA::String_var>,
+    ACE_Hash<TAO_String_Hash_Key>,
+    ACE_Equal_To<TAO_String_Hash_Key>,
     ACE_Null_Mutex
     >
     Offer_Database;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 106cc5e3045..f596627fda1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -101,7 +101,7 @@ add_type (const char *name,
                       this->incarnation_);
 
   // Check if the service type already exists.
-  CORBA::String_var type_name (name);
+  TAO_String_Hash_Key type_name (name);
   if (this->type_map_.find (type_name) == 0)
     ACE_THROW_RETURN (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists (),
                       this->incarnation_);
@@ -259,7 +259,7 @@ describe_type (const char * name
   ACE_CHECK_RETURN (0);
 
   // Make sure the type exists.
-  CORBA::String_var type_name (name);
+  TAO_String_Hash_Key type_name (name);
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) == -1)
@@ -304,7 +304,7 @@ fully_describe_type (const char *name
   ACE_CHECK_RETURN (0);
 
   // Make sure the type exists.
-  CORBA::String_var type_name (name);
+  TAO_String_Hash_Key type_name (name);
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) == -1)
@@ -349,7 +349,7 @@ mask_type (const char *name
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
   // Make sure the type exists.
-  CORBA::String_var type_name (name);
+  TAO_String_Hash_Key type_name (name);
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) != -1)
@@ -380,7 +380,7 @@ unmask_type (const char *name
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
   // Make sure the type exists.
-  CORBA::String_var type_name (name);
+  TAO_String_Hash_Key type_name (name);
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) != -1)
@@ -419,7 +419,7 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct
       Service_Type_Map::ENTRY *type_entry = 0;
 
       iterator.next (next_type_name);
-      CORBA::String_var hash_key (const_cast<const char *> (*next_type_name));
+      TAO_String_Hash_Key hash_key (const_cast<const char *> (*next_type_name));
       this->type_map_.find (hash_key,
                             type_entry);
 
@@ -450,7 +450,7 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct
       Service_Type_Map::ENTRY *type_entry = 0;
 
       iterator.next (next_type_name);
-      CORBA::String_var hash_key (const_cast<const char *> (*next_type_name));
+      TAO_String_Hash_Key hash_key (const_cast<const char *> (*next_type_name));
       this->type_map_.find (hash_key,
                             type_entry);
 
@@ -481,7 +481,7 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ
        i--)
     {
       Service_Type_Map::ENTRY *next_type_entry = 0;
-      CORBA::String_var next_type_name (type_struct.super_types[i]);
+      TAO_String_Hash_Key next_type_name (type_struct.super_types[i]);
 
       if (this->type_map_.find (next_type_name, next_type_entry) != -1)
         {
@@ -515,7 +515,7 @@ validate_properties (Prop_Map &prop_map,
         ACE_THROW (CosTrading::IllegalPropertyName (n));
       else
         {
-          CORBA::String_var prop_name (n);
+          TAO_String_Hash_Key prop_name (n);
           CosTradingRepos::ServiceTypeRepository::PropStruct *prop_val =
             const_cast<CosTradingRepos::ServiceTypeRepository::PropStruct *> (&props[i]);
 
@@ -546,7 +546,7 @@ validate_supertypes (Service_Type_Map &super_map,
         ACE_THROW (CosTrading::IllegalServiceType (type));
       else
         {
-          CORBA::String_var hash_type (type);
+          TAO_String_Hash_Key hash_type (type);
           Service_Type_Map::ENTRY *type_entry = 0;
 
           if (this->type_map_.find (hash_type,
@@ -576,7 +576,7 @@ validate_inheritance (Prop_Map &prop_map,
        i++)
     {
       Service_Type_Map::ENTRY *super_type_entry = 0;
-      CORBA::String_var super_type (super_types[i]);
+      TAO_String_Hash_Key super_type (super_types[i]);
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq place_holder;
       CosTradingRepos::ServiceTypeRepository::PropStructSeq super_props;
 
@@ -597,7 +597,7 @@ validate_inheritance (Prop_Map &prop_map,
            j++)
         {
           Prop_Map::ENTRY *existing_prop = 0;
-          CORBA::String_var prop_name (super_props[j].name);
+          TAO_String_Hash_Key prop_name (super_props[j].name);
 
           if (prop_map.bind (prop_name,
                              &super_props[j],
@@ -688,7 +688,7 @@ update_type_map (const char *name,
                                     psbuf,
                                     1);
   */
-  CORBA::String_var type_name (name);
+  TAO_String_Hash_Key type_name (name);
   this->type_map_.bind (type_name, type);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 4f5b959b216..013061face7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -232,24 +232,24 @@ private:
     CORBA::Boolean has_subtypes_;
   };
 
-  typedef ACE_Hash_Map_Manager_Ex <CORBA::String_var,
+  typedef ACE_Hash_Map_Manager_Ex <TAO_String_Hash_Key,
                                   CosTradingRepos::ServiceTypeRepository::PropStruct *,
-                                  ACE_Hash<CORBA::String_var>,
-                                  ACE_Equal_To<CORBA::String_var>,
+                                  ACE_Hash<TAO_String_Hash_Key>,
+                                  ACE_Equal_To<TAO_String_Hash_Key>,
                                   ACE_Null_Mutex>
                                   Prop_Map;
 
-  typedef ACE_Hash_Map_Manager_Ex <CORBA::String_var,
+  typedef ACE_Hash_Map_Manager_Ex <TAO_String_Hash_Key,
                                    Type_Info *,
-                                   ACE_Hash<CORBA::String_var>,
-                                   ACE_Equal_To<CORBA::String_var>,
+                                   ACE_Hash<TAO_String_Hash_Key>,
+                                   ACE_Equal_To<TAO_String_Hash_Key>,
                                    ACE_Null_Mutex>
                                    Service_Type_Map;
 
-  typedef ACE_Hash_Map_Iterator_Ex<CORBA::String_var,
+  typedef ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key,
                                    Type_Info *,
-                                   ACE_Hash<CORBA::String_var>,
-                                   ACE_Equal_To<CORBA::String_var>,
+                                   ACE_Hash<TAO_String_Hash_Key>,
+                                   ACE_Equal_To<TAO_String_Hash_Key>,
                                    ACE_Null_Mutex>
                                    Service_Type_Map_Iterator;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 61b18d38c72..33206bd58fb 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -498,7 +498,7 @@ protected:
 // hard time with it like that when compiling TAO_Service_Offer_Iterator.
 typedef ACE_Hash_Map_Manager_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> TAO_Offer_Map;
 
-typedef ACE_Unbounded_Set<CORBA::String_var> TAO_String_Set;
+typedef ACE_Unbounded_Set<TAO_String_Hash_Key> TAO_String_Set;
 typedef ACE_Unbounded_Queue<char*> TAO_String_Queue;
 
 // = Helpful operators.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index 818934b10bb..89c0ec8e1e5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -16,7 +16,7 @@ TAO_Trader_Constraint_Evaluator (CosTrading::Offer* offer,
   // Create a map of property names to their values.
   for (int i = 0; i < length; i++)
     {
-      CORBA::String_var name = (const char*) offer->properties[i].name;
+      TAO_String_Hash_Key name = (const char*) offer->properties[i].name;
       this->props_.bind (name, i);
     }
 }
@@ -27,7 +27,7 @@ visit_property (TAO_Property_Constraint* literal)
 {
   int return_value = -1, prop_index = 0;
   // Handle case where property is not, in fact, mapped to a value
-  CORBA::String_var prop_name ((const char*) literal->name ());
+  TAO_String_Hash_Key prop_name ((const char*) literal->name ());
 
   if (this->props_.find (prop_name, prop_index) == 0)
     {
@@ -71,7 +71,7 @@ TAO_Trader_Constraint_Validator
       CORBA::TypeCode_ptr corba_type =
         CORBA::TypeCode::_duplicate (prop_seq[i].value_type.in ());
 
-      CORBA::String_var prop_name_str = (const char*) prop_seq[i].name;
+      TAO_String_Hash_Key prop_name_str = (const char*) prop_seq[i].name;
       this->type_map_.bind (prop_name_str, corba_type);
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 60513db6b78..fbc7e07777b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -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 (static_cast<const char*>(type_struct->super_types[j]), type) == 0)
             {
               // Egads, a subtype! This type has the type passed
               // to query in its list of super_types.
@@ -1686,7 +1686,7 @@ add_link (const char *name,
     ACE_THROW (CosTrading::Link::IllegalLinkName (name));
 
   // Ensure this isn't a duplicate link name.
-  CORBA::String_var link_name (name);
+  TAO_String_Hash_Key link_name (name);
   if (this->links_.find (link_name) == 0)
     ACE_THROW (CosTrading::Link::DuplicateLinkName (name));
 
@@ -1736,7 +1736,7 @@ remove_link (const char *name
     ACE_THROW (CosTrading::Link::IllegalLinkName (name));
 
   // Ensure this isn't a duplicate link name.
-  CORBA::String_var link_name (name);
+  TAO_String_Hash_Key link_name (name);
   if (this->links_.find (link_name) == -1)
     ACE_THROW (CosTrading::Link::UnknownLinkName (name));
 
@@ -1758,7 +1758,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
 
   // Ensure this isn't a duplicate link name.
   ACE_TYPENAME Links::ENTRY* link_entry = 0;
-  CORBA::String_var link_name (name);
+  TAO_String_Hash_Key link_name (name);
   if (this->links_.find (link_name, link_entry) == -1)
     ACE_THROW_RETURN (CosTrading::Link::UnknownLinkName (name),
                       0);
@@ -1827,7 +1827,7 @@ modify_link (const char *name,
 
   // Ensure this isn't a duplicate link name.
   ACE_TYPENAME Links::ENTRY* link_entry = 0;
-  CORBA::String_var link_name (name);
+  TAO_String_Hash_Key link_name (name);
   if (this->links_.find (link_name, link_entry) == -1)
     ACE_THROW (CosTrading::Link::UnknownLinkName (name));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 2b1db71d3bc..6c86c7a4840 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -921,10 +921,10 @@ private:
 
   typedef ACE_Hash_Map_Manager_Ex
   <
-  CORBA::String_var,
+  TAO_String_Hash_Key,
   CosTrading::Link::LinkInfo,
-  ACE_Hash<CORBA::String_var>,
-  ACE_Equal_To<CORBA::String_var>,
+  ACE_Hash<TAO_String_Hash_Key>,
+  ACE_Equal_To<TAO_String_Hash_Key>,
   MAP_LOCK_TYPE
   >
   Links;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 4de7d0c8638..afd9e8a8b7b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -7,13 +7,6 @@ ACE_RCSID(Trader, Trader_Utils, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-bool
-operator== (CORBA::String_var const & lhs,
-            CORBA::String_var const & rhs)
-{
-  return (ACE_OS::strcmp (lhs.in (), rhs.in ()) == 0);
-}
-
 TAO_Policy_Creator::TAO_Policy_Creator (int num_policies)
   : policies_ (num_policies),
     num_policies_ (0)
@@ -355,7 +348,7 @@ TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
       if (! TAO_Trader_Base::is_valid_property_name (prop.name))
         ACE_THROW (CosTrading::IllegalPropertyName (prop.name));
 
-      CORBA::String_var prop_name = prop.name.in ();
+      TAO_String_Hash_Key prop_name = prop.name.in ();
       if (this->table_.bind (prop_name, i))
         ACE_THROW (CosTrading::DuplicatePropertyName (prop.name));
     }
@@ -370,7 +363,7 @@ TAO_Property_Evaluator_By_Name(CosTrading::Offer& offer,
 
   for (int i = 0; i < length; i++)
     {
-      CORBA::String_var prop_name = (const char*) this->props_[i].name;
+      TAO_String_Hash_Key prop_name = (const char*) this->props_[i].name;
       this->table_.bind (prop_name, i);
     }
 }
@@ -381,7 +374,7 @@ is_dynamic_property(const char* property_name)
 {
   int predicate = 0;
   int index = 0;
-  CORBA::String_var prop_name (property_name);
+  TAO_String_Hash_Key prop_name (property_name);
 
   // If the property name is in the map, delegate evaluation to our
   // superclass. Otherwise, throw an exception.
@@ -398,7 +391,7 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name
 {
   int index = 0;
   CORBA::Any* prop_value = 0;
-  CORBA::String_var prop_name (property_name);
+  TAO_String_Hash_Key prop_name (property_name);
 
   // If the property name is in the map, delegate evaluation to our
   // superclass. Otherwise, throw an exception.
@@ -417,7 +410,7 @@ CORBA::TypeCode_ptr
 TAO_Property_Evaluator_By_Name::property_type (const char* property_name)
 {
   int index = 0;
-  CORBA::String_var prop_name (property_name);
+  TAO_String_Hash_Key prop_name (property_name);
   CORBA::TypeCode_ptr prop_type = CORBA::TypeCode::_nil();
 
   // If the property name is in the map, delegate evaluation to our
@@ -433,7 +426,7 @@ TAO_Property_Evaluator_By_Name::get_property (const char* property_name)
 {
   int index = 0;
   CosTrading::Property* property = 0;
-  CORBA::String_var prop_name (property_name);
+  TAO_String_Hash_Key prop_name (property_name);
 
   if (this->table_.find (prop_name, index) == 0)
     property = (CosTrading::Property *) &this->props_[index];
@@ -908,7 +901,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;
@@ -1057,7 +1050,7 @@ TAO_Offer_Modifier (const char* type_name,
   // Create a mapping of property names to their types.
   for (i = 0; i < pstructs_length; i++)
     {
-      CORBA::String_var prop_name = pstructs[i].name.in ();
+      TAO_String_Hash_Key prop_name = pstructs[i].name.in ();
       CORBA::TypeCode_ptr type_code =
         CORBA::TypeCode::_duplicate (pstructs[i].value_type.in ());
       this->prop_types_.bind (prop_name, type_code);
@@ -1071,13 +1064,13 @@ TAO_Offer_Modifier (const char* type_name,
       if (pstructs[i].mode ==
           CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY)
         {
-          CORBA::String_var prop_name (pname);
+          TAO_String_Hash_Key prop_name (pname);
           this->mandatory_.insert (prop_name);
         }
       else if (pstructs[i].mode ==
                CosTradingRepos::ServiceTypeRepository::PROP_READONLY)
         {
-          CORBA::String_var prop_name (pname);
+          TAO_String_Hash_Key prop_name (pname);
           this->readonly_.insert (prop_name);
         }
     }
@@ -1085,7 +1078,7 @@ TAO_Offer_Modifier (const char* type_name,
   // Insert the indices of the offer properties into a map.
   for (i = 0; i < props_length; i++)
     {
-      CORBA::String_var prop_name =
+      TAO_String_Hash_Key prop_name =
         static_cast<const char*> (prop_seq[i].name);
       this->props_.bind (prop_name, &prop_seq[i]);
     }
@@ -1123,7 +1116,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes
         ACE_THROW (CosTrading::IllegalPropertyName (dname));
       else
         {
-          CORBA::String_var prop_name (dname);
+          TAO_String_Hash_Key prop_name (dname);
           if (this->mandatory_.find (prop_name) == 0)
             ACE_THROW (CosTrading::Register::MandatoryProperty (this->type_, dname));
           else if (delete_me.insert (prop_name) == 1)
@@ -1136,7 +1129,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes
   // Delete those properties from the offer.
   for (i = 0; i < length; i++)
     {
-      CORBA::String_var prop_name =
+      TAO_String_Hash_Key prop_name =
         static_cast<const char *> (deletes[i]);
       this->props_.unbind (prop_name);
     }
@@ -1163,7 +1156,7 @@ merge_properties (const CosTrading::PropertySeq& modifies
       const char* mname = modifies[i].name;
       if (TAO_Trader_Base::is_valid_property_name (mname))
         {
-          CORBA::String_var prop_name (mname);
+          TAO_String_Hash_Key prop_name (mname);
           if (this->readonly_.find (prop_name) == 0)
             {
               // Can't assign a dynamic property to a property with
@@ -1220,7 +1213,7 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
   for (i = 0; i < merge_length; i++)
     {
       Property_Table::ENTRY* entry = 0;
-      CORBA::String_var prop_name = modifies[i].name.in ();
+      TAO_String_Hash_Key prop_name = modifies[i].name.in ();
 
       CosTrading::Property* prop =
         const_cast<CosTrading::Property*> (&modifies[i]);
@@ -1244,7 +1237,7 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
     {
       CosTrading::Property* prop_value = 0;
       const char* name = this->offer_->properties[i].name;
-      CORBA::String_var prop_name (name);
+      TAO_String_Hash_Key prop_name (name);
       if (this->props_.unbind (prop_name, prop_value) == 0)
         prop_seq[num_modified++] = *prop_value;
     }
@@ -1253,7 +1246,7 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
     {
       CosTrading::Property* prop_value = 0;
       const char* name = modifies[i].name;
-      CORBA::String_var prop_name (name);
+      TAO_String_Hash_Key prop_name (name);
       if (this->props_.unbind (prop_name, prop_value) == 0)
         prop_seq[num_modified++] = *prop_value;
     }
@@ -1289,7 +1282,7 @@ TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies
 
   if (exact_type_match == 1)
     {
-      CORBA::String_var exact_match
+      TAO_String_Hash_Key exact_match
         (TAO_Policies::POLICY_NAMES[TAO_Policies::EXACT_TYPE_MATCH]);
       this->limits_.insert (exact_match);
     }
@@ -1310,7 +1303,7 @@ configure_type (CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct)
       if (mode == CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY_READONLY ||
           mode == CosTradingRepos::ServiceTypeRepository::PROP_READONLY)
         {
-          CORBA::String_var prop_name ((const char*) prop_seq[i].name);
+          TAO_String_Hash_Key prop_name ((const char*) prop_seq[i].name);
           this->not_mod_props_.insert (prop_name);
         }
     }
@@ -1319,9 +1312,9 @@ configure_type (CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct)
 CORBA::Boolean
 TAO_Offer_Filter::ok_to_consider (CosTrading::Offer* offer)
 {
-  CORBA::String_var use_mods =
+  TAO_String_Hash_Key use_mods =
     TAO_Policies::POLICY_NAMES[TAO_Policies::USE_MODIFIABLE_PROPERTIES];
-  CORBA::String_var use_dyns =
+  TAO_String_Hash_Key use_dyns =
     TAO_Policies::POLICY_NAMES[TAO_Policies::USE_DYNAMIC_PROPERTIES];
   CORBA::Boolean return_value = 1;
   TAO_Property_Evaluator prop_eval (*offer);
@@ -1340,7 +1333,7 @@ TAO_Offer_Filter::ok_to_consider (CosTrading::Offer* offer)
             {
               // Determine if this property name is found in the set
               // of modifiable properties for the type being considered.
-              CORBA::String_var prop_name ((const char*) offer->properties[i].name);
+              TAO_String_Hash_Key prop_name ((const char*) offer->properties[i].name);
               if (this->not_mod_props_.find (prop_name) == -1)
                 {
                   this->limits_.insert (use_mods);
@@ -1370,7 +1363,7 @@ TAO_Offer_Filter::ok_to_consider (CosTrading::Offer* offer)
       this->search_card_--;
       if (this->search_card_ == 0)
         {
-          CORBA::String_var search_card =
+          TAO_String_Hash_Key search_card =
             TAO_Policies::POLICY_NAMES[TAO_Policies::SEARCH_CARD];
           this->limits_.insert (search_card);
         }
@@ -1393,14 +1386,14 @@ TAO_Offer_Filter::matched_offer (void)
 
   if (this->match_card_ == 0)
     {
-      CORBA::String_var match_card =
+      TAO_String_Hash_Key match_card =
         TAO_Policies::POLICY_NAMES[TAO_Policies::MATCH_CARD];
       this->limits_.insert (match_card);
     }
 
   if (this->return_card_ == 0)
     {
-      CORBA::String_var return_card =
+      TAO_String_Hash_Key return_card =
         TAO_Policies::POLICY_NAMES[TAO_Policies::MATCH_CARD];
       this->limits_.insert (return_card);
     }
@@ -1430,7 +1423,7 @@ TAO_Offer_Filter::limits_applied (void)
        ! p_iter.done ();
        p_iter.advance ())
     {
-      CORBA::String_var* policy_name_ptr = 0;
+      TAO_String_Hash_Key* policy_name_ptr = 0;
       p_iter.next (policy_name_ptr);
       temp[i++] = CORBA::string_dup (policy_name_ptr->in ());
     }
@@ -1458,7 +1451,7 @@ TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
           // Check for errors or duplicates
           if (TAO_Trader_Base::is_valid_property_name (pname))
             {
-              CORBA::String_var prop_name (pname);
+              TAO_String_Hash_Key prop_name (pname);
               if (this->props_.insert (prop_name) == 1)
                 ACE_THROW (CosTrading::DuplicatePropertyName (pname));
             }
@@ -1504,7 +1497,7 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source,
           else
             {
               const char* p_name = s_props[i].name;
-              CORBA::String_var prop_name (p_name);
+              TAO_String_Hash_Key prop_name (p_name);
 
               // Save those property that match.
               if (this->props_.find (prop_name) == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 70b5717dde7..a79c30f8136 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -621,10 +621,10 @@ private:
   TAO_Offer_Modifier (const TAO_Offer_Modifier&);
   TAO_Offer_Modifier& operator= (const TAO_Offer_Modifier&);
 
-  typedef ACE_Hash_Map_Manager_Ex <CORBA::String_var,
+  typedef ACE_Hash_Map_Manager_Ex <TAO_String_Hash_Key,
                                    CosTrading::Property *,
-                                   ACE_Hash<CORBA::String_var>,
-                                   ACE_Equal_To<CORBA::String_var>,
+                                   ACE_Hash<TAO_String_Hash_Key>,
+                                   ACE_Equal_To<TAO_String_Hash_Key>,
                                    ACE_Null_Mutex>
           Property_Table;
 
@@ -639,8 +639,7 @@ private:
 
   /// The set of readonly and mandatory property names in the offer's
   /// type.
-  TAO_String_Set readonly_;
-  TAO_String_Set mandatory_;
+  TAO_String_Set readonly_, mandatory_;
 
   /// A reference to the offer undergoing change.
   CosTrading::Offer* offer_;
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/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/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..993016d8b47 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;
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 8720b8bb599..81b2d8a34cc 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;
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/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index a3caafe3b54..ab1160e9c6b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -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;
 
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/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 420b6d15b95..f3612f5f197 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -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;
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/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index 5e723b3cca5..f9e1d7b1974 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;
 
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/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
index 8c36cbd0349..2186d839335 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
@@ -62,7 +62,7 @@ private:
   int period_in_usecs_;
 };
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   RT_Class rt_class;
 
@@ -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..677d68719d5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h
@@ -12,13 +12,14 @@
 #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;
+//class ACE_TArg_Shifter<char>;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 /// Parse the command-line client_options for the tests.
@@ -49,11 +50,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/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/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/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/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index bcc4f71458d..9aa2db8b1c0 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 573fdb12f34..b1a6c0ee29a 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 34c878c4584..f5d4bff2bb9 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/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/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/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/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index ee6b23f62df..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"));
@@ -282,8 +281,8 @@ Client::run (void)
                                         flow_protocol_str,
                                         this->protocol_,
                                         &addr);
-      flow_spec.length (1);
       flow_spec [0] = entry.entry_to_string ();
+      flow_spec.length (1);
       ACE_DEBUG ((LM_DEBUG, "(%N,%l) Flowspec: %s\n", entry.entry_to_string() ));
 
       AVStreams::MMDevice_var client_mmdevice
@@ -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/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/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/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index d3519e0114f..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",
@@ -265,8 +265,8 @@ Client::init (int argc,
   entry.set_peer_addr (peer_addr);
 
   AVStreams::flowSpec flow_spec (1);
-  flow_spec.length (1);
   flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
+  flow_spec.length (1);
 
   AVStreams::MMDevice_var client_mmdevice =
     this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -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/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/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/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/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 6a3c7f89e53..a573a085978 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/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_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index 46148e21dee..2326f722c53 100755
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -2,6 +2,7 @@
 // $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"
@@ -11,7 +12,7 @@ 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 +74,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/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 74d54ebda92..215f6b349be 100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/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 "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
@@ -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/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 0d6a828940b..629830580d0 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.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 @@ 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/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/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..642435bb061 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 =
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_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/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 5441a632e0e..c61ffba80fc 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -14,6 +14,7 @@
 #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 +69,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 +86,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 +402,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/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_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_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_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_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/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/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/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/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/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/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/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_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/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/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/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 2c77a1e7750..728d1e885ac 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_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/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/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 58fd3cc610b..6057d7b5a50 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
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/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/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/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..c4a9c06f609 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)
@@ -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..e44e2b4a128 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)
@@ -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/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/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 c87f7c6ecb4..960ceea80d7 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/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/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/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 f6dd2238e12..7952549b52f 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 93fa6ae910a..b0652fe8484 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)
@@ -1890,4 +1889,3 @@ IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd
 
   return 0;
 }
-
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index ef26b0b054d..a1afbad818e 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 (), static_cast<const char*>(members[i])) == 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 (static_cast<const char*>(fellows[i]), static_cast<const char*>(members[i])) == 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/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/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/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/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..a82b7249d71 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -3,6 +3,7 @@
 #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 +35,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 +542,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/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/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..f256f95c017 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"
 
@@ -219,19 +220,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/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index f8bb9dd472a..60461e451dc 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"
 
@@ -379,19 +380,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..32918c34390 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"
@@ -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;
 
@@ -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/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..07e30148612 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -6,6 +6,7 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "tao/ORB_Core.h"
 
@@ -82,7 +83,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 +174,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 +206,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/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/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index f107177b9d5..50e50144748 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);
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/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/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/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/PluggableTopology/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
index ea040206afc..3d0e525a0e0 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
@@ -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/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..0d33874b2e2 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_));
@@ -1874,13 +1875,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/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 1bd46703440..3420d2a1be4 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_));
@@ -1286,7 +1287,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 +1343,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/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..5c611a89efe 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -72,15 +72,15 @@ Notify_Sequence_Push_Consumer::push_structured_events (
   this->count_ += events.length();
 
   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);
+    }
 }
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..642b84cdb30 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -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: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..1f1fc1236f4 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -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:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -204,14 +205,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 +236,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/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index b39323d5890..36cca406978 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -80,8 +80,8 @@ Notify_Sequence_Push_Consumer::push_structured_events(
     {
       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_)
     {
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..61abb9946ef 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"
@@ -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:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:c:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -114,14 +115,20 @@ 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;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    //int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
+
     ACE_ASSERT(status == 0);
     ACE_UNUSED_ARG(status);
 
@@ -163,6 +170,7 @@ int main (int argc, char* argv[])
       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());
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..e6020243c2d 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
@@ -84,7 +85,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)
@@ -205,15 +206,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 +239,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/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..1c6720afa0c 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);
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..c7438cb868d 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);
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/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index 463a3fc9b8d..896da12b065 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:
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..b52176dbd22 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -91,10 +91,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..11f24ede767 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -11,6 +11,8 @@ ACE_RCSID(lib, TAO_Application_Command, "$Id$")
 #include "Driver_Base.h"
 #include "Priority_Mapping.h"
 
+#include "ace/Arg_Shifter.h"
+
 TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command (void)
   : dump_samples_ (0)
 {
@@ -20,20 +22,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 ())
     {
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..91c9e0c2c33 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -21,6 +21,7 @@
 
 #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
@@ -47,16 +48,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..2b7e3020db7 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 ())
     {
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..6fb6f16accf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -186,13 +186,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 +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("-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 +210,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 +235,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..76842ecce19 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 ())
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 35a2baa4bb0..368b1963b0c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -44,14 +44,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..4832672fe07 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 ())
     {
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/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/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 2685d1bfd5b..847cfaba864 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -21,9 +21,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 +52,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..7bbc3c3588c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -21,8 +21,10 @@
 
 #include "orbsvcs/CosNotificationC.h"
 
+#include "ace/Arg_Shifter.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
+//class ACE_TArg_Shifter< char >;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -41,10 +43,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..d9a3c8185da 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -23,8 +23,10 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/SString.h"
 
+#include "ace/Arg_Shifter.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
+//template <typename> ACE_TArg_Shifter;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -46,7 +48,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..e524f2537ad 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -3,6 +3,7 @@
 #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"
@@ -41,13 +42,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 +258,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..8858c155029 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -22,9 +22,11 @@
 #include "Task_Stats.h"
 #include "Notify_StructuredPushConsumer.h"
 
+#include "ace/Arg_Shifter.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
-class ACE_Arg_Shifter;
+//class ACE_TArg_Shifter< char >;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Tests_Task_Callback;
@@ -48,10 +50,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..12871ea3eb0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -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 ())
     {
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..906197cf38f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -25,9 +25,11 @@
 #include "ace/Task.h"
 #include "ace/Barrier.h"
 
+#include "ace/Arg_Shifter.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
-class ACE_Arg_Shifter;
+//class ACE_TArg_Shifter< char >;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Tests_Task_Callback;
@@ -51,7 +53,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 +62,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..f771ee167ba 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -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 ())
     {
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..c2a47b86e34 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 ())
     {
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/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..76033fa9aed 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)
@@ -184,15 +185,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 +218,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/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 38d260bc9ba..9190355728b 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;
 
@@ -106,7 +107,7 @@ RedGreen_Test::~RedGreen_Test ()
 
 void
 RedGreen_Test::init (int argc,
-                     char *argv []
+                     char *argv[]
                      ACE_ENV_ARG_DECL)
 {
   this->init_ORB (argc,
@@ -169,11 +170,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/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/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/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index fb15517f37e..fa6d82bf742 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 =
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/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/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/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/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/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
index 0bdb4fe461c..d1480fd47d1 100755
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
@@ -1,3 +1,4 @@
+ 
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
diff --git a/TAO/orbsvcs/tests/Security/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/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/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 13f5084d1f6..201d04d92df 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -99,7 +99,7 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
           CORBA::ULong length = link_name_seq2->length ();
           for (i = 0; i < length; i++)
             {
-              if (ACE_OS::strcmp (link_name_seq2[i], "Bootstrap") != 0)
+              if (ACE_OS::strcmp (static_cast<const char*>(link_name_seq2[i]), "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/TTest.idl b/TAO/orbsvcs/tests/Trading/TTest.idl
index d518aa1b58f..756f057e266 100644
--- a/TAO/orbsvcs/tests/Trading/TTest.idl
+++ b/TAO/orbsvcs/tests/Trading/TTest.idl
@@ -7,9 +7,9 @@ module TAO_Trader_Test
 
 interface Remote_Output
 {
+  void confirm ();
   // Ensure that the object reference returned from the query actually
   // works.
-  void confirm ();
 };
 
 interface Plotter : Remote_Output
@@ -29,14 +29,15 @@ interface PostScript_Printer : Remote_Output
 };
 
 // Sequences used to test sequence type equivalence in the trader.
-typedef sequence<short> ShortSeq;
-typedef sequence<unsigned short> UShortSeq;
-typedef sequence<long> LongSeq;
-typedef sequence<unsigned long> ULongSeq;
-typedef sequence<boolean> BooleanSeq;
-typedef sequence<float> FloatSeq;
-typedef sequence<double> DoubleSeq;
-typedef sequence<string> StringSeq;
+typedef CORBA::ShortSeq ShortSeq;
+typedef CORBA::UShortSeq UShortSeq;
+typedef CORBA::LongSeq LongSeq;
+typedef CORBA::ULongSeq ULongSeq;
+typedef CORBA::BooleanSeq BooleanSeq;
+typedef CORBA::FloatSeq FloatSeq;
+typedef CORBA::DoubleSeq DoubleSeq;
+typedef CORBA::StringSeq StringSeq;
+
 };
 
 
diff --git a/TAO/orbsvcs/tests/Trading/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/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/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/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/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index a5db0ce0523..05185538e7d 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -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/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
index 16fad32ff86..f00701de174 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -19,7 +19,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..896f08a847c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -25,7 +25,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/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..334d9a5e43d 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -840,7 +840,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..e134d0daa3c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -370,7 +370,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/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/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/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index 7bc5b0b292f..6ea7ad4547c 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -24,7 +24,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 +62,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/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/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/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index e7bd528901c..abf63e338ce 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -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/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/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/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/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/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.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/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/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/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/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/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/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/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/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/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/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/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/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
index 624c7ddfb6b..fe091c21188 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
@@ -30,7 +30,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)
@@ -391,7 +391,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)
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/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/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index b93bbd8ffbd..42218309dbc 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -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/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/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/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/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/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 4be1b0d7920..838013e48dc 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -164,7 +164,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 +253,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 +392,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 +433,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 +562,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 +603,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 +764,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 +858,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 +880,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 (
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index 57bf9f564dc..588a45691e3 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -357,7 +357,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;
     }
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index b07e186305c..c7a98213742 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -362,7 +362,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,
@@ -433,7 +433,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 ();
diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.h b/TAO/tao/AnyTypeCode/PI_ForwardA.h
index 7286439cc39..f99092e4ec1 100644
--- a/TAO/tao/AnyTypeCode/PI_ForwardA.h
+++ b/TAO/tao/AnyTypeCode/PI_ForwardA.h
@@ -121,9 +121,8 @@ namespace PortableInterceptor
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
 
-  typedef char * AdapterManagerId;
-  typedef CORBA::String_var AdapterManagerId_var;
-  typedef CORBA::String_out AdapterManagerId_out;
+  typedef CORBA::Long AdapterManagerId;
+  typedef CORBA::Long_out AdapterManagerId_out;
 
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp
index 81433f202fb..a508b7c8f89 100644
--- a/TAO/tao/AnyTypeCode/skip.cpp
+++ b/TAO/tao/AnyTypeCode/skip.cpp
@@ -374,7 +374,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
   CORBA::Char char_v = CORBA::Char();
   CORBA::WChar wchar_v = CORBA::WChar();
   CORBA::Boolean boolean_v = false;
-
+  
   switch (kind)
     {
     case CORBA::tk_short:
@@ -957,9 +957,9 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
     {
       this->nested_processing_ = 1;
 
-      CORBA::Long value_tag;
+      CORBA::ULong value_tag;
 
-      if (!stream->read_long (value_tag))
+      if (!stream->read_ulong (value_tag))
         {
           return TAO::TRAVERSE_STOP;
         }
diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp
index e5ee355a042..9317a128679 100644
--- a/TAO/tao/Blocked_Connect_Strategy.cpp
+++ b/TAO/tao/Blocked_Connect_Strategy.cpp
@@ -38,13 +38,21 @@ TAO_Blocked_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
     }
 }
 
+
 int
-TAO_Blocked_Connect_Strategy::wait_i (TAO_LF_Event *,
-                                      TAO_Transport *,
+TAO_Blocked_Connect_Strategy::wait (TAO_Connection_Handler *,
                                     ACE_Time_Value * )
 {
   // We cannot wait for connection completion
   return -1;
 }
 
+int
+TAO_Blocked_Connect_Strategy::wait (TAO_Transport *,
+                                    ACE_Time_Value *)
+{
+  // We cannot wait for connection completion
+  return -1;
+}
+
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h
index 9eea4edaebc..9c547ebfc23 100644
--- a/TAO/tao/Blocked_Connect_Strategy.h
+++ b/TAO/tao/Blocked_Connect_Strategy.h
@@ -45,11 +45,11 @@ public:
   virtual void synch_options (ACE_Time_Value *val,
                               ACE_Synch_Options &opt);
 
-protected:
-  virtual int wait_i (TAO_LF_Event *ev,
-                      TAO_Transport *t,
+  virtual int wait (TAO_Connection_Handler *ch,
                      ACE_Time_Value *val);
 
+  virtual int wait (TAO_Transport *t,
+                     ACE_Time_Value *val);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Bounded_Sequence_CDR_T.h b/TAO/tao/Bounded_Sequence_CDR_T.h
index c0cbbdb5a01..7213b9547f6 100644
--- a/TAO/tao/Bounded_Sequence_CDR_T.h
+++ b/TAO/tao/Bounded_Sequence_CDR_T.h
@@ -12,7 +12,6 @@
  */
 
 #include "tao/orbconf.h"
-#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -329,9 +328,7 @@ namespace TAO {
 namespace TAO {
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Short, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
-    ::CORBA::ULong const length = source.length ();
+    const ::CORBA::ULong length = source.length ();
     if (!(strm << length)) {
       return false;
     }
@@ -340,9 +337,7 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Long, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
-    ::CORBA::ULong const length = source.length ();
+    const ::CORBA::ULong length = source.length ();
     if (!(strm << length)) {
       return false;
     }
@@ -351,8 +346,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::ULong, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -362,8 +355,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::UShort, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -373,8 +364,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Octet, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -384,8 +373,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Char, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -396,8 +383,6 @@ namespace TAO {
 # if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::WChar, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -408,8 +393,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Float, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -419,8 +402,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Double, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -430,8 +411,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::ULongLong, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -441,8 +420,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::LongDouble, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -452,8 +429,6 @@ namespace TAO {
 
   template <typename stream, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <CORBA::Boolean, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -463,8 +438,6 @@ namespace TAO {
 
   template <typename stream, typename value_t, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_value_sequence <value_t, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -479,8 +452,6 @@ namespace TAO {
 
   template <typename stream, typename charT, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::details::bounded_basic_string_sequence <charT, MAX> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -496,8 +467,6 @@ namespace TAO {
   template <typename stream, typename object_t, typename object_t_var, CORBA::ULong MAX>
   bool marshal_sequence(stream & strm, const TAO::bounded_object_reference_sequence<object_t, object_t_var, MAX> & source) {
     typedef typename TAO::bounded_object_reference_sequence<object_t, object_t_var, MAX>::object_type object_type;
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index d3b8fbb84a7..2dda9784489 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -180,7 +180,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 +212,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 ());
@@ -233,8 +233,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
       const char * str = full_ep.c_str();
       endpoints[i].profile_->parse_string (str ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
-      int share = orb->orb_core()->orb_params()->shared_profile();
-      if (mprofile.give_profile(endpoints[i].profile_, share) != -1)
+      if (mprofile.give_profile(endpoints[i].profile_) != -1)
         endpoints[i].profile_ = 0;
       else
         {
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 72b8028cd94..7fa1a03f257 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -19,14 +19,14 @@ TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void)
 
 TAO_Root_POA *
 TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
-                                                     PortableServer::POAManager_ptr poa_manager,
+                                                 TAO_POA_Manager &poa_manager,
                                                  const TAO_POA_Policy_Set &policies,
                                                  ACE_Lock &lock,
                                                  TAO_SYNCH_MUTEX &thread_lock,
                                                  TAO_ORB_Core &orb_core,
                                                  TAO_Object_Adapter *object_adapter
                                                  ACE_ENV_ARG_DECL)
-    {
+{
   TAO_CSD_POA *poa = 0;
 
   ACE_NEW_THROW_EX (poa,
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
index 1d041331e99..ed78621d075 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
@@ -38,7 +38,7 @@ public:
 
   /// Factory method for creating new CSD Root POA.
   virtual TAO_Root_POA *create_Root_POA (const ACE_CString &name,
-                                         PortableServer::POAManager_ptr poa_manager,
+                                         TAO_POA_Manager &poa_manager,
                                          const TAO_POA_Policy_Set &policies,
                                          ACE_Lock &lock,
                                          TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index f3cc8e605f5..cd63c5d7375 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Implementation skeleton constructor
 TAO_CSD_POA::TAO_CSD_POA (const String &name,
-                          PortableServer::POAManager_ptr poa_manager,
+                   TAO_POA_Manager &poa_manager,
                    const TAO_POA_Policy_Set &policies,
                    TAO_Root_POA *parent,
                    ACE_Lock &lock,
@@ -66,7 +66,7 @@ void TAO_CSD_POA::set_csd_strategy (
 
 TAO_Root_POA *
 TAO_CSD_POA::new_POA (const String &name,
-                      PortableServer::POAManager_ptr poa_manager,
+                      TAO_POA_Manager &poa_manager,
                       const TAO_POA_Policy_Set &policies,
                       TAO_Root_POA *parent,
                       ACE_Lock &lock,
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
index bcbf2e0495f..7bf2c338e0d 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ b/TAO/tao/CSD_Framework/CSD_POA.h
@@ -40,7 +40,7 @@ class TAO_CSD_FW_Export TAO_CSD_POA
 public:
   //Constructor 
   TAO_CSD_POA (const String &name,
-               PortableServer::POAManager_ptr poa_manager,
+              TAO_POA_Manager &poa_manager,
               const TAO_POA_Policy_Set &policies,
               TAO_Root_POA *parent,
               ACE_Lock &lock,
@@ -80,7 +80,7 @@ public:
 
   ///Method for creating new CSD POA.
   TAO_Root_POA * new_POA (const String &name,
-                          PortableServer::POAManager_ptr poa_manager,
+                          TAO_POA_Manager &poa_manager,
                           const TAO_POA_Policy_Set &policies,
                           TAO_Root_POA *parent,
                           ACE_Lock &lock,
diff --git a/TAO/tao/Client_Strategy_Factory.cpp b/TAO/tao/Client_Strategy_Factory.cpp
index f8cfb870b74..f459955e2bf 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -40,12 +40,6 @@ TAO_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *)
   return 0;
 }
 
-TAO_Client_Strategy_Factory::Connect_Strategy
-TAO_Client_Strategy_Factory::connect_strategy (void) const
-{
-  return TAO_BLOCKED_CONNECT;
-}
-
 TAO_Connect_Strategy *
 TAO_Client_Strategy_Factory::create_connect_strategy (TAO_ORB_Core *)
 {
diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h
index 407e580b509..3c63290ad4a 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -71,15 +71,6 @@ public:
   /// Create the correct client <asynch_connect> strategy.
   virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *);
 
-  enum Connect_Strategy
-  {
-    TAO_BLOCKED_CONNECT,
-    TAO_REACTIVE_CONNECT,
-    TAO_LEADER_FOLLOWER_CONNECT
-  };
-  /// Return the selected connection strategy option.
-  virtual Connect_Strategy connect_strategy (void) const;
-
   /// Does the client allow any form of callback?
   virtual int allow_callback (void);
 
diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp
index 89e687db0d4..1ad750f966e 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.cpp
+++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp
@@ -57,10 +57,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);
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 25f8d360848..ecf3fc73955 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -418,7 +418,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)
         {
diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp
index 9a79bece571..2299f775d46 100644
--- a/TAO/tao/Connect_Strategy.cpp
+++ b/TAO/tao/Connect_Strategy.cpp
@@ -1,7 +1,4 @@
 #include "tao/Connect_Strategy.h"
-#include "tao/Transport.h"
-#include "tao/Connection_Handler.h"
-#include "tao/LF_Multi_Event.h"
 
 ACE_RCSID (tao,
            Connect_Strategy,
@@ -19,41 +16,4 @@ TAO_Connect_Strategy::~TAO_Connect_Strategy (void)
 {
 }
 
-int
-TAO_Connect_Strategy::wait (TAO_Connection_Handler *ch,
-                            ACE_Time_Value *max_wait_time)
-{
-  if (ch == 0)
-    return -1;
-
-  return this->wait_i (ch, ch->transport (),max_wait_time);
-}
-
-int
-TAO_Connect_Strategy::wait (TAO_Transport *t,
-                            ACE_Time_Value *max_wait_time)
-{
-  // Basically the connection was EINPROGRESS, but before we could
-  // wait for it some other thread detected a failure and cleaned up
-  // the connection handler.
-  if (t == 0)
-    return -1;
-
-  return this->wait_i (t->connection_handler(),t,max_wait_time);
-}
-
-int
-TAO_Connect_Strategy::wait (TAO_LF_Multi_Event *mev,
-                            ACE_Time_Value *max_wait_time)
-{
-  return this->wait_i (mev, mev->base_transport(), max_wait_time);
-}
-
-int
-TAO_Connect_Strategy::poll (TAO_LF_Multi_Event *mev)
-{
-  ACE_Time_Value zero(ACE_Time_Value::zero);
-  return this->wait_i (mev, mev->base_transport(), &zero);
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h
index 4783039326a..1189a6cd171 100644
--- a/TAO/tao/Connect_Strategy.h
+++ b/TAO/tao/Connect_Strategy.h
@@ -34,8 +34,6 @@ class TAO_ORB_Core;
 class TAO_Connector;
 class TAO_Connection_Handler;
 class TAO_Transport;
-class TAO_LF_Multi_Event;
-class TAO_LF_Event;
 
 /**
  * @class TAO_Connect_Strategy
@@ -74,23 +72,13 @@ public:
   /* If the connection establishment fails the state within the
    * connection handler is set appropriately.
    */
-  int wait (TAO_Connection_Handler *ch, ACE_Time_Value *val);
+  virtual int wait (TAO_Connection_Handler *ch,
+                    ACE_Time_Value *val) = 0;
 
-  int wait (TAO_Transport *t, ACE_Time_Value *val);
-
-  /// Wait for one of many connections to complete. Returns when one
-  /// succeeds or all fail.
-  int wait (TAO_LF_Multi_Event *ev, ACE_Time_Value *val);
-
-  /// Do a quick check to see if any connections are complete. This
-  /// does the same as the wait with an explicit time value of 0.
-  int poll (TAO_LF_Multi_Event *ev);
+  virtual int wait (TAO_Transport *t,
+                    ACE_Time_Value *val) = 0;
 
 protected:
-  /// This is the method that does all the real interesting stuff.
-  virtual int wait_i (TAO_LF_Event *ev,
-                      TAO_Transport *t,
-                      ACE_Time_Value *val) = 0;
 
   /// Cached copy of the ORB core pointer
   TAO_ORB_Core * const orb_core_;
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 16db7f30129..06ae5f23460 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -81,7 +81,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);
            }
 
diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h
index 926b52958c1..b63130c2e56 100644
--- a/TAO/tao/DLL_Parser.h
+++ b/TAO/tao/DLL_Parser.h
@@ -52,7 +52,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);
  *
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index 796cc529bd3..e414c793964 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -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...
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index b4f5f05dfb5..c2f82a05cca 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -731,7 +731,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 ());
         }
diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp
index 6077a1b6b94..75f61995341 100644
--- a/TAO/tao/Endpoint.cpp
+++ b/TAO/tao/Endpoint.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/Endpoint.h"
-#include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Endpoint.i"
@@ -17,14 +16,6 @@ TAO_Endpoint::~TAO_Endpoint (void)
 {
 }
 
-TAO_Endpoint *
-TAO_Endpoint::next_filtered (TAO_ORB_Core *, TAO_Endpoint *root)
-{
-  if (root == 0)
-    return this;
-  return this->next();
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 //@@ TAO_ENDPOINT_SPL_METHODS_ADD_HOOK
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
index d89582e973e..b762595ef58 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -29,8 +29,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class TAO_ORB_Core;
-
 /*
  * Includes and forward decls for specializing TAO's
  * endpoint implementation.
@@ -81,29 +79,12 @@ public:
    */
   virtual CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint) = 0;
 
-  /// Endpoints can be linked in a list.
+  /// Endpoints can be stringed in a list.
   /**
    * @return The next endpoint in the list, if any.
    */
   virtual TAO_Endpoint *next (void) = 0;
 
-  /**
-   * Return the next endpoint in the list, but use protocol-specific
-   * filtering to constrain the value. The orb core is needed to supply
-   * any sort of filter arguments, and the root endpoint is needed in case
-   * the algorithm needs to rewind. If the supplied root is 0, then this
-   * is assumed to be the candidate next endpoint.
-   *
-   * To use this, the caller starts off the change with root == 0. This
-   * is a bit of a violation in logic, a more correct implementation would
-   * accept this == 0 and a non-null root.
-   * To do iteration using next_filtered, do:
-   *   for (TAO_Endpoint *ep = root_endpoint->next_filtered (orb_core, 0);
-   *        ep != 0;
-   *        ep = ep->next_filtered(orb_core, root_endpoint)) { }
-   */
-  virtual TAO_Endpoint *next_filtered (TAO_ORB_Core *, TAO_Endpoint *root);
-
   /// Return a string representation for the address.
   /**
    * The purpose of this method is to provide a general interface to
diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc
deleted file mode 100644
index 62d0c80c7e4..00000000000
--- a/TAO/tao/EndpointPolicy.mpc
+++ /dev/null
@@ -1,35 +0,0 @@
-//$Id$
-project : taolib, core, portableserver, pi {
-  sharedname   = TAO_EndpointPolicy
-  dynamicflags = TAO_ENDPOINTPOLICY_BUILD_DLL
-
-  Source_Files {
-    EndpointPolicy
-  }
-
-  Header_Files {
-    EndpointPolicy
-  }
-
-  Inline_Files {
-    EndpointPolicy
-  }
-
-  Template_Files {
-    EndpointPolicy
-  }
-
-  Resource_Files {
-    EndpointPolicy
-  }
-
-  PIDL_Files {
-  }
-
-  IDL_Files {
-  }
-
-  Pkgconfig_Files {
-    EndpointPolicy/TAO_EndpointPolicy.pc.in
-  } 
-}
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
deleted file mode 100644
index 534ac8fbd77..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// @(#) $Id$
-
-#include "tao/EndpointPolicy/EndpointPolicy.h"
-#include "tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h"
-#include "tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/ORBInitializer_Registry.h"
-
-
-ACE_RCSID (EndpointPolicy, EndpointPolicy, "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-int
-TAO_EndpointPolicy_Initializer::init (void)
-{
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_Endpoint_Acceptor_Filter_Factory);
-
-  PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
-  PortableInterceptor::ORBInitializer::_nil ();
-  PortableInterceptor::ORBInitializer_var orb_initializer;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      /// Register the EndpointPolicy ORBInitializer.
-      ACE_NEW_THROW_EX (temp_orb_initializer,
-                        TAO_EndpointPolicy_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,
-                               "Caught exception:");
-        }
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  ACE_Service_Config::process_directive
-    (ace_svc_desc_TAO_Endpoint_Acceptor_Filter_Factory,1); // force replacement
-
-
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.h b/TAO/tao/EndpointPolicy/EndpointPolicy.h
deleted file mode 100644
index 14c9bd7f1a0..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   EndpointPolicy.h
- *
- *  $Id$
- *
- *  @author  Yan Dai <dai_y@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_ENDPOINTPOLICY_H
-#define TAO_ENDPOINTPOLICY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_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_EndpointPolicy_Export TAO_EndpointPolicy_Initializer
-{
-public:
-  /// Used to force the initialization of the ORB code.
-  static int init (void);
-};
-
-static int
-TAO_Requires_EndpointPolicy_Initializer = TAO_EndpointPolicy_Initializer::init ();
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#define TAO_ENDPOINTPOLICY_SAFE_INCLUDE
-#include "tao/EndpointPolicy/EndpointPolicyC.h"
-#include "tao/EndpointPolicy/EndpointPolicyA.h"
-#include "tao/IOP_IORC.h"
-#include "tao/AnyTypeCode/Any.h"
-#undef TAO_ENDPOINTPOLICY_SAFE_INCLUDE
-
-#endif /* TAO_ENDPOINTPOLICY_H */
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.pidl b/TAO/tao/EndpointPolicy/EndpointPolicy.pidl
deleted file mode 100644
index 4b0fcede25f..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.pidl
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   EndpointPolicy
-//
-// = FILENAME
-//   EndpointPolicy.pidl
-//
-// = DESCRIPTION
-//   This file contains idl definition for Endpoint policy interface and
-//   the policy value. This TAO-specific policy is used to filter endpoints
-//   in the profiles for use in Object References.
-//
-//
-//   This file was used to generate the code in
-//   EndpointPolicyC.* The command used to generate code
-//   is:
-/*
-     $ACE_ROOT/bin/tao_idl \
-            -Ge 1 -Sc \
-            -Wb,export_macro=TAO_EndpointPolicy_Export \
-            -Wb,export_include="tao/EndpointPolicy/EndpointPolicy_Export.h" \
-            -Wb,pre_include="ace/pre.h" \
-            -Wb,post_include="ace/post.h" \
-            EndpointPolicy.pidl
-*/
-// ================================================================
-
-#ifndef _TAO_ENDPOINT_POLICY_IDL_
-#define _TAO_ENDPOINT_POLICY_IDL_
-
-///FUZZ: disable check_for_include/
-#include "tao/Policy.pidl"
-#include "tao/EndpointPolicy/EndpointPolicyType.pidl"
-
-module EndpointPolicy
-{
-  local interface EndpointValueBase
-  {
-    readonly attribute unsigned long protocol_tag;
-  };
-
-  typedef sequence<EndpointValueBase> EndpointList;
-
-  local interface Policy : CORBA::Policy
-  {
-    readonly attribute EndpointList value;
-  };
-};
-
-
-#endif /* _TAO_ENDPOINT_POLICY_IDL_ */
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyA.cpp b/TAO/tao/EndpointPolicy/EndpointPolicyA.cpp
deleted file mode 100644
index 94a683d6b1f..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyA.cpp
+++ /dev/null
@@ -1,212 +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 "EndpointPolicyA.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/Sequence_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 "tao/AnyTypeCode/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_EndpointPolicy_EndpointValueBase (
-    ::CORBA::tk_local_interface,
-    "IDL:EndpointPolicy/EndpointValueBase:1.0",
-    "EndpointValueBase");
-  
-namespace EndpointPolicy
-{
-  ::CORBA::TypeCode_ptr const _tc_EndpointValueBase =
-    &_tao_tc_EndpointPolicy_EndpointValueBase;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:942
-
-
-#ifndef _TAO_TYPECODE_EndpointPolicy_EndpointList_GUARD
-#define _TAO_TYPECODE_EndpointPolicy_EndpointList_GUARD
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      EndpointPolicy_EndpointList_0 (
-        ::CORBA::tk_sequence,
-        &EndpointPolicy::_tc_EndpointValueBase,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_EndpointPolicy_EndpointList_0 =
-      &EndpointPolicy_EndpointList_0;
-    
-  }
-}
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-#endif /* _TAO_TYPECODE_EndpointPolicy_EndpointList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_EndpointPolicy_EndpointList (
-    ::CORBA::tk_alias,
-    "IDL:EndpointPolicy/EndpointList:1.0",
-    "EndpointList",
-    &TAO::TypeCode::tc_EndpointPolicy_EndpointList_0);
-  
-namespace EndpointPolicy
-{
-  ::CORBA::TypeCode_ptr const _tc_EndpointList =
-    &_tao_tc_EndpointPolicy_EndpointList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_EndpointPolicy_Policy (
-    ::CORBA::tk_local_interface,
-    "IDL:EndpointPolicy/Policy:1.0",
-    "Policy");
-  
-namespace EndpointPolicy
-{
-  ::CORBA::TypeCode_ptr const _tc_Policy =
-    &_tao_tc_EndpointPolicy_Policy;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  template<>
-  ::CORBA::Boolean
-  Any_Dual_Impl_T<EndpointPolicy::EndpointList>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  ::CORBA::Boolean
-  Any_Dual_Impl_T<EndpointPolicy::EndpointList>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    ::CORBA::Any &_tao_any,
-    const EndpointPolicy::EndpointList &_tao_elem
-  )
-{
-  if (0 == &_tao_elem) // Trying to de-reference NULL object
-    _tao_any <<= static_cast<EndpointPolicy::EndpointList *>( 0 ); // Use non-copying insertion of a NULL
-  else
-    TAO::Any_Dual_Impl_T<EndpointPolicy::EndpointList>::insert_copy (
-        _tao_any,
-        EndpointPolicy::EndpointList::_tao_any_destructor,
-        TAO::TypeCode::tc_EndpointPolicy_EndpointList_0,
-        _tao_elem
-      );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    ::CORBA::Any &_tao_any,
-    EndpointPolicy::EndpointList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<EndpointPolicy::EndpointList>::insert (
-      _tao_any,
-      EndpointPolicy::EndpointList::_tao_any_destructor,
-      TAO::TypeCode::tc_EndpointPolicy_EndpointList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-::CORBA::Boolean operator>>= (
-    const ::CORBA::Any &_tao_any,
-    EndpointPolicy::EndpointList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const EndpointPolicy::EndpointList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-::CORBA::Boolean operator>>= (
-    const ::CORBA::Any &_tao_any,
-    const EndpointPolicy::EndpointList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<EndpointPolicy::EndpointList>::extract (
-        _tao_any,
-        EndpointPolicy::EndpointList::_tao_any_destructor,
-        TAO::TypeCode::tc_EndpointPolicy_EndpointList_0,
-        _tao_elem
-      );
-}
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyA.h b/TAO/tao/EndpointPolicy/EndpointPolicyA.h
deleted file mode 100644
index f8e99832e13..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyA.h
+++ /dev/null
@@ -1,84 +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:796
-
-#ifndef _TAO_IDL_ENDPOINTPOLICYA_H_
-#define _TAO_IDL_ENDPOINTPOLICYA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_Export.h"
-#include "tao/EndpointPolicy/EndpointPolicyC.h"
-#include "tao/AnyTypeCode/PolicyA.h"
-#include "tao/EndpointPolicy/EndpointPolicyTypeA.h"
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:59
-
-namespace EndpointPolicy
-{
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_EndpointPolicy_Export ::CORBA::TypeCode_ptr const _tc_EndpointValueBase;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_EndpointPolicy_Export ::CORBA::TypeCode_ptr const _tc_EndpointList;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_EndpointPolicy_Export ::CORBA::TypeCode_ptr const _tc_Policy;
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:86
-
-} // module EndpointPolicy
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:53
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_EndpointPolicy_Export void operator<<= ( ::CORBA::Any &, const EndpointPolicy::EndpointList &); // copying version
-TAO_EndpointPolicy_Export void operator<<= ( ::CORBA::Any &, EndpointPolicy::EndpointList*); // noncopying version
-TAO_EndpointPolicy_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, EndpointPolicy::EndpointList *&); // deprecated
-TAO_EndpointPolicy_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const EndpointPolicy::EndpointList *&);
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyC.cpp b/TAO/tao/EndpointPolicy/EndpointPolicyC.cpp
deleted file mode 100644
index de557e569ac..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyC.cpp
+++ /dev/null
@@ -1,356 +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:282
-
-
-#include "EndpointPolicyC.h"
-#include "tao/CDR.h"
-#include "ace/OS_NS_string.h"
-
-#if !defined (__ACE_INLINE__)
-#include "EndpointPolicyC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:71
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for EndpointPolicy::EndpointValueBase.
-
-EndpointPolicy::EndpointValueBase_ptr
-TAO::Objref_Traits<EndpointPolicy::EndpointValueBase>::duplicate (
-    EndpointPolicy::EndpointValueBase_ptr p
-  )
-{
-  return EndpointPolicy::EndpointValueBase::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<EndpointPolicy::EndpointValueBase>::release (
-    EndpointPolicy::EndpointValueBase_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-EndpointPolicy::EndpointValueBase_ptr
-TAO::Objref_Traits<EndpointPolicy::EndpointValueBase>::nil (void)
-{
-  return EndpointPolicy::EndpointValueBase::_nil ();
-}
-
-::CORBA::Boolean
-TAO::Objref_Traits<EndpointPolicy::EndpointValueBase>::marshal (
-    const EndpointPolicy::EndpointValueBase_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return ::CORBA::Object::marshal (p, cdr);
-}
-
-EndpointPolicy::EndpointValueBase::EndpointValueBase (void)
-{}
-
-EndpointPolicy::EndpointValueBase::~EndpointValueBase (void)
-{}
-
-EndpointPolicy::EndpointValueBase_ptr
-EndpointPolicy::EndpointValueBase::_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return EndpointValueBase::_duplicate (
-      dynamic_cast<EndpointValueBase_ptr> (_tao_objref)
-    );
-}
-
-EndpointPolicy::EndpointValueBase_ptr
-EndpointPolicy::EndpointValueBase::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return EndpointValueBase::_duplicate (
-      dynamic_cast<EndpointValueBase_ptr> (_tao_objref)
-    );
-}
-
-EndpointPolicy::EndpointValueBase_ptr
-EndpointPolicy::EndpointValueBase::_duplicate (EndpointValueBase_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-EndpointPolicy::EndpointValueBase::_tao_release (EndpointValueBase_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-::CORBA::Boolean
-EndpointPolicy::EndpointValueBase::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:EndpointPolicy/EndpointValueBase: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* EndpointPolicy::EndpointValueBase::_interface_repository_id (void) const
-{
-  return "IDL:EndpointPolicy/EndpointValueBase:1.0";
-}
-
-::CORBA::Boolean
-EndpointPolicy::EndpointValueBase::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_ENDPOINTPOLICY_ENDPOINTLIST_CS_)
-#define _ENDPOINTPOLICY_ENDPOINTLIST_CS_
-
-EndpointPolicy::EndpointList::EndpointList (void)
-{}
-
-EndpointPolicy::EndpointList::EndpointList (
-    ::CORBA::ULong max
-  )
-  : TAO::unbounded_object_reference_sequence<
-        EndpointValueBase,
-        EndpointValueBase_var
-      >
-    (max)
-{}
-
-EndpointPolicy::EndpointList::EndpointList (
-    ::CORBA::ULong max,
-    ::CORBA::ULong length,
-    EndpointPolicy::EndpointValueBase_ptr * buffer,
-    ::CORBA::Boolean release
-  )
-  : TAO::unbounded_object_reference_sequence<
-        EndpointValueBase,
-        EndpointValueBase_var
-      >
-    (max, length, buffer, release)
-{}
-
-EndpointPolicy::EndpointList::EndpointList (
-    const EndpointList &seq
-  )
-  : TAO::unbounded_object_reference_sequence<
-        EndpointValueBase,
-        EndpointValueBase_var
-      >
-    (seq)
-{}
-
-EndpointPolicy::EndpointList::~EndpointList (void)
-{}
-
-void EndpointPolicy::EndpointList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  EndpointList * _tao_tmp_pointer =
-    static_cast<EndpointList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for EndpointPolicy::Policy.
-
-EndpointPolicy::Policy_ptr
-TAO::Objref_Traits<EndpointPolicy::Policy>::duplicate (
-    EndpointPolicy::Policy_ptr p
-  )
-{
-  return EndpointPolicy::Policy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<EndpointPolicy::Policy>::release (
-    EndpointPolicy::Policy_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-EndpointPolicy::Policy_ptr
-TAO::Objref_Traits<EndpointPolicy::Policy>::nil (void)
-{
-  return EndpointPolicy::Policy::_nil ();
-}
-
-::CORBA::Boolean
-TAO::Objref_Traits<EndpointPolicy::Policy>::marshal (
-    const EndpointPolicy::Policy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return ::CORBA::Object::marshal (p, cdr);
-}
-
-EndpointPolicy::Policy::Policy (void)
-{}
-
-EndpointPolicy::Policy::~Policy (void)
-{}
-
-EndpointPolicy::Policy_ptr
-EndpointPolicy::Policy::_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return Policy::_duplicate (
-      dynamic_cast<Policy_ptr> (_tao_objref)
-    );
-}
-
-EndpointPolicy::Policy_ptr
-EndpointPolicy::Policy::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return Policy::_duplicate (
-      dynamic_cast<Policy_ptr> (_tao_objref)
-    );
-}
-
-EndpointPolicy::Policy_ptr
-EndpointPolicy::Policy::_duplicate (Policy_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-EndpointPolicy::Policy::_tao_release (Policy_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-::CORBA::Boolean
-EndpointPolicy::Policy::_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:EndpointPolicy/Policy: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* EndpointPolicy::Policy::_interface_repository_id (void) const
-{
-  return "IDL:EndpointPolicy/Policy:1.0";
-}
-
-::CORBA::Boolean
-EndpointPolicy::Policy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyC.h b/TAO/tao/EndpointPolicy/EndpointPolicyC.h
deleted file mode 100644
index 12a7836e99f..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyC.h
+++ /dev/null
@@ -1,393 +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_ENDPOINTPOLICYC_H_
-#define _TAO_IDL_ENDPOINTPOLICYC_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/EndpointPolicy/EndpointPolicy_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/Versioned_Namespace.h"
-
-#include "tao/PolicyC.h"
-#include "tao/EndpointPolicy/EndpointPolicyTypeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_EndpointPolicy_Export
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:49
-
-namespace EndpointPolicy
-{
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:640
-
-#if !defined (_ENDPOINTPOLICY_ENDPOINTVALUEBASE__VAR_OUT_CH_)
-#define _ENDPOINTPOLICY_ENDPOINTVALUEBASE__VAR_OUT_CH_
-  
-  class EndpointValueBase;
-  typedef EndpointValueBase *EndpointValueBase_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        EndpointValueBase
-      >
-    EndpointValueBase_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        EndpointValueBase
-      >
-    EndpointValueBase_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_ENDPOINTPOLICY_ENDPOINTVALUEBASE_CH_)
-#define _ENDPOINTPOLICY_ENDPOINTVALUEBASE_CH_
-  
-  class TAO_EndpointPolicy_Export EndpointValueBase
-    : public virtual ::CORBA::Object
-  {
-  public:
-    typedef EndpointValueBase_ptr _ptr_type;
-    typedef EndpointValueBase_var _var_type;
-    
-    // The static operations.
-    static EndpointValueBase_ptr _duplicate (EndpointValueBase_ptr obj);
-    
-    static void _tao_release (EndpointValueBase_ptr obj);
-    
-    static EndpointValueBase_ptr _narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static EndpointValueBase_ptr _unchecked_narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static EndpointValueBase_ptr _nil (void)
-    {
-      return static_cast<EndpointValueBase_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::ULong protocol_tag (
-        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.
-    EndpointValueBase (void);
-    
-    virtual ~EndpointValueBase (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    EndpointValueBase (const EndpointValueBase &);
-    
-    void operator= (const EndpointValueBase &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_ENDPOINTPOLICY_ENDPOINTLIST_CH_)
-#define _ENDPOINTPOLICY_ENDPOINTLIST_CH_
-  
-  class EndpointList;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        EndpointList
-      >
-    EndpointList_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        EndpointList
-      >
-    EndpointList_out;
-  
-  class TAO_EndpointPolicy_Export EndpointList
-    : public
-        TAO::unbounded_object_reference_sequence<
-            EndpointValueBase,
-            EndpointValueBase_var
-          >
-  {
-  public:
-    EndpointList (void);
-    EndpointList ( ::CORBA::ULong max);
-    EndpointList (
-        ::CORBA::ULong max,
-        ::CORBA::ULong length,
-        EndpointValueBase_ptr* buffer, 
-        ::CORBA::Boolean release = false
-      );
-    EndpointList (const EndpointList &);
-    ~EndpointList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef EndpointList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:640
-
-#if !defined (_ENDPOINTPOLICY_POLICY__VAR_OUT_CH_)
-#define _ENDPOINTPOLICY_POLICY__VAR_OUT_CH_
-  
-  class Policy;
-  typedef Policy *Policy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Policy
-      >
-    Policy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Policy
-      >
-    Policy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_ENDPOINTPOLICY_POLICY_CH_)
-#define _ENDPOINTPOLICY_POLICY_CH_
-  
-  class TAO_EndpointPolicy_Export Policy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef Policy_ptr _ptr_type;
-    typedef Policy_var _var_type;
-    
-    // The static operations.
-    static Policy_ptr _duplicate (Policy_ptr obj);
-    
-    static void _tao_release (Policy_ptr obj);
-    
-    static Policy_ptr _narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Policy_ptr _unchecked_narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Policy_ptr _nil (void)
-    {
-      return static_cast<Policy_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::EndpointPolicy::EndpointList * value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp: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.
-    Policy (void);
-    
-    virtual ~Policy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Policy (const Policy &);
-    
-    void operator= (const Policy &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:78
-
-} // module EndpointPolicy
-
-// TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:63
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_ENDPOINTPOLICY_ENDPOINTVALUEBASE__TRAITS_)
-#define _ENDPOINTPOLICY_ENDPOINTVALUEBASE__TRAITS_
-  
-  template<>
-  struct TAO_EndpointPolicy_Export Objref_Traits< ::EndpointPolicy::EndpointValueBase>
-  {
-    static ::EndpointPolicy::EndpointValueBase_ptr duplicate (
-        ::EndpointPolicy::EndpointValueBase_ptr
-      );
-    static void release (
-        ::EndpointPolicy::EndpointValueBase_ptr
-      );
-    static ::EndpointPolicy::EndpointValueBase_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::EndpointPolicy::EndpointValueBase_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_ENDPOINTPOLICY_POLICY__TRAITS_)
-#define _ENDPOINTPOLICY_POLICY__TRAITS_
-  
-  template<>
-  struct TAO_EndpointPolicy_Export Objref_Traits< ::EndpointPolicy::Policy>
-  {
-    static ::EndpointPolicy::Policy_ptr duplicate (
-        ::EndpointPolicy::Policy_ptr
-      );
-    static void release (
-        ::EndpointPolicy::Policy_ptr
-      );
-    static ::EndpointPolicy::Policy_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::EndpointPolicy::Policy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1092
-#if defined (__ACE_INLINE__)
-#include "EndpointPolicyC.inl"
-#endif /* defined INLINE */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyC.inl b/TAO/tao/EndpointPolicy/EndpointPolicyC.inl
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyC.inl
+++ /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
-
-
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl b/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl
deleted file mode 100644
index 2a07f2c886a..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   EndpointPolicy
-//
-// = FILENAME
-//   EndpointPolicyType.pidl
-//
-// = DESCRIPTION
-//   This file contains idl definition for EndpointPolicy type.
-//
-//
-//   This file was used to generate the code in
-//   EndpointPolicyTypeC.* The command used to generate code
-//   is:
-//
-//     tao_idl
-//         -o orig -Ge 1 -GA -Sc \
-//          -Wb,export_macro=TAO_EndpointPolicy_Export \
-//          -Wb,export_include="tao/EndpointPolicy/TAO_EndpointPolicy_Export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          EndpointPolicyType.pidl
-//
-// ================================================================
-
-#ifndef _TAO_ENDPOINT_POLICY_TYPE_IDL_
-#define _TAO_ENDPOINT_POLICY_TYPE_IDL_
-
-#include "tao/Policy.pidl"
-
-module EndpointPolicy
-{
-   const CORBA::PolicyType ENDPOINT_POLICY_TYPE = 0x4f43000c;
-};
-
-
-#endif /* _TAO_ENDPOINT_POLICY_TYPE_IDL_ */
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyTypeA.cpp b/TAO/tao/EndpointPolicy/EndpointPolicyTypeA.cpp
deleted file mode 100644
index c4c90d969c0..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyTypeA.cpp
+++ /dev/null
@@ -1,33 +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/EndpointPolicy/EndpointPolicyTypeA.h"
-#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/CDR.h"
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyTypeA.h b/TAO/tao/EndpointPolicy/EndpointPolicyTypeA.h
deleted file mode 100644
index a7953240ff9..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyTypeA.h
+++ /dev/null
@@ -1,54 +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:797
-
-#ifndef _TAO_IDL_ENDPOINTPOLICYTYPEA_H_
-#define _TAO_IDL_ENDPOINTPOLICYTYPEA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_Export.h"
-#include "tao/EndpointPolicy/EndpointPolicyTypeC.h"
-#include "tao/AnyTypeCode/PolicyA.h"
-
-
-// TAO_IDL - Generated from
-// c:\ticket\tao-1_4_8_merge\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:59
-
-namespace EndpointPolicy
-{
-
-// TAO_IDL - Generated from
-// c:\ticket\tao-1_4_8_merge\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:86
-
-} // module EndpointPolicy
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyTypeC.h b/TAO/tao/EndpointPolicy/EndpointPolicyTypeC.h
deleted file mode 100644
index 59b8f094a5b..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicyTypeC.h
+++ /dev/null
@@ -1,90 +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:155
-
-#ifndef _TAO_IDL_ENDPOINTPOLICYTYPEC_H_
-#define _TAO_IDL_ENDPOINTPOLICYTYPEC_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/EndpointPolicy/EndpointPolicy_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.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_EndpointPolicy_Export
-
-// TAO_IDL - Generated from
-// c:\ticket\tao-1_4_8_merge\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:49
-
-namespace EndpointPolicy
-{
-  
-  // TAO_IDL - Generated from
-  // c:\ticket\tao-1_4_8_merge\ace_wrappers\tao\tao_idl\be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType ENDPOINT_POLICY_TYPE = 1329790988U;
-
-// TAO_IDL - Generated from
-// c:\ticket\tao-1_4_8_merge\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:78
-
-} // module EndpointPolicy
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:62
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-// Traits specializations.
-namespace TAO
-{
-}
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Export.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Export.h
deleted file mode 100644
index d9940484cfe..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_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_EndpointPolicy
-// ------------------------------
-#ifndef TAO_ENDPOINTPOLICY_EXPORT_H
-#define TAO_ENDPOINTPOLICY_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_ENDPOINTPOLICY_HAS_DLL)
-#  define TAO_ENDPOINTPOLICY_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_ENDPOINTPOLICY_HAS_DLL */
-
-#if !defined (TAO_ENDPOINTPOLICY_HAS_DLL)
-#  define TAO_ENDPOINTPOLICY_HAS_DLL 1
-#endif /* ! TAO_ENDPOINTPOLICY_HAS_DLL */
-
-#if defined (TAO_ENDPOINTPOLICY_HAS_DLL) && (TAO_ENDPOINTPOLICY_HAS_DLL == 1)
-#  if defined (TAO_ENDPOINTPOLICY_BUILD_DLL)
-#    define TAO_EndpointPolicy_Export ACE_Proper_Export_Flag
-#    define TAO_ENDPOINTPOLICY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_ENDPOINTPOLICY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_ENDPOINTPOLICY_BUILD_DLL */
-#    define TAO_EndpointPolicy_Export ACE_Proper_Import_Flag
-#    define TAO_ENDPOINTPOLICY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_ENDPOINTPOLICY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_ENDPOINTPOLICY_BUILD_DLL */
-#else /* TAO_ENDPOINTPOLICY_HAS_DLL == 1 */
-#  define TAO_EndpointPolicy_Export
-#  define TAO_ENDPOINTPOLICY_SINGLETON_DECLARATION(T)
-#  define TAO_ENDPOINTPOLICY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_ENDPOINTPOLICY_HAS_DLL == 1 */
-
-// Set TAO_ENDPOINTPOLICY_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_ENDPOINTPOLICY_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_ENDPOINTPOLICY_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_ENDPOINTPOLICY_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_ENDPOINTPOLICY_NTRACE */
-
-#if (TAO_ENDPOINTPOLICY_NTRACE == 1)
-#  define TAO_ENDPOINTPOLICY_TRACE(X)
-#else /* (TAO_ENDPOINTPOLICY_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_ENDPOINTPOLICY_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_ENDPOINTPOLICY_NTRACE == 1) */
-
-#endif /* TAO_ENDPOINTPOLICY_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
deleted file mode 100644
index 11c4a887519..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// @(#) $Id$
-#include "tao/EndpointPolicy/EndpointPolicy_Factory.h"
-
-ACE_RCSID (EndpointPolicy,
-           EndpointPolicy_Factory,
-           "$Id$")
-
-#include "tao/EndpointPolicy/EndpointPolicy_i.h"
-#include "tao/EndpointPolicy/EndpointPolicyA.h"
-#include "tao/EndpointPolicy/Endpoint_Value_Impl.h"
-
-#include "tao/PolicyC.h"
-#include "tao/ORB_Constants.h"
-#include "tao/ORB_Core.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/AnyTypeCode/TAOA.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Transport_Acceptor.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-TAO_EndpointPolicy_Factory::TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core)
-: orb_core_ (orb_core)
-{
-}
-
-
-CORBA::Policy_ptr
-TAO_EndpointPolicy_Factory::create_policy (
-    CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-  if (type == EndpointPolicy::ENDPOINT_POLICY_TYPE)
-  {
-    const EndpointPolicy::EndpointList* endpoint_list;
-    if ((value >>= endpoint_list) == 0)
-      ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-      CORBA::Policy::_nil ());
-
-    TAO_Acceptor_Registry & registry
-      = this->orb_core_->lane_resources ().acceptor_registry ();
-
-    TAO_Acceptor ** acceptors_begin = registry.begin ();
-    TAO_Acceptor ** acceptors_end = registry.end ();
-    CORBA::ULong num_eps = endpoint_list->length ();
-
-    // The endpoint list in the value is validated to ensure that
-    // at least one endpoint in the list matches an endpoint the
-    // ORB is listening on.
-
-    bool found_one = true;
-    for (CORBA::ULong idx = 0; !found_one && idx < num_eps; ++idx)
-    {
-      CORBA::ULong prot_tag = (*endpoint_list)[idx]->protocol_tag();
-
-      const TAO_Endpoint_Value_Impl *evi =
-        dynamic_cast <const TAO_Endpoint_Value_Impl*> ((*endpoint_list)[idx]);
-
-      for (TAO_Acceptor** acceptor = acceptors_begin;
-           !found_one && acceptor != acceptors_end;
-           ++acceptor)
-        {
-          if ((*acceptor)->tag() == prot_tag)
-            found_one = evi->validate_acceptor(*acceptor);
-        }
-    }
-    // There is no endpoint policy value matches an endpoint the ORB
-    // is listening on. A CORBA::PolicyError exception with a
-    // PolicyErrorCode of UNSUPPORTED_POLICY_VALUE is raised.
-    if (!found_one)
-      ACE_THROW_RETURN (CORBA::PolicyError (CORBA::UNSUPPORTED_POLICY_VALUE),
-                        CORBA::Policy::_nil ());
-
-    TAO_EndpointPolicy_i *tmp;
-    ACE_NEW_THROW_EX (tmp,
-      TAO_EndpointPolicy_i (*endpoint_list),
-      CORBA::NO_MEMORY (TAO::VMCID,
-      CORBA::COMPLETED_NO));
-    ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-    return tmp;
-  }
-  else
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                      CORBA::Policy::_nil ());
-}
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
deleted file mode 100644
index 667c7f2aa9a..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file EndpointPolicy_Factory.h
- *
- * $Id$
- *
- * @author  Yan Dai <dai_y@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_ENDPOINTPOLICY_FACTORY_H
-#define TAO_ENDPOINTPOLICY_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI/PI.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Forward declarations.
-class TAO_ORB_Core;
-
-/// Policy factory for the endpoint policies.
-class TAO_EndpointPolicy_Export TAO_EndpointPolicy_Factory
-  : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  TAO_EndpointPolicy_Factory (TAO_ORB_Core * orb_core);
-
-  virtual 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));
-private:
-
-  TAO_ORB_Core * orb_core_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENDPOINTPOLICY_FACTORY_H */
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
deleted file mode 100644
index d457e78d389..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-
-#include "tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h"
-
-#include "tao/EndpointPolicy/EndpointPolicyC.h"
-#include "tao/EndpointPolicy/EndpointPolicy_Factory.h"
-#include "tao/ORB_Core.h"
-#include "tao/PI/ORBInitInfo.h"
-
-ACE_RCSID (EndpointPolicy,
-           EndpointPolicy_ORBInitializer,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-void
-TAO_EndpointPolicy_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-TAO_EndpointPolicy_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_EndpointPolicy_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
-{
-  TAO_ORBInitInfo * local_info = dynamic_cast <TAO_ORBInitInfo *> (info);
-  TAO_ORB_Core * the_orb_core = local_info->orb_core ();
-
-  // Register the EndpointPolicy policy factories.
-  PortableInterceptor::PolicyFactory_ptr policy_factory_ptr;
-  ACE_NEW_THROW_EX (policy_factory_ptr,
-                    TAO_EndpointPolicy_Factory(the_orb_core),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-
-  PortableInterceptor::PolicyFactory_var policy_factory =
-    policy_factory_ptr;
-
-  ACE_TRY
-    {
-      info->register_policy_factory (EndpointPolicy::ENDPOINT_POLICY_TYPE,
-                                     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 Messaging.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
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
deleted file mode 100644
index daeeff7f2c0..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file EndpointPolicy_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author  Yan Dai <dai_y@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_ENDPOINTPOLICY_ORB_INITIALIZER_H
-#define TAO_ENDPOINTPOLICY_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI/PI.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/// EndpointPolicy ORB initializer.
-class TAO_EndpointPolicy_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.
-   */
-  //@{
-
-  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 Endpoint policy factories.
-  void register_policy_factories (
-    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_ENDPOINTPOLICY_ORB_INITIALIZER_H */
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
deleted file mode 100644
index 41df9fe5175..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-
-#include "tao/EndpointPolicy/EndpointPolicy_i.h"
-
-#include "tao/SystemException.h"
-
-ACE_RCSID (EndpointPolicy,
-           EndpointPolicy_i,
-           "$Id$")
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_EndpointPolicy_i::TAO_EndpointPolicy_i (const EndpointPolicy::EndpointList &value)
-: value_ (value)
-{
-}
-
-TAO_EndpointPolicy_i::TAO_EndpointPolicy_i (const TAO_EndpointPolicy_i &rhs)
-  : ACE_NESTED_CLASS (CORBA, Object) ()
-  , ACE_NESTED_CLASS (CORBA, Policy) ()
-  , ACE_NESTED_CLASS (EndpointPolicy, Policy) ()
-  , ACE_NESTED_CLASS (CORBA, LocalObject) ()
-  , TAO_Local_RefCounted_Object ()
-  , value_ (rhs.value_)
-{
-}
-
-CORBA::PolicyType
-TAO_EndpointPolicy_i::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return EndpointPolicy::ENDPOINT_POLICY_TYPE;
-}
-
-TAO_EndpointPolicy_i *
-TAO_EndpointPolicy_i::clone (void) const
-{
-  TAO_EndpointPolicy_i *copy = 0;
-  ACE_NEW_RETURN (copy,
-                  TAO_EndpointPolicy_i (*this),
-                  0);
-  return copy;
-}
-
-EndpointPolicy::EndpointList *
-TAO_EndpointPolicy_i::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  EndpointPolicy::EndpointList* list = 0;
-  ACE_NEW_RETURN (list,
-                  EndpointPolicy::EndpointList (this->value_),
-                  0);
-
-  return list;
-}
-
-CORBA::Policy_ptr
-TAO_EndpointPolicy_i::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_EndpointPolicy_i* servant = 0;
-  ACE_NEW_THROW_EX (servant,
-                    TAO_EndpointPolicy_i (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return servant;
-}
-
-void
-TAO_EndpointPolicy_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_Cached_Policy_Type
-TAO_EndpointPolicy_i::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_ENDPOINT;
-}
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
deleted file mode 100644
index c41626ba4d8..00000000000
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   EndpointPolicy_i.h
- *
- *  $Id$
- *
- *  @author  Yan Dai <dai_y@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_ENDPOINTPOLICY_I_H
-#define TAO_ENDPOINTPOLICY_I_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAOC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/EndpointPolicy/EndpointPolicyC.h"
-#include "tao/LocalObject.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-/**
- * @class TAO_EndpointPolicy_i
- *
- * @brief Implementation class for TAO-specific Endpoint Policy.
- *
- * This policy is used to filter the endpoints in profiles during
- * the creation of object references.
- */
-class TAO_EndpointPolicy_Export TAO_EndpointPolicy_i
-  : public virtual EndpointPolicy::Policy,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_EndpointPolicy_i (const EndpointPolicy::EndpointList &value);
-
-  /// Copy constructor.
-  TAO_EndpointPolicy_i (const TAO_EndpointPolicy_i &rhs);
-
-  /// Returns a copy of <this>.
-  virtual TAO_EndpointPolicy_i *clone (void) const;
-
-  // = The EndpointPolicy::Policy methods
-
-  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));
-
-  // Return the cached policy type for this policy.
-  virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  virtual EndpointPolicy::EndpointList * value (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-  )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ));
-
-private:
-  /// The attribute
-  EndpointPolicy::EndpointList value_;
-};
-
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_ENDPOINTPOLICY_I_H */
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
deleted file mode 100644
index dfa5686f7fe..00000000000
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// @(#) $Id$
-
-#include "tao/EndpointPolicy/Endpoint_Acceptor_Filter.h"
-#include "tao/EndpointPolicy/EndpointPolicyC.h"
-#include "tao/EndpointPolicy/Endpoint_Value_Impl.h"
-
-#include "tao/Transport_Acceptor.h"
-#include "tao/MProfile.h"
-#include "tao/IIOP_Profile.h"
-
-ACE_RCSID(EndpointPolicy,
-          Endpoint_Acceptor_Filter,
-          "$Id$")
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Endpoint_Acceptor_Filter::TAO_Endpoint_Acceptor_Filter (EndpointPolicy::Policy_ptr p)
-: endpoints_(p->value())
-{
-}
-
-int
-TAO_Endpoint_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
-                                            TAO_MProfile &mprofile,
-                                            TAO_Acceptor **acceptors_begin,
-                                            TAO_Acceptor **acceptors_end,
-                                            CORBA::Short priority)
-{
-  CORBA::ULong num_endpoints = endpoints_->length ();
-
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT("(%P|%t) EndpointPolicy filtering acceptors")
-                ACE_TEXT(" - mprofile has %d profiles,")
-                ACE_TEXT(" endpoint list has %d entries\n"),
-                mprofile.profile_count(), num_endpoints));
-
-  for (TAO_Acceptor** acceptor = acceptors_begin;
-       acceptor != acceptors_end;
-       ++acceptor)
-    {
-      bool tagfound = false;
-      for (CORBA::ULong epx = 0; !tagfound && epx < num_endpoints; epx++)
-        {
-          tagfound = (*acceptor)->tag () == endpoints_[epx]->protocol_tag();
-        }
-      if (!tagfound)
-        continue;
-
-      if ((*acceptor)->create_profile (object_key,
-                                       mprofile,
-                                       priority) == -1)
-        return -1;
-    }
-
-  for (TAO_PHandle i = 0; i < mprofile.profile_count (); ++i)
-    {
-      TAO_Profile *pfile =mprofile.get_profile (i);
-
-      TAO_Endpoint *ep_in_pfile = pfile->endpoint ();
-
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("(%P|%t) Testing profile %d - ")
-                    ACE_TEXT("it contains %d endpoints\n"),
-                    i, pfile->endpoint_count()));
-
-      bool first_endpoint = true;
-      // Iterate the endpoints in the profile.
-      while (ep_in_pfile != 0 && pfile->endpoint_count() > 0)
-        {
-          // Iterate the endpoints in the endpoint policy to see if the endpoint
-          // in the profile matches.
-          CORBA::ULong j = 0;
-          bool epmatch = false;
-          for (j = 0; !epmatch && j < num_endpoints; ++j)
-            {
-              if (endpoints_[j]->protocol_tag() != pfile->tag())
-                continue;
-
-              const EndpointPolicy::EndpointValueBase *evb = endpoints_[i];
-
-              const TAO_Endpoint_Value_Impl *evi =
-                dynamic_cast <const TAO_Endpoint_Value_Impl*>(evb);
-
-              epmatch = evi->is_equivalent(ep_in_pfile);
-            }
-
-          // The endpoint in profile does not match the endpoint specified in
-          // Endpoint policy, now remove the endpoint from the profile.
-          if (!epmatch)
-            {
-              //Get next endpoint before removing current one.
-              TAO_Endpoint * next = ep_in_pfile->next ();
-              if (TAO_debug_level > 2)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("(%P|%t) EndpointPolicy filter ")
-                            ACE_TEXT ("removing endpoint\n")));
-              pfile->remove_generic_endpoint (ep_in_pfile);
-              ep_in_pfile = first_endpoint ? pfile->endpoint() : next;
-            }
-          else
-            {
-              ep_in_pfile = ep_in_pfile->next();
-              first_endpoint = false;
-            }
-        }
-      // Remove the profiles that have no endpoints match the endpoints in
-      // endpoint policy.
-      if (pfile->endpoint_count () == 0)
-        {
-          if (TAO_debug_level > 2)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT("(%P|%t) EndpointPolicy filter removing profile\n")));
-          mprofile.remove_profile (pfile);
-          --i; // step back one, since we've just shifted the profile list.
-        }
-    }
-
-  if (mprofile.profile_count () == 0) {
-    if (TAO_debug_level > 2)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("(%P|%t) EndpointPolicy filter eliminated all profiles\n")));
-
-    return -1;
-  }
-  return 0;
-}
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h
deleted file mode 100644
index 818c3847455..00000000000
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Endpoint_Acceptor_Filter.h
- *
- *  $Id$
- *
- *  Subclass of TAO_Default_Acceptor_Filter that populates mprofile and filters 
- *  mprofile with the endpoint policy in TAO_POA_Manager.
- *
- *  @author  Yan Dai <dai_y@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_ENDPOINT_ACCEPTOR_FILTER_H
-#define TAO_ENDPOINT_ACCEPTOR_FILTER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Default_Acceptor_Filter.h"
-#include "tao/EndpointPolicy/EndpointPolicyC.h"
-
-class TAO_POA_Manager;
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-//=============================================================================
-/**
- * @class TAO_Endpoint_Acceptor_Filter
- *
- * @brief Subclass of default Acceptor_Filter.
- *
- * Endpoint strategy for populating mprofile: only the endpoints match
- * the POAManager endpoint policy are included.
- */
-//=============================================================================
-class TAO_EndpointPolicy_Export TAO_Endpoint_Acceptor_Filter
-  : public TAO_Default_Acceptor_Filter
-{
-public:
-  TAO_Endpoint_Acceptor_Filter (EndpointPolicy::Policy_ptr p);
-
-  /// Populate @a mprofile with endpoints match the POAManager endpoint 
-  /// policy.
-  int fill_profile (const TAO::ObjectKey &object_key,
-                    TAO_MProfile &mprofile,
-                    TAO_Acceptor **acceptors_begin,
-                    TAO_Acceptor **acceptors_end,
-                    CORBA::Short priority = TAO_INVALID_PRIORITY);
-
-private:
-  // this is the list of endpoints as obtained from the policy value supplied
-  // to the constructor.
-  EndpointPolicy::EndpointList_var endpoints_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENDPOINT_ACCEPTOR_FILTER_H */
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
deleted file mode 100644
index 13aeb5d62da..00000000000
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// @(#) $Id$
-
-#include "tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h"
-#include "tao/EndpointPolicy/Endpoint_Acceptor_Filter.h"
-#include "tao/PortableServer/Default_Acceptor_Filter.h"
-#include "tao/PortableServer/POAManager.h"
-#include "tao/EndpointPolicy/EndpointPolicyC.h"
-
-ACE_RCSID(EndpointPolicy,
-          Endpoint_Acceptor_Filter_Factory,
-          "$Id$")
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory(void)
-{
-}
-
- TAO_Acceptor_Filter*
- TAO_Endpoint_Acceptor_Filter_Factory::create_object (TAO_POA_Manager& poamanager)
-{
-  CORBA::PolicyList& policies = poamanager.get_policies ();
-  EndpointPolicy::Policy_var policy;
-  TAO_Acceptor_Filter* filter = 0;
-  for (CORBA::ULong i = 0; i < policies.length(); i++)
-    {
-      if (policies[i]->policy_type() == EndpointPolicy::ENDPOINT_POLICY_TYPE)
-        {
-          policy = EndpointPolicy::Policy::_narrow (policies[0]);
-  ACE_NEW_RETURN (filter,
-                          TAO_Endpoint_Acceptor_Filter (policy.in()),
-                          0);
-          return filter;
-        }
-    }
-  // no policy was in force, just return a default filter
-  ACE_NEW_RETURN (filter,
-                  TAO_Default_Acceptor_Filter (),
-                  0);
-
-  return filter;
-}
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_FACTORY_DEFINE (TAO_EndpointPolicy, TAO_Endpoint_Acceptor_Filter_Factory)
-ACE_STATIC_SVC_DEFINE (TAO_Endpoint_Acceptor_Filter_Factory,
-                       ACE_TEXT ("TAO_Acceptor_Filter_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Endpoint_Acceptor_Filter_Factory),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
-                       0)
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h
deleted file mode 100644
index 54a61c45c93..00000000000
--- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Endpoint_Acceptor_Filter_Factory.h
- *
- *  $Id$
- *
- *  The factory of the TAO_Endpoint_Acceptor_Filter objects.
- *
- *  @author  Yan Dai <dai_y@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_ENDPOINT_ACCEPTOR_FILTER_FACTORY_H
-#define TAO_ENDPOINT_ACCEPTOR_FILTER_FACTORY_H
-
-#include /**/ "ace/pre.h"
-#include "ace/Service_Config.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Acceptor_Filter_Factory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Endpoint_Acceptor_Filter_Factory
- *
- * @brief The factory of the TAO_Endpoint_Acceptor_Filter objects.
- *
- * Factory service object that creates the TAO_Endpoint_Acceptor_Filter objects.
- */
-class TAO_EndpointPolicy_Export TAO_Endpoint_Acceptor_Filter_Factory
-  : public TAO_Acceptor_Filter_Factory
-{
-public:
-  virtual ~TAO_Endpoint_Acceptor_Filter_Factory(void);
-
-  /// Create a new TAO_Endpoint_Acceptor_Filter object.
-  TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager);
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_EndpointPolicy, TAO_Endpoint_Acceptor_Filter_Factory)
-ACE_FACTORY_DECLARE (TAO_EndpointPolicy, TAO_Endpoint_Acceptor_Filter_Factory)
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENDPOINT_ACCEPTOR_FILTER_FACTORY_H */
diff --git a/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h b/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h
deleted file mode 100644
index 14cc43b7382..00000000000
--- a/TAO/tao/EndpointPolicy/Endpoint_Value_Impl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file     Endpoint_Value_Impl.h
- *
- *  $Id$
- *
- *  Implementation of the IIOP-Specific endpoint policy value
- *
- *  @author  Phil Mesnier <mesnier_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef _TAO_ENDPOINT_VALUE_IMPL_H_
-#define _TAO_ENDPOINT_VALUE_IMPL_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Endpoint;
-class TAO_Acceptor;
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class Endpoint_Value_Impl
- *
- * @brief Abstract base class to be mixed in to servants of protocol
- * specific EndpointValues.
- *
- * This inteface defines the methods necessary for the
- * protocol-specific endpoint value to be used with the endpoint
- * policy
- */
-
-class TAO_EndpointPolicy_Export  TAO_Endpoint_Value_Impl
-{
-public:
-
-  /// This method is used to compare a candidate IOR endpoint with the
-  /// endpoint defined by this policy value.
-  virtual CORBA::Boolean is_equivalent (const TAO_Endpoint * ) const = 0;
-
-  /// This method is used by the framework to validate that an
-  /// acceptor is available to produce an endpoint required by at
-  /// least one of the endpoint policies values.
-  virtual CORBA::Boolean validate_acceptor (TAO_Acceptor *) const = 0;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* _TAO_Endpoint_Value_Impl_H_ */
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl b/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl
deleted file mode 100644
index a1b97a957ad..00000000000
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue.pidl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   EndpointPolicy
-//
-// = FILENAME
-//   EndpointPolicy.pidl
-//
-// = DESCRIPTION
-//   This file contains idl definition for Endpoint policy interface and
-//   the policy value. This TAO-specific policy is used to filter endpoints
-//   in the profiles for use in Object References.
-//
-//
-//   This file was used to generate the code in
-//   EndpointPolicyC.* The command used to generate code
-//   is:
-//
-//     tao_idl
-//         -o orig -Ge 1 -GA -Sc \
-//          -Wb,export_macro=TAO_EndpointPolicy_Export \
-//          -Wb,export_include="tao/EndpointPolicy/EndpointPolicy_Export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IIOPEndpointValue.pidl
-//
-// ================================================================
-
-#ifndef _TAO_IIOPENDPOINT_VALUE_IDL_
-#define _TAO_IIOPENDPOINT_VALUE_IDL_
-
-///FUZZ: disable check_for_include/
-#include "tao/EndpointPolicy/EndpointPolicy.pidl"
-
-module EndpointPolicy
-{
-  local interface IIOPEndpointValue : EndpointValueBase
-  {
-    // protocol_tag set to TAG_Internet_IOP;
-
-    attribute string host;
-    attribute unsigned short port;
-  };
-};
-
-#endif /* _TAO_IIOPENDPOINT_VALUE_IDL_ */
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValueA.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValueA.cpp
deleted file mode 100644
index 0c27c6a5ce5..00000000000
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValueA.cpp
+++ /dev/null
@@ -1,53 +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/EndpointPolicy/IIOPEndpointValueA.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_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_EndpointPolicy_IIOPEndpointValue (
-    ::CORBA::tk_local_interface,
-    "IDL:EndpointPolicy/IIOPEndpointValue:1.0",
-    "IIOPEndpointValue");
-
-namespace EndpointPolicy
-{
-  ::CORBA::TypeCode_ptr const _tc_IIOPEndpointValue =
-    &_tao_tc_EndpointPolicy_IIOPEndpointValue;
-}
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValueA.h b/TAO/tao/EndpointPolicy/IIOPEndpointValueA.h
deleted file mode 100644
index e0113397f95..00000000000
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValueA.h
+++ /dev/null
@@ -1,59 +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:797
-
-#ifndef _TAO_IDL_IIOPENDPOINTVALUEA_H_
-#define _TAO_IDL_IIOPENDPOINTVALUEA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_Export.h"
-#include "tao/EndpointPolicy/IIOPEndpointValueC.h"
-#include "tao/EndpointPolicy/EndpointPolicyA.h"
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:59
-
-namespace EndpointPolicy
-{
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_EndpointPolicy_Export ::CORBA::TypeCode_ptr const _tc_IIOPEndpointValue;
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:86
-
-} // module EndpointPolicy
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValueC.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValueC.cpp
deleted file mode 100644
index 9ebff2c4571..00000000000
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValueC.cpp
+++ /dev/null
@@ -1,176 +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:283
-
-
-#include "tao/EndpointPolicy/IIOPEndpointValueC.h"
-#include "tao/CDR.h"
-#include "tao/Basic_Arguments.h"
-#include "tao/UB_String_Arguments.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_END_VERSIONED_NAMESPACE_DECL
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for EndpointPolicy::IIOPEndpointValue.
-
-EndpointPolicy::IIOPEndpointValue_ptr
-TAO::Objref_Traits<EndpointPolicy::IIOPEndpointValue>::duplicate (
-    EndpointPolicy::IIOPEndpointValue_ptr p
-  )
-{
-  return EndpointPolicy::IIOPEndpointValue::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<EndpointPolicy::IIOPEndpointValue>::release (
-    EndpointPolicy::IIOPEndpointValue_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-EndpointPolicy::IIOPEndpointValue_ptr
-TAO::Objref_Traits<EndpointPolicy::IIOPEndpointValue>::nil (void)
-{
-  return EndpointPolicy::IIOPEndpointValue::_nil ();
-}
-
-::CORBA::Boolean
-TAO::Objref_Traits<EndpointPolicy::IIOPEndpointValue>::marshal (
-    const EndpointPolicy::IIOPEndpointValue_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return ::CORBA::Object::marshal (p, cdr);
-}
-
-EndpointPolicy::IIOPEndpointValue::IIOPEndpointValue (void)
-{}
-
-EndpointPolicy::IIOPEndpointValue::~IIOPEndpointValue (void)
-{}
-
-EndpointPolicy::IIOPEndpointValue_ptr
-EndpointPolicy::IIOPEndpointValue::_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return IIOPEndpointValue::_duplicate (
-      dynamic_cast<IIOPEndpointValue_ptr> (_tao_objref)
-    );
-}
-
-EndpointPolicy::IIOPEndpointValue_ptr
-EndpointPolicy::IIOPEndpointValue::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return IIOPEndpointValue::_duplicate (
-      dynamic_cast<IIOPEndpointValue_ptr> (_tao_objref)
-    );
-}
-
-EndpointPolicy::IIOPEndpointValue_ptr
-EndpointPolicy::IIOPEndpointValue::_duplicate (IIOPEndpointValue_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-EndpointPolicy::IIOPEndpointValue::_tao_release (IIOPEndpointValue_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-::CORBA::Boolean
-EndpointPolicy::IIOPEndpointValue::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:EndpointPolicy/EndpointValueBase:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:EndpointPolicy/IIOPEndpointValue: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* EndpointPolicy::IIOPEndpointValue::_interface_repository_id (void) const
-{
-  return "IDL:EndpointPolicy/IIOPEndpointValue:1.0";
-}
-
-::CORBA::Boolean
-EndpointPolicy::IIOPEndpointValue::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValueC.h b/TAO/tao/EndpointPolicy/IIOPEndpointValueC.h
deleted file mode 100644
index 2ccc247bd8e..00000000000
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValueC.h
+++ /dev/null
@@ -1,230 +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:155
-
-#ifndef _TAO_IDL_IIOPENDPOINTVALUEC_H_
-#define _TAO_IDL_IIOPENDPOINTVALUEC_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/EndpointPolicy/EndpointPolicy_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/Versioned_Namespace.h"
-
-#include "tao/EndpointPolicy/EndpointPolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_EndpointPolicy_Export
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:49
-
-namespace EndpointPolicy
-{
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:646
-
-#if !defined (_ENDPOINTPOLICY_IIOPENDPOINTVALUE__VAR_OUT_CH_)
-#define _ENDPOINTPOLICY_IIOPENDPOINTVALUE__VAR_OUT_CH_
-
-  class IIOPEndpointValue;
-  typedef IIOPEndpointValue *IIOPEndpointValue_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        IIOPEndpointValue
-      >
-    IIOPEndpointValue_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        IIOPEndpointValue
-      >
-    IIOPEndpointValue_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_ENDPOINTPOLICY_IIOPENDPOINTVALUE_CH_)
-#define _ENDPOINTPOLICY_IIOPENDPOINTVALUE_CH_
-
-  class TAO_EndpointPolicy_Export IIOPEndpointValue
-    : public virtual ::EndpointPolicy::EndpointValueBase
-  {
-  public:
-    typedef IIOPEndpointValue_ptr _ptr_type;
-    typedef IIOPEndpointValue_var _var_type;
-
-    // The static operations.
-    static IIOPEndpointValue_ptr _duplicate (IIOPEndpointValue_ptr obj);
-
-    static void _tao_release (IIOPEndpointValue_ptr obj);
-
-    static IIOPEndpointValue_ptr _narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static IIOPEndpointValue_ptr _unchecked_narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static IIOPEndpointValue_ptr _nil (void)
-    {
-      return static_cast<IIOPEndpointValue_ptr> (0);
-    }
-
-
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual char * host (
-        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 host (
-        const char * host
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::UShort port (
-        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 port (
-        ::CORBA::UShort port
-        ACE_ENV_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.
-    IIOPEndpointValue (void);
-
-    virtual ~IIOPEndpointValue (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    IIOPEndpointValue (const IIOPEndpointValue &);
-
-    void operator= (const IIOPEndpointValue &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:78
-
-} // module EndpointPolicy
-
-// TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:62
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_ENDPOINTPOLICY_IIOPENDPOINTVALUE__TRAITS_)
-#define _ENDPOINTPOLICY_IIOPENDPOINTVALUE__TRAITS_
-
-  template<>
-  struct TAO_EndpointPolicy_Export Objref_Traits< ::EndpointPolicy::IIOPEndpointValue>
-  {
-    static ::EndpointPolicy::IIOPEndpointValue_ptr duplicate (
-        ::EndpointPolicy::IIOPEndpointValue_ptr
-      );
-    static void release (
-        ::EndpointPolicy::IIOPEndpointValue_ptr
-      );
-    static ::EndpointPolicy::IIOPEndpointValue_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::EndpointPolicy::IIOPEndpointValue_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/EndpointPolicy/IIOPEndpointValue_i.cpp b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
deleted file mode 100644
index 299f53bcb28..00000000000
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/EndpointPolicy/IIOPEndpointValue_i.h"
-#include "tao/IIOP_Endpoint.h"
-#include "tao/IIOP_Acceptor.h"
-#include "ace/OS_NS_strings.h"
-
-ACE_RCSID (IIOPEndpointValue,
-           IIOPEndpointValue_i,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-IIOPEndpointValue_i::IIOPEndpointValue_i ()
-  :host_(CORBA::string_dup("")),
-   port_(0)
-{
-}
-
-IIOPEndpointValue_i::IIOPEndpointValue_i (const char *host,
-                                          CORBA::UShort port)
-  :host_(host),
-   port_(port)
-{
-}
-
-IIOPEndpointValue_i::~IIOPEndpointValue_i (void)
-{
-}
-
-CORBA::Boolean
-IIOPEndpointValue_i::is_equivalent (const TAO_Endpoint * endpoint) const
-{
-  const TAO_IIOP_Endpoint *iep =
-    dynamic_cast<const TAO_IIOP_Endpoint *>(endpoint);
-  if (iep == 0)
-    return 0;
-  return this->is_equivalent_i(iep->port(), iep->host());
-}
-
-CORBA::Boolean
-IIOPEndpointValue_i::is_equivalent_i (CORBA::UShort port,
-                                      const char *host) const
-{
-  return
-    this->port_ == port && ACE_OS::strcasecmp(host, this->host_.in()) == 0;
-}
-
-CORBA::Boolean
-IIOPEndpointValue_i::validate_acceptor(TAO_Acceptor * acceptor) const
-{
-  TAO_IIOP_Acceptor *iacc = dynamic_cast<TAO_IIOP_Acceptor *>(acceptor);
-  if (iacc == 0)
-    return 0;
-
-#if 0
-  // @@@ mesnier_p@ociweb.com @@@
-  // This test was originally intended to validate that there is an
-  // acceptor available which supports the target endpoint. However,
-  // variablility in the definition of a "hostname" makes this hard
-  // to determine, without adding more overhead, probably to the
-  // IIOP_Acceptor class.
-  // I'm not sure this level of validation is really required, so
-  // for now I'm just leaving it out.
-
-  const ACE_INET_Addr * eps = iacc->endpoints ();
-  CORBA::ULong eps_count = iacc->endpoint_count ();
-  for (CORBA::ULong eps_idx = 0; eps_idx < eps_count; ++ eps_idx)
-    {
-      char hostname[513];
-      eps[eps_idx].get_host_name(hostname,512);
-      if (this->is_equivalent_i(eps[eps_idx].get_port_number(),hostname))
-        return 1;
-    }
-  return 0;
-#else
-  return 1;
-#endif /* 0 */
-}
-
-char *
-IIOPEndpointValue_i::host ( void )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->host_.in());
-}
-
-void
-IIOPEndpointValue_i::host (const char *h)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->host_ = h;
-}
-
-CORBA::UShort
-IIOPEndpointValue_i::port (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->port_;
-}
-
-void
-IIOPEndpointValue_i::port (CORBA::UShort p )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->port_ = p;
-}
-
-
-CORBA::ULong
-IIOPEndpointValue_i::protocol_tag (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return IOP::TAG_INTERNET_IOP;
-}
-
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h b/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
deleted file mode 100644
index 254841b7954..00000000000
--- a/TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file     IIOPEndpointValue_i.h
- *
- *  $Id$
- *
- *  Implementation of the IIOP-Specific endpoint policy value
- *
- *  @author  Phil Mesnier <mesnier_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef _TAO_IIOP_ENDPOINT_VALUE_I_H_
-#define _TAO_IIOP_ENDPOINT_VALUE_I_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/EndpointPolicy/EndpointPolicy_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/EndpointPolicy/IIOPEndpointValueC.h"
-#include "tao/EndpointPolicy/Endpoint_Value_Impl.h"
-#include "tao/LocalObject.h"
-
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class IIOPEndpointValue_i
- *
- * @brief Implementation of the IIOP-Specific endpoint policy value
- *
- * This class is used by applications to create an instance of an
- * endpoint value for constructing an EndpointPolicy. While the
- * endpoint policy argument is of type
- * EndpointPolicy::EndpointValueBase, always use instances of this
- * type so that the endpoint policy framework is able to call the
- * equivalency test method.
- */
-
-class TAO_EndpointPolicy_Export  IIOPEndpointValue_i :
-  public virtual EndpointPolicy::IIOPEndpointValue,
-  public virtual TAO_Endpoint_Value_Impl,
-  public virtual CORBA::LocalObject
-{
-public:
-
-  /// Default Constructor. It is acceptable to create an empty value
-  /// and modify the state via the attributes.
-  IIOPEndpointValue_i ();
-
-  /// Value initializing constructor, this is typically for creation
-  /// of one-off values.
-  IIOPEndpointValue_i (const char *host,
-                       CORBA::UShort port);
-
-  virtual ~IIOPEndpointValue_i (void);
-
-  /// The is_equivalent test is used by the endpoint policy framework
-  /// for testing if a target endpoint is the same as the endpoint
-  /// defined by this value.
-  CORBA::Boolean is_equivalent (const TAO_Endpoint * endpoint) const;
-
-  /// The validate_acceptor method is used during EndpointPolicy
-  /// creation to ensure there is an acceptor which provides this
-  /// endpoint. Currently the test is limited to only validating that
-  /// the acceptor's tag is consistent, as the interfaces do not yet
-  /// exist for examining the eventual TAO_Endpoint values the
-  /// acceptor would produce.
-  CORBA::Boolean validate_acceptor (TAO_Acceptor *) const;
-
-  /// Host attribute get/set operators.
-  char * host ( void )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void host (const char *)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Port attribute get/set operators.
-  CORBA::UShort port (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void port (CORBA::UShort )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // Protocol tag get operator, inherited from EndpointValueBase
-  CORBA::ULong protocol_tag (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::Boolean is_equivalent_i (CORBA::UShort port, const char *host) const;
-
-  CORBA::String_var host_;
-  CORBA::UShort     port_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* _TAO_IIOP_ENDPOINT_VALUE_I_H_ */
diff --git a/TAO/tao/EndpointPolicy/TAO_EndpointPolicy.pc.in b/TAO/tao/EndpointPolicy/TAO_EndpointPolicy.pc.in
deleted file mode 100644
index aae5ef22117..00000000000
--- a/TAO/tao/EndpointPolicy/TAO_EndpointPolicy.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_EndpointPolicy
-Description: TAO EndpointPolicy Library
-Requires: TAO_PI, TAO_PortableServer, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_EndpointPolicy
-Cflags: -I${includedir}
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 62b2ef0b142..a8c13eaa997 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -189,7 +189,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 +202,11 @@ 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/Exception.cpp b/TAO/tao/Exception.cpp
index 16f65716ead..e3e1deb2d4e 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -94,21 +94,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)
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 08c631d3521..430b6242339 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -139,15 +139,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.
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index b092eea96be..b297b933f86 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -46,7 +46,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)
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 7a044309c89..8d266a30a21 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1630,12 +1630,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)
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index a3c30058d59..80336ad5680 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -1653,10 +1653,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)
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 8663c1118c3..11c2d1ccafb 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -468,7 +468,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_;
     }
@@ -677,7 +677,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 ()));
         }
     }
@@ -1130,7 +1130,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
         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);
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index d65d0ae017d..7073a6523fc 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -89,8 +89,6 @@ TAO_IIOP_Connection_Handler::open (void*)
     this->orb_core ()->orb_params ()->nodelay ();
   protocol_properties.keep_alive_ =
     this->orb_core ()->orb_params ()->sock_keepalive ();
-  protocol_properties.dont_route_ =
-   this->orb_core ()->orb_params ()->sock_dontroute ();
 
   TAO_Protocols_Hooks *tph =
     this->orb_core ()->get_protocols_hooks ();
@@ -150,21 +148,6 @@ TAO_IIOP_Connection_Handler::open (void*)
         }
     }
 
-#if !defined (ACE_LACKS_SO_DONTROUTE)
-  if (protocol_properties.dont_route_)
-    {
-      if (this->peer ().
-          set_option (SOL_SOCKET,
-                      SO_DONTROUTE,
-                      (void *) &protocol_properties.dont_route_,
-                      sizeof (protocol_properties.dont_route_)) == -1
-          && errno != ENOTSUP)
-        {
-          return -1;
-        }
-    }
-#endif /* ! ACE_LACKS_SO_DONTROUTE */
-
   if (this->transport ()->wait_strategy ()->non_blocking ()
       || this->transport ()->opened_as () == TAO::TAO_SERVER_ROLE)
     {
@@ -186,9 +169,8 @@ TAO_IIOP_Connection_Handler::open (void*)
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::open, ")
-                ACE_TEXT("The local addr is <%s:%d> \n"),
-                local_addr.get_host_addr (),
-                local_addr.get_port_number()));
+                ACE_TEXT("The local addr is <%s> \n"),
+                local_addr. get_host_addr ()));
 
   if (local_addr == remote_addr)
     {
@@ -398,7 +380,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
@@ -496,31 +478,6 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
 
   return 0;
 }
-
-void
-TAO_IIOP_Connection_Handler::abort (void)
-{
-      struct linger lval;
-      lval.l_onoff = 1;
-      lval.l_linger = 0;
-
-      if (this->peer ().set_option(SOL_SOCKET,
-                                   SO_LINGER,
-                                   (void*) &lval,
-                                   sizeof (lval)) == -1)
-        {
-          if (TAO_debug_level)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO (%P|%t) Unable to set ")
-                          ACE_TEXT ("SO_LINGER on %d\n"),
-                          this->peer ().get_handle ()));
-            }
-        }
-}
-
-
-
 //@@ CONNECTION_HANDLER_SPL_COPY_HOOK_END
 /*
  * End copy hook
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index 16f647affa0..08e2b7478af 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -109,11 +109,6 @@ public:
 
   virtual int open_handler (void *);
 
-  /// This is used during a canceled connection attempt. Force the
-  /// SO_LINGER timeout to 0 so that when the peer is closed, it won't
-  /// hang around.
-  void abort (void);
-
 protected:
 
   /// Constructor that could be used by the derived classes.
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 8756adac2bb..91cd5db0599 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -10,14 +10,11 @@
 #include "tao/Connect_Strategy.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Profile_Transport_Resolver.h"
-#include "tao/Base_Transport_Property.h"
 #include "tao/Transport.h"
 #include "tao/Wait_Strategy.h"
 #include "tao/SystemException.h"
-#include "tao/LF_Multi_Event.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
-#include "ace/OS_NS_time.h"
 
 ACE_RCSID (tao,
            IIOP_Connector,
@@ -25,51 +22,6 @@ ACE_RCSID (tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
-
-//-----------------------------------------------------------------------------
-
-/**
- * @class TAO_Event_Handler_Array_var
- *
- * @brief Auto pointer like class for an array of Event Handlers.
- *
- * Used to manage lifecycle of handlers. This class calls
- * ACE_Event_Handler::remove_reference() on each handler in its destructor
- * This class started out life as a replacement for the ACE_Event_Handle_var
- * but is now pared down to be very specific in its role..
- */
-class TAO_IIOP_Connection_Handler_Array_Guard
-{
-public:
-  TAO_IIOP_Connection_Handler_Array_Guard (TAO_IIOP_Connection_Handler **p, unsigned count);
-  ~TAO_IIOP_Connection_Handler_Array_Guard (void);
-
-private:
-  /// Handler.
-  TAO_IIOP_Connection_Handler **ptr_;
-  unsigned count_;
-};
-
-TAO_IIOP_Connection_Handler_Array_Guard::TAO_IIOP_Connection_Handler_Array_Guard (TAO_IIOP_Connection_Handler **p,
-                                                          unsigned count)
-  : ptr_ (p),
-    count_ (count)
-{
-}
-
-TAO_IIOP_Connection_Handler_Array_Guard::~TAO_IIOP_Connection_Handler_Array_Guard (void)
-{
-  if (this->ptr_ != 0)
-    {
-      for (unsigned i = 0; i < this->count_; i++)
-        this->ptr_[i]->remove_reference ();
-    }
-}
-
-//---------------------------------------------------------------------------
-
-
 TAO_IIOP_Connector::~TAO_IIOP_Connector (void)
 {
 }
@@ -129,12 +81,6 @@ TAO_IIOP_Connector::close (void)
 }
 
 int
-TAO_IIOP_Connector::supports_parallel_connects(void) const
-{
-  return 1;
-}
-
-int
 TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 {
   TAO_IIOP_Endpoint *iiop_endpoint =
@@ -159,8 +105,8 @@ TAO_IIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
        if (TAO_debug_level > 0)
          {
            ACE_DEBUG ((LM_DEBUG,
-                       ACE_TEXT ("(%P|%t) IIOP connection failed.\n")
-                       ACE_TEXT ("     This is most likely ")
+                       ACE_TEXT ("TAO (%P|%t) IIOP connection failed.\n")
+                       ACE_TEXT ("TAO (%P|%t) This is most likely ")
                        ACE_TEXT ("due to a hostname lookup ")
                        ACE_TEXT ("failure.\n")));
          }
@@ -176,124 +122,12 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
                                      TAO_Transport_Descriptor_Interface &desc,
                                      ACE_Time_Value *timeout)
 {
-  TAO_IIOP_Connection_Handler *svc_handler = 0;
   TAO_IIOP_Endpoint *iiop_endpoint =
-    this->remote_endpoint (desc.endpoint());
-  int result = -1;
-  if (iiop_endpoint == 0)
-    return 0;
-
-  result = this->begin_connection (svc_handler, r, iiop_endpoint, timeout);
+    this->remote_endpoint (desc.endpoint ());
 
-  if (result == -1 && errno != EWOULDBLOCK)
-    {
-      // connect completed unsuccessfully
-      svc_handler->remove_reference();
-       // Give users a clue to the problem.
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) IIOP_Connector::make_connection, ")
-                      ACE_TEXT("connection to <%s:%d> failed (%p)\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (iiop_endpoint->host ()),
-                      iiop_endpoint->port (),
-                      ACE_TEXT("errno")));
-        }
+  if (iiop_endpoint == 0)
     return 0;
-    }
-  TAO_IIOP_Connection_Handler **sh_ptr = &svc_handler;
-  TAO_IIOP_Endpoint **ep_ptr = &iiop_endpoint;
-  TAO_LF_Multi_Event mev;
-  mev.add_event(svc_handler);
-  return this->complete_connection (result, sh_ptr, ep_ptr, 1U, r, &mev,  timeout);
-}
 
-TAO_Transport *
-TAO_IIOP_Connector::make_parallel_connection (TAO::Profile_Transport_Resolver *r,
-                                     TAO_Transport_Descriptor_Interface &desc,
-                                     ACE_Time_Value *timeout)
-{
-  TAO_Endpoint *root_ep = desc.endpoint();
-  unsigned max_count = 1;
-  unsigned long ns_stagger =
-    this->orb_core()->orb_params()->parallel_connect_delay();
-  unsigned long sec_stagger = ns_stagger/1000;
-  ns_stagger = (ns_stagger % 1000) * 1000000;
-  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0);
-       ep != 0;
-       ep = ep->next_filtered(this->orb_core(),root_ep))
-    max_count++;
-
-  if (TAO_debug_level > 2)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::")
-                ACE_TEXT ("make_parallel_connection, ")
-                ACE_TEXT ("to %d endpoints\n"), max_count));
-  TAO_IIOP_Endpoint **eplist = 0;
-  TAO_IIOP_Connection_Handler **shlist = 0;
-  ACE_NEW_RETURN (shlist,TAO_IIOP_Connection_Handler *[max_count], 0);
-  ACE_NEW_RETURN (eplist, TAO_IIOP_Endpoint *[max_count], 0);
-
-  TAO_LF_Multi_Event mev;
-  int result = 0;
-  unsigned count = 0;
-  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0);
-       ep != 0;
-       ep = ep->next_filtered(this->orb_core(),root_ep))
-    {
-      eplist[count] = this->remote_endpoint (ep);
-      shlist[count] = 0;
-      result = this->begin_connection (shlist[count],
-                                       r,
-                                       eplist[count],
-                                       timeout);
-
-      // The connection may fail because it is slow, or for other reasons.
-      // If it was an incomplete non-blocking connection, add it to the list
-      // to be waited on, otherwise remove the reference to the handler and
-      // move on to the next endpoint.
-      if (result == -1)
-        {
-          if (errno == EWOULDBLOCK)
-            {
-              mev.add_event(shlist[count++]);
-              if (ep->next() != 0)
-                {
-                  struct timespec nsleep = {sec_stagger, ns_stagger};
-                  ACE_OS::nanosleep (&nsleep);
-                  result = this->active_connect_strategy_->poll (&mev);
-                  if (result != -1)
-                    break;
-                }
-            }
-          else
-            {
-              shlist[count]->remove_reference(); // done bump the list count
-            }
-          continue;
-        }
-
-      if (result != -1) // we have a winner!
-        {
-          count++;
-          break; // no waiting involved since a connection is completed
-        }
-    }
-
-  TAO_Transport *winner = 0;
-  if (count > 0) // only complete if at least one pending or success
-    winner = this->complete_connection (result,shlist,eplist,count,r,&mev,timeout);
-  delete [] shlist; // reference reductions should have been done already
-  delete [] eplist;
-  return winner;
-}
-
-int
-TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler,
-                                      TAO::Profile_Transport_Resolver *r,
-                                      TAO_IIOP_Endpoint *iiop_endpoint,
-                                      ACE_Time_Value *timeout)
-{
   const ACE_INET_Addr &remote_address =
     iiop_endpoint->object_addr ();
 
@@ -312,9 +146,9 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler,
 
   if (TAO_debug_level > 2)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::begin_connection, ")
-                ACE_TEXT ("to <%s:%d> which should %s\n"),
-                ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()),
+                "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                "to <%s:%d> which should %s\n",
+                ACE_TEXT_TO_TCHAR_IN(iiop_endpoint->host()),
                 iiop_endpoint->port(),
                 r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock")));
 
@@ -333,7 +167,7 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler,
       timeout = &tmp_zero;
     }
 
-  svc_handler = 0;
+  TAO_IIOP_Connection_Handler *svc_handler = 0;
 
   int result =
     this->base_connector_.connect (svc_handler,
@@ -359,124 +193,62 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler,
   // once the connect() returns since this might be too late if
   // another thread pick up the completion and potentially deletes the
   // handler before we get a chance to increment the reference count.
-  return result;
-}
 
-TAO_Transport *
-TAO_IIOP_Connector::complete_connection (int result,
-                                         TAO_IIOP_Connection_Handler **&sh_list,
-                                         TAO_IIOP_Endpoint **ep_list,
-                                         unsigned count,
-                                         TAO::Profile_Transport_Resolver *r,
-                                         TAO_LF_Multi_Event *mev,
-                                         ACE_Time_Value *timeout)
-{
-  // Make sure that we always do a remove_reference for every member
-  // of the list
-  TAO_IIOP_Connection_Handler_Array_Guard svc_handler_auto_ptr (sh_list,count);
-  TAO_Transport *transport  = 0;
-  TAO_Transport **tlist = 0;
-  ACE_NEW_RETURN (tlist,TAO_Transport*[count],0);
-
-  //  populate the transport list
-  for (unsigned i = 0; i < count; i++)
-    tlist[i] = sh_list[i]->transport();
-
-  if (result != -1)
-    {
-      // We received a compeleted connection and 0 or more pending.
-      // the winner is the last member of the list, because the
-      // iterator stopped on a successful connect.
-      transport = tlist[count-1];
-    }
-  else
+  // Make sure that we always do a remove_reference
+  ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
+
+  TAO_Transport *transport = svc_handler->transport ();
+
+  if (result == -1)
     {
-          if (count == 1)
+      // No immediate result, wait for completion
+      if (errno == EWOULDBLOCK)
         {
-              transport = tlist[0];
+          // Try to wait until connection completion. Incase we block, then we
+          // get a connected transport or not. In case of non block we get
+          // a connected or not connected transport
           if (!this->wait_for_connection_completion (r,
                                                      transport,
                                                      timeout))
             {
               if (TAO_debug_level > 2)
-                    ACE_ERROR ((LM_ERROR,
-                                ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::")
-                                ACE_TEXT ("complete_connection, wait for completion ")
-                                ACE_TEXT ("failed for 1 pending connect\n")));
+                ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - IIOP_Connector::"
+                                      "make_connection, "
+                                      "wait for completion failed\n"));
             }
         }
       else
         {
-              if (!this->wait_for_connection_completion (r,
-                                                         transport,
-                                                         tlist,
-                                                         count,
-                                                         mev,
-                                                         timeout))
-                {
-                  if (TAO_debug_level > 2)
-                    ACE_ERROR ((LM_ERROR,
-                                ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::")
-                                ACE_TEXT ("complete_connection, wait for completion ")
-                                ACE_TEXT ("failed for %d pending connects\n"),
-                                count));
-                }
-            }
-        }
-  // At this point, the connection has be successfully created
-  // connected or not connected, but we have a connection.
-  TAO_IIOP_Connection_Handler *svc_handler = 0;
-  TAO_IIOP_Endpoint *iiop_endpoint = 0;
-
-  if (transport != 0)
-        {
-      for (unsigned i = 0; i < count; i++)
-        {
-          if (transport == tlist[i])
-            {
-              svc_handler = sh_list[i];
-              iiop_endpoint = ep_list[i];
-              break;
-        }
+          // Transport is not usable
+          transport = 0;
         }
     }
 
-
-  // Done with the transport list
-  delete [] tlist;
-
   // In case of errors transport is zero
   if (transport == 0)
     {
       // Give users a clue to the problem.
       if (TAO_debug_level > 3)
-        {
-          for (unsigned i = 0; i < count; i++)
           ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) IIOP_Connector::make_connection, ")
-                        ACE_TEXT("connection to <%s:%d> failed (%p)\n"),
-                        ACE_TEXT_CHAR_TO_TCHAR (ep_list[i]->host ()),
-                        ep_list[i]->port (),
+                      "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                      "connection to <%s:%d> failed (%p)\n",
+                      iiop_endpoint->host (), iiop_endpoint->port (),
                       ACE_TEXT("errno")));
-        }
 
       return 0;
     }
 
-
+  // At this point, the connection has be successfully created
+  // connected or not connected, but we have a connection.
   if (TAO_debug_level > 2)
-    {
     ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - IIOP_Connector::make_connection, ")
-                  ACE_TEXT ("new %s connection to <%s:%d> on Transport[%d]\n"),
-                  transport->is_connected() ?
-                  ACE_TEXT("connected") : ACE_TEXT("not connected"),
-                  ACE_TEXT_CHAR_TO_TCHAR (iiop_endpoint->host ()),
+                "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                "new %s connection to <%s:%d> on Transport[%d]\n",
+                transport->is_connected() ? "connected" : "not connected",
+                iiop_endpoint->host (),
                 iiop_endpoint->port (),
                 svc_handler->peer ().get_handle ()));
-    }
 
-  TAO_Base_Transport_Property desc(iiop_endpoint,0);
   // Add the handler to Cache
   int retval =
     this->orb_core ()->lane_resources ().transport_cache ().cache_transport (
@@ -492,8 +264,8 @@ TAO_IIOP_Connector::complete_connection (int result,
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) IIOP_Connector::make_connection, ")
-                      ACE_TEXT ("could not add new connection to cache\n")));
+                      "TAO (%P|%t) - IIOP_Connector::make_connection, "
+                      "could not add the new connection to cache\n"));
         }
 
       return 0;
@@ -513,9 +285,9 @@ TAO_IIOP_Connector::complete_connection (int result,
 
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) IIOP_Connector [%d]::make_connection, ")
-                    ACE_TEXT ("could not register the transport ")
-                    ACE_TEXT ("in the reactor.\n"),
+                    "TAO (%P|%t) - IIOP_Connector [%d]::make_connection, "
+                    "could not register the transport "
+                    "in the reactor.\n",
                     transport->id ()));
 
       return 0;
@@ -623,15 +395,10 @@ TAO_IIOP_Connector::cancel_svc_handler (
 
   // Cancel from the connector
   if (handler)
-    {
-      handler->abort();
     return this->base_connector_.cancel (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 c1026010a09..f465814dbc6 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -90,23 +90,12 @@ public:
   //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_END
 
 protected:
-  /// A flag indicating the actual connector supports parallel
-  /// connection attempts. The base implementation always returns
-  /// 0. Override to return non-zero if parallel connection attempts
-  /// may be tried.
-  virtual int supports_parallel_connects (void) const;
 
   // = The TAO_Connector methods, please check the documentation on
   // Transport_Connector.h
   int set_validate_endpoint (TAO_Endpoint *ep);
 
-  virtual TAO_Transport *make_connection (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface &desc,
-      ACE_Time_Value *timeout = 0);
-
-  virtual TAO_Transport *make_parallel_connection (
-      TAO::Profile_Transport_Resolver *r,
+  TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r,
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
@@ -129,26 +118,6 @@ protected:
   const bool lite_flag_;
 
 private:
-  /// This is the first half of making a connection. Both make_connection
-  /// and make_parallel_connection will start out using begin_connection.
-  int begin_connection (TAO_IIOP_Connection_Handler *&svc_handler,
-                        TAO::Profile_Transport_Resolver *r,
-                        TAO_IIOP_Endpoint *endpoint,
-                        ACE_Time_Value *timeout = 0);
-
-  /// This is the second half of making a connection when several endpoints
-  /// are involved. This works with modified wait strategies to wait for one
-  /// of many transports, and when once completes it will cancel the rest.
-  /// The winning transport is returned.
-  TAO_Transport *complete_connection (int result,
-                                      TAO_IIOP_Connection_Handler **&sh_list,
-                                      TAO_IIOP_Endpoint **ep_list,
-                                      unsigned count,
-                                      TAO::Profile_Transport_Resolver *r,
-                                      TAO_LF_Multi_Event *mev,
-                                      ACE_Time_Value *timeout = 0);
-
-
 
   /// Return the remote endpoint, a helper function
   TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index ac13a05101a..2ca751b4ba2 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -109,22 +109,6 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
 //@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
 
 
-TAO_IIOP_Endpoint &
-TAO_IIOP_Endpoint::operator= (const TAO_IIOP_Endpoint &other)
-{
-  this->host_ = other.host_;
-  this->port_ = other.port_;
-#if defined (ACE_HAS_IPV6)
-  this->is_ipv6_decimal_ = other.is_ipv6_decimal_;
-#endif /* ACE_HAS_IPV6 */
-  this->is_encodable_  = other.is_encodable_;
-  this->object_addr_set_ = other.object_addr_set_;
-  this->object_addr_ = other.object_addr_;
-  this->preferred_path_ = other.preferred_path_;
-  this->next_ = 0; // do not copy list membership, since we are only cloning the values
-  return *this;
-}
-
 TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint (void)
 {
 }
@@ -244,70 +228,6 @@ TAO_IIOP_Endpoint::next (void)
 }
 
 TAO_Endpoint *
-TAO_IIOP_Endpoint::next_filtered (TAO_ORB_Core * orb_core, TAO_Endpoint *root)
-{
-  bool want_ipv6 = false;
-  bool ipv6_only = false;
-  bool prefer_ipv6 = false;
-#if defined (ACE_HAS_IPV6)
-  want_ipv6 = 1;
-  ipv6_only = orb_core->orb_params()->connect_ipv6_only();
-  prefer_ipv6 = orb_core->orb_params()->prefer_ipv6_interfaces();
-#else
-  ACE_UNUSED_ARG (orb_core);
-#endif /* ACE_HAS_IPV6 */
-  return
-    this->next_filtered_i (static_cast<TAO_IIOP_Endpoint *>(root),
-                           ipv6_only,
-                           prefer_ipv6,
-                           want_ipv6);
-}
-
-TAO_IIOP_Endpoint*
-TAO_IIOP_Endpoint::next_filtered_i (TAO_IIOP_Endpoint *root,
-                                    bool ipv6_only,
-                                    bool prefer_ipv6,
-                                    bool want_ipv6)
-{
-  TAO_IIOP_Endpoint *candidate = (root == 0) ? this : next_;
-
-#if defined (ACE_HAS_IPV6)
-  if (ipv6_only)
-    {
-      if (candidate == 0 || candidate->is_ipv6_decimal())
-        return candidate;
-      const ACE_INET_Addr &addr = candidate->object_addr ();
-      bool allowed = addr.get_type () == AF_INET6 &&
-        !addr.is_ipv4_mapped_ipv6();
-
-      return allowed ? candidate :
-        candidate->next_filtered_i(root, ipv6_only, prefer_ipv6, true);
-    }
-  if (prefer_ipv6)
-    {
-      if (candidate == 0)
-        return !want_ipv6 ? candidate :
-          candidate->next_filtered_i(root, ipv6_only, prefer_ipv6, false);
-
-      if (want_ipv6 == candidate->is_ipv6_decimal())
-        return candidate;
-
-      const ACE_INET_Addr &addr = candidate->object_addr ();
-      bool really_ipv6 = addr.get_type () == AF_INET6 &&
-                         !addr.is_ipv4_mapped_ipv6();
-      return (want_ipv6 == really_ipv6) ? candidate :
-        candidate->next_filtered_i(root, ipv6_only, prefer_ipv6, want_ipv6);
-    }
-#else
-  ACE_UNUSED_ARG (want_ipv6);
-  ACE_UNUSED_ARG (ipv6_only);
-  ACE_UNUSED_ARG (prefer_ipv6);
-#endif
-
-  return candidate;
-}
-
-TAO_Endpoint *
 TAO_IIOP_Endpoint::duplicate (void)
 {
   TAO_IIOP_Endpoint *endpoint = 0;
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index fff92575b94..73fda040cd1 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -85,23 +85,6 @@ public:
 
   virtual TAO_Endpoint *next (void);
 
-  /**
-   * Return the next endpoint in the list, but use protocol-specific
-   * filtering to constrain the value. The orb core is needed to supply
-   * any sort of filter arguments, and the root endpoint is needed in case
-   * the algorithm needs to rewind. If the supplied root is 0, then this
-   * is assumed to be the candidate next endpoint.
-   *
-   * To use this, the caller starts off the change with root == 0. This
-   * is a bit of a violation in logic, a more correct implementation would
-   * accept this == 0 and a non-null root.
-   * To do iteration using next_filtered, do:
-   *   for (TAO_Endpoint *ep = root_endpoint->next_filtered (orb_core, 0);
-   *        ep != 0;
-   *        ep = ep->next_filtered(orb_core, root_endpoint)) { }
-   */
-  virtual TAO_Endpoint *next_filtered (TAO_ORB_Core *, TAO_Endpoint *root);
-
   virtual int addr_to_string (char *buffer, size_t length);
 
   /// Makes a copy of @c this
@@ -152,17 +135,7 @@ public:
 
   //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_END
 
-
-  /// Need to have an assignment operator since the IIOP_Profile class may
-  /// have to reorder its list of endpoints based on filtering by the EndpointPolicy.
-  TAO_IIOP_Endpoint & operator= (const TAO_IIOP_Endpoint& other);
-
 private:
-  TAO_IIOP_Endpoint *next_filtered_i (TAO_IIOP_Endpoint *root,
-                                      bool ipv6_only,
-                                      bool prefer_ipv6,
-                                      bool want_ipv6);
-
 
   //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_START
 
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 4866b52a071..93bc39cbd7d 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -202,16 +202,13 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
     {
       // A port number or port name was specified.
       CORBA::ULong length_port = okd - cp_pos - 1;
+
       CORBA::String_var tmp = CORBA::string_alloc (length_port);
 
       ACE_OS::strncpy (tmp.inout (), cp_pos + 1, length_port);
       tmp[length_port] = '\0';
-      if (length_port == 0)
-        {
-          this->endpoint_.port_ = 2809; // default IIOP port for
-          // parsing corbaloc strings
-        }
-      else if (ACE_OS::strspn (tmp.in (), "1234567890") == length_port)
+
+      if (ACE_OS::strspn (tmp.in (), "1234567890") == length_port)
         {
           this->endpoint_.port_ =
             static_cast<CORBA::UShort> (ACE_OS::atoi (tmp.in ()));
@@ -302,9 +299,6 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
 CORBA::Boolean
 TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 {
-  if (other_profile == this)
-    return 1;
-
   const TAO_IIOP_Profile *op =
     dynamic_cast<const TAO_IIOP_Profile *> (other_profile);
 
@@ -312,10 +306,6 @@ TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
   if (op == 0)
     return 0;
 
-  if (this->count_ == 0 && op->count_ == 0)
-    return 1;
-  if (this->count_ != op->count_)
-    return 0;
   // Check endpoints equivalence.
   const TAO_IIOP_Endpoint *other_endp = &op->endpoint_;
   for (TAO_IIOP_Endpoint *endp = &this->endpoint_;
@@ -382,65 +372,6 @@ TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp)
   ++this->count_;
 }
 
-void
-TAO_IIOP_Profile::remove_endpoint (TAO_IIOP_Endpoint *endp)
-{
-  if (endp == 0)
-    return;
-
-  // special handling for the target matching the base endpoint
-  if (endp == &this->endpoint_)
-    {
-      if (--this->count_ > 0)
-        {
-          TAO_IIOP_Endpoint* n = this->endpoint_.next_;
-          this->endpoint_ = *n;
-          // since the assignment operator does not copy the next_
-          // pointer, we must do it by hand
-          this->endpoint_.next_ = n->next_;
-          delete n;
-        }
-      return;
-    }
-
-  TAO_IIOP_Endpoint* last = &this->endpoint_;
-  TAO_IIOP_Endpoint* cur = this->endpoint_.next_;
-
-  while (cur != 0)
-  {
-    if (cur == endp)
-      break;
-    last = cur;
-    cur = cur->next_;
-  }
-
-  if (cur != 0)
-  {
-    last->next_ = cur->next_;
-    cur->next_ = 0;
-    --this->count_;
-    delete cur;
-  }
-}
-
-void
-TAO_IIOP_Profile::remove_generic_endpoint (TAO_Endpoint *ep)
-{
-  this->remove_endpoint(dynamic_cast<TAO_IIOP_Endpoint *>(ep));
-}
-
-void
-TAO_IIOP_Profile::add_generic_endpoint (TAO_Endpoint *endp)
-{
-  TAO_IIOP_Endpoint *iep = dynamic_cast<TAO_IIOP_Endpoint *>(endp);
-  if (iep != 0)
-    {
-      TAO_IIOP_Endpoint *clone;
-      ACE_NEW (clone, TAO_IIOP_Endpoint(*iep));
-      this->add_endpoint(clone);
-    }
-}
-
 char *
 TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 03cf95694bd..4c338cbc664 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -77,18 +77,6 @@ public:
    */
   void add_endpoint (TAO_IIOP_Endpoint *endp);
 
-  /**
-   * Remove @a endp from this profile's list of endpoints and free the
-   * @a endp memory.
-   * This method assumes @a endp is in this profile's endpoint list.
-   */
-  void remove_endpoint (TAO_IIOP_Endpoint *endp);
-
-  virtual void remove_generic_endpoint (TAO_Endpoint *ep);
-
-  /// Add an endpoint when the specific endpoint type is unknown
-  virtual void add_generic_endpoint (TAO_Endpoint *ep);
-
   //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_END
 
   /// The object key delimiter that IIOP uses or expects.
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index de6dd91494d..8c9f231166f 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -90,16 +90,14 @@ TAO_IORInfo::add_ior_component_to_profile (
   ACE_CHECK;
 }
 
-char *
+PortableInterceptor::AdapterManagerId
 TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  return poa_manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->poa_->get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableInterceptor::AdapterState
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index 3d4803a6792..d0314b30f7e 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -79,7 +79,7 @@ public:
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * manager_id (
+  virtual PortableInterceptor::AdapterManagerId manager_id (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h
index 488250f84ef..80b0ab75f1d 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.h
+++ b/TAO/tao/IORInterceptor/IORInfoC.h
@@ -160,7 +160,7 @@ namespace PortableInterceptor
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
-    virtual char * manager_id (
+    virtual ::PortableInterceptor::AdapterManagerId manager_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index 5b0df155836..7f78cfe946f 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -235,7 +235,7 @@ namespace PortableInterceptor
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void adapter_manager_state_changed (
-        const char * id,
+        ::PortableInterceptor::AdapterManagerId id,
         ::PortableInterceptor::AdapterState state
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index 4b9bc703257..35cbb376d28 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -109,7 +109,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,
@@ -220,7 +220,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
 
 void
 TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
-      const char * id,
+      PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 5dc289f77d8..6257c699b9a 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -80,7 +80,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
-      const char * id,
+      PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index 5dc955a3393..ea337f5c9f3 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -101,7 +101,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual void adapter_manager_state_changed (
-      const char * id,
+      PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 47fc9c960fe..42be4db0bec 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -124,7 +124,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
         {
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 5221ee8d9c5..bdb493bd648 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -14,7 +14,7 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-  TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void)
 {
@@ -27,10 +27,98 @@ TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void)
 }
 
 void
-TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver *r,
-                                                ACE_Time_Value *max_wait_time
-                                                ACE_ENV_ARG_DECL)
+TAO_Default_Endpoint_Selector::select_endpoint (
+    TAO::Profile_Transport_Resolver *r,
+    ACE_Time_Value *max_wait_time
+    ACE_ENV_ARG_DECL)
 {
+#if defined (ACE_HAS_IPV6)
+  // See if we have IIOP selector preference parameters set.
+  // If so we need to walk a different path in selecting an endpoint.
+  if (r->stub ()->orb_core ()->orb_params ()->prefer_ipv6_interfaces () ||
+      r->stub ()->orb_core ()->orb_params ()->connect_ipv6_only ())
+    {
+      bool test_ipv6 = true;  // first round try IPv6
+
+      for (unsigned test_count = 2; test_count > 0 ;--test_count)
+        {
+          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)
+                    {
+                      // in case we're running the first round:
+                      //   try this endpoint if it either *not* an IIOP endpoint OR
+                      //   if it is an IIOP IPv6 endpoint.
+                      // else
+                      //   only try when it's an IPv4 IIOP endpoint
+                      bool try_ep = test_ipv6;
+
+                      if (r->profile ()->tag () == IOP::TAG_INTERNET_IOP)
+                        {
+                          TAO_IIOP_Endpoint *iep =
+                            dynamic_cast<TAO_IIOP_Endpoint *> (ep);
+                          if (!iep->is_ipv6_decimal ())
+                            {
+                              const ACE_INET_Addr &addr = iep->object_addr ();
+
+                              if (test_ipv6)
+                                try_ep =
+                                  addr.get_type () == AF_INET6 &&
+                                    !addr.is_ipv4_mapped_ipv6();
+                              else
+                                try_ep =
+                                  addr.get_type () == AF_INET ||
+                                    (addr.get_type () == AF_INET6 &&
+                                      addr.is_ipv4_mapped_ipv6());
+                            }
+                        }
+
+                      if (try_ep)
+                        {
+                          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 did not find any suitable non-IPv4 endpoint so
+          // now try those if allowed
+          if (!r->stub ()->orb_core ()->orb_params ()->connect_ipv6_only ())
+            test_ipv6 = false;
+          else
+            break;  // Do not test remaining (if any) IPv4 endpoints
+        }
+    }
+  else
+#endif /* ACE_HAS_IPV6 */
   do
     {
       r->profile (r->stub ()->profile_in_use ());
@@ -39,41 +127,18 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver
       // 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 ()))
+         (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ()))
         {
-          if (r->profile ()->endpoint_count () > 1 &&
-              r->use_parallel_connect())
-            {
-
-              TAO_Endpoint *ep =
-                r->profile ()->endpoint ();
+          size_t const endpoint_count =
+            r->profile ()->endpoint_count ();
 
-              TAO_Base_Transport_Property desc (ep);
-              bool success =
-                r->try_parallel_connect (&desc,
-                                         max_wait_time
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+          TAO_Endpoint * ep =
+            r->profile ()->endpoint ();
 
-              // Check if the connect has completed.
-              if (success)
-                return;
-              // The default implementation of try_parallel_connect returns
-              // a not supported errno. In this case, allow the ordinary
-              // connection mechanism to be tried. OTOH, if the connection
-              // attempt failed for some other reason, then abandon this
-              // profile and try the next one in the list.
-              else if (errno != ENOTSUP)
-                continue;
-            }
-
-          for (TAO_Endpoint *ep = r->profile ()->first_filtered_endpoint ();
-               ep != 0;
-               ep = r->profile ()->next_filtered_endpoint (ep))
+          for (size_t i = 0; i < endpoint_count; ++i)
             {
               TAO_Base_Transport_Property desc (ep);
-              bool retval =
+              bool const retval =
                 r->try_connect (&desc,
                                 max_wait_time
                                 ACE_ENV_ARG_PARAMETER);
@@ -82,13 +147,14 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver
               // 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,
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index bd2c5101889..29b5580d88a 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -99,7 +99,6 @@ public:
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
                                 ACE_Time_Value *val
                                 ACE_ENV_ARG_DECL);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h
index f9adcc5fb1b..2a92f9007ab 100644
--- a/TAO/tao/LF_CH_Event.h
+++ b/TAO/tao/LF_CH_Event.h
@@ -23,8 +23,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class TAO_LF_Multi_Event;
-
 /**
  * @class TAO_LF_CH_Event
  *
@@ -37,15 +35,6 @@ class TAO_LF_Multi_Event;
 class TAO_Export TAO_LF_CH_Event: public TAO_LF_Event
 {
 public:
-  /**
-   * The TAO_LF_Multi_Event class is another specialization of
-   * TAO_LF_Event, used for aggregating many connection handlers into
-   * a single event object.. It requires friendship so that it can
-   * check the is_state_final() flag on each of its contained
-   * connection handlers.
-   */
-  friend class TAO_LF_Multi_Event;
-
   /// Constructor
   TAO_LF_CH_Event (void);
 
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp
index bc401286334..d1d71b550e3 100644
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ b/TAO/tao/LF_Connect_Strategy.cpp
@@ -1,5 +1,4 @@
 #include "tao/LF_Connect_Strategy.h"
-#include "tao/LF_Multi_Event.h"
 #include "tao/Connection_Handler.h"
 #include "tao/LF_Follower.h"
 #include "tao/Leader_Follower.h"
@@ -42,26 +41,41 @@ TAO_LF_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
 }
 
 int
-TAO_LF_Connect_Strategy::wait_i (TAO_LF_Event *ev,
-                                 TAO_Transport *transport,
+TAO_LF_Connect_Strategy::wait (TAO_Connection_Handler *ch,
                                ACE_Time_Value *max_wait_time)
 {
+  ACE_ASSERT (ch != 0);
+
+  return this->wait (ch->transport (),
+                     max_wait_time);
+}
+
+int
+TAO_LF_Connect_Strategy::wait (TAO_Transport *transport,
+                               ACE_Time_Value *max_wait_time)
+{
+  // Basically the connection was EINPROGRESS, but before we could
+  // wait for it some other thread detected a failure and cleaned up
+  // the connection handler.
   if (transport == 0)
     return -1;
 
+  TAO_Connection_Handler *ch =
+    transport->connection_handler ();
+
   TAO_Leader_Follower &leader_follower =
     this->orb_core_->leader_follower ();
 
   int result =
-    leader_follower.wait_for_event (ev,
+    leader_follower.wait_for_event (ch,
                                     transport,
                                     max_wait_time);
 
-  if (ev->error_detected () && result != -1)
+  // Set the result.
+  if (ch->error_detected () && result != -1)
     result = -1;
 
   return result;
 }
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h
index 35e6e514046..4cff8ed7976 100644
--- a/TAO/tao/LF_Connect_Strategy.h
+++ b/TAO/tao/LF_Connect_Strategy.h
@@ -28,7 +28,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class TAO_LF_Event;
+class TAO_Connector;
 
 /**
  * @class TAO_LF_Connect_Strategy
@@ -53,11 +53,13 @@ public:
   virtual void synch_options (ACE_Time_Value *val,
                               ACE_Synch_Options &opt);
 
-protected:
-  virtual int wait_i (TAO_LF_Event *ev,
-                      TAO_Transport *t,
+  virtual int wait (TAO_Connection_Handler *ch,
                     ACE_Time_Value *val);
 
+  virtual int wait (TAO_Transport *ch,
+                    ACE_Time_Value *val);
+
+
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h
index 473fc8a4868..678be63cb3c 100644
--- a/TAO/tao/LF_Event.h
+++ b/TAO/tao/LF_Event.h
@@ -65,15 +65,12 @@ public:
    * method is used to bind the waiting thread to the event, in order
    * to let the event signal any important state changes.
    *
-   * This is virtual to allow the LF_Multi_Event derived type share
-   * the follower with all the subordinate LF_CH_Events.
-   *
    * @return -1 if the LF_Event is already bound, 0 otherwise
    */
-  virtual int bind (TAO_LF_Follower *follower);
+  int bind (TAO_LF_Follower *follower);
 
   /// Unbind the follower
-  virtual int unbind (void);
+  int unbind (void);
 
   //@{
   /** @name State management
diff --git a/TAO/tao/LF_Multi_Event.cpp b/TAO/tao/LF_Multi_Event.cpp
deleted file mode 100644
index c0252cf1bab..00000000000
--- a/TAO/tao/LF_Multi_Event.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "tao/LF_Multi_Event.h"
-#include "tao/Connection_Handler.h"
-#include "ace/OS_Memory.h"
-
-ACE_RCSID(tao,
-          LF_Multi_Event,
-          "$Id$")
-
-TAO_LF_Multi_Event::TAO_LF_Multi_Event (void)
-  : TAO_LF_Event (),
-    events_ (0),
-    winner_ (0)
-{
-}
-
-TAO_LF_Multi_Event::~TAO_LF_Multi_Event (void)
-{
-  while (this->events_ != 0)
-    {
-      Event_Node *n = this->events_->next_;
-      delete this->events_;
-      this->events_ = n;
-    }
-}
-
-int
-TAO_LF_Multi_Event::bind (TAO_LF_Follower *follower)
-{
-  if (this->TAO_LF_Event::bind(follower) == -1)
-    {
-      return -1;
-    }
-
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
-    if (n->ptr_->bind(follower) == -1)
-      {
-        return -1;
-      }
-  return 0;
-}
-
-int
-TAO_LF_Multi_Event::unbind (void)
-{
-  if (this->TAO_LF_Event::unbind() == -1)
-    {
-      return -1;
-    }
-
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
-    if (n->ptr_->unbind() == -1)
-      {
-        return -1;
-      }
-  return 0;
-}
-
-
-void
-TAO_LF_Multi_Event::add_event (TAO_Connection_Handler *ev)
-{
-  Event_Node *node = 0;
-  ACE_NEW (node, Event_Node);
-  node->next_ = this->events_;
-  node->ptr_ = ev;
-
-  this->events_ = node;
-}
-
-TAO_Connection_Handler*
-TAO_LF_Multi_Event::winner (void)
-{
-  return this->winner_;
-}
-
-TAO_Transport *
-TAO_LF_Multi_Event::base_transport (void)
-{
-  return (this->events_ == 0) ? 0 : this->events_->ptr_->transport();
-}
-
-int
-TAO_LF_Multi_Event::successful (void) const
-{
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
-    if (n->ptr_->successful() == 1)
-      {
-        this->winner_ = n->ptr_;
-        return 1;
-      }
-  return 0;
-}
-
-int
-TAO_LF_Multi_Event::error_detected (void) const
-{
-  int result = 1;
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
-    if (n->ptr_->error_detected () == 0)
-      result = 0;
-  return result;
-}
-
-void
-TAO_LF_Multi_Event::state_changed_i (int )
-{
-  // no-op
-}
-
-int
-TAO_LF_Multi_Event::is_state_final (void)
-{
-  int result = 1;
-  for (Event_Node *n = this->events_; n != 0; n = n->next_)
-    if (!n->ptr_->is_state_final () == 0)
-      result = 0;
-  return result;
-}
diff --git a/TAO/tao/LF_Multi_Event.h b/TAO/tao/LF_Multi_Event.h
deleted file mode 100644
index 11727f8ab16..00000000000
--- a/TAO/tao/LF_Multi_Event.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file LF_Multi_Event.h
- *
- *  $Id$
- *
- *  @author Phil Mesnier <mesnier_p@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_LF_MULTI_EVENT_H
-#define TAO_LF_MULTI_EVENT_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/LF_Event.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward decls
-class TAO_Connection_Handler;
-class TAO_Transport;
-
-/**
- * @class TAO_LF_Multi_Event
- *
- * @brief Use the Leader/Follower loop to wait for one specific event
- * in the invocation path.
- *
- * Used by the parallel connection strategy for waiting on one of many
- * connections.
- */
-class TAO_Export TAO_LF_Multi_Event: public TAO_LF_Event
-{
-public:
-  /// Constructor
-  TAO_LF_Multi_Event (void);
-
-  /// Destructor
-  virtual ~TAO_LF_Multi_Event (void);
-
-  /// propogate the follower to all the events in the collection.
-  virtual int bind (TAO_LF_Follower *follower);
-
-  /// Unbind the follower from all the collected events.
-  virtual int unbind (void);
-
-  /// Adds a handler to the collection
-  void add_event (TAO_Connection_Handler *ch);
-
-  /// Returns the connection handler that caused the successful status
-  /// to be returned.
-  TAO_Connection_Handler *winner(void);
-
-  /// Returns the transport associated with the first entry in the collection.
-  TAO_Transport *base_transport(void);
-
-  //@{
-  /// Return 1 if the condition was satisfied successfully, 0 if it
-  /// has not - This iterates over the list of attached events and
-  /// returns 1 if any of them return 1 from successful.
-  int successful (void) const;
-
-  /// Return 1 if an error was detected while waiting for the
-  /// event - This iterates over the list of events and returns
-  /// 1 only if all of them return 1 from error_detected.
-  int error_detected (void) const;
-
-  //@}
-protected:
-
-  /// Validate the state change
-  virtual void state_changed_i (int new_state);
-
-  /// Check whether we have reached the final state..
-  virtual int is_state_final (void);
-
-private:
-
-  struct Event_Node {
-    TAO_Connection_Handler * ptr_;
-    Event_Node *next_;
-  };
-
-  struct Event_Node *events_;
-
-  mutable TAO_Connection_Handler * winner_;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_LF_Multi_EVENT_H */
diff --git a/TAO/tao/LF_Strategy_Complete.inl b/TAO/tao/LF_Strategy_Complete.inl
new file mode 100644
index 00000000000..2a52ea3456a
--- /dev/null
+++ b/TAO/tao/LF_Strategy_Complete.inl
@@ -0,0 +1,12 @@
+// -*- C++ -*-
+//
+// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE
+TAO_LF_Strategy_Complete::TAO_LF_Strategy_Complete (void)
+{
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 6d182f8846b..67daf563367 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -190,7 +190,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 +329,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 +339,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)
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index 94fb9e4dbf0..59e25c0bfb7 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -364,19 +364,4 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL)
   return ret_val;
 }
 
-int
-TAO_MProfile::give_shared_profile (TAO_Profile *pfile)
-{
-  for (unsigned i = 0; i < this->last_; i++)
-    if (pfile->tag() == this->pfiles_[i]->tag() &&
-        pfile->compare_key(this->pfiles_[i]))
-      {
-        this->pfiles_[i]->add_generic_endpoint(pfile->endpoint());
-        pfile->_decr_refcnt();
-        return i;
-      }
-  return this->give_profile(pfile,0);
-}
-
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 7fef351e37c..ba45b3a4a5d 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -140,7 +140,7 @@ public:
 
   /// Return the index of this entry or -1 if it can not be added.
   /// this object assumes ownership of this profile!!
-  int give_profile (TAO_Profile *pfile, int share = 0);
+  int give_profile (TAO_Profile *pfile);
 
   /// append the profiles in pfiles to this object.  The count
   /// will be incremented on the individual profile objects.
@@ -217,12 +217,6 @@ private:
   /// Helper method to implement the destructor
   void cleanup (void);
 
-  /// A helper to give_profile to be used when share is true. This
-  /// method is used primarily to help the corbaloc parser create a
-  /// single profile with multiple endpoints rather than constructing
-  /// multiple profiles with 1 endpoint per.
-  int give_shared_profile (TAO_Profile *pfile);
-
 private:
 
   /**
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
index 2cf4d05d274..b3ebb70abf5 100644
--- a/TAO/tao/MProfile.i
+++ b/TAO/tao/MProfile.i
@@ -142,10 +142,8 @@ TAO_MProfile::rewind (void)
   current_ = 0;
 }
 ACE_INLINE int
-TAO_MProfile::give_profile (TAO_Profile *pfile, int share)
+TAO_MProfile::give_profile (TAO_Profile *pfile)
 {
-  if (share)
-    return this->give_shared_profile(pfile);
   // skip by the used slots
   if (last_ == size_) // full!
     return -1;
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 40e0939707f..8829c8e503c 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -130,7 +130,6 @@ libTAO_la_SOURCES = \
   LF_Follower_Auto_Adder.cpp \
   LF_Follower_Auto_Ptr.cpp \
   LF_Invocation_Event.cpp \
-  LF_Multi_Event.cpp \
   LF_Strategy.cpp \
   LF_Strategy_Complete.cpp \
   LRU_Connection_Purging_Strategy.cpp \
@@ -277,7 +276,6 @@ nobase_include_HEADERS = \
   Any_Insert_Policy_T.h \
   Arg_Traits_T.h \
   Argument.h \
-  Array_Traits_T.h \
   Array_VarOut_T.cpp \
   Array_VarOut_T.h \
   Array_VarOut_T.inl \
@@ -303,16 +301,6 @@ nobase_include_HEADERS = \
   BooleanSeq.pidl \
   BooleanSeqC.h \
   BooleanSeqS.h \
-  Bounded_Array_Allocation_Traits.h \
-  Bounded_Array_Sequence_T.h \
-  Bounded_Basic_String_Sequence_T.h \
-  Bounded_Object_Reference_Sequence_T.h \
-  Bounded_Reference_Allocation_Traits.h \
-  Bounded_Sequence_CDR_T.h \
-  Bounded_String_Sequence_T.h \
-  Bounded_Value_Allocation_Traits_T.h \
-  Bounded_Value_Sequence_T.h \
-  Bounded_Wstring_Sequence_T.h \
   Buffer_Allocator_T.cpp \
   Buffer_Allocator_T.h \
   Buffering_Constraint_Policy.h \
@@ -417,7 +405,6 @@ nobase_include_HEADERS = \
   GIOP_Message_Version.inl \
   GIOP_Utils.h \
   GUIResource_Factory.h \
-  Generic_Sequence_T.h \
   IFR_Client_Adapter.h \
   IIOP.pidl \
   IIOPC.h \
@@ -474,7 +461,6 @@ nobase_include_HEADERS = \
   LF_Follower_Auto_Ptr.h \
   LF_Follower_Auto_Ptr.inl \
   LF_Invocation_Event.h \
-  LF_Multi_Event.h \
   LF_Strategy.h \
   LF_Strategy_Complete.h \
   LRU_Connection_Purging_Strategy.h \
@@ -532,9 +518,6 @@ nobase_include_HEADERS = \
   Object_Proxy_Broker.h \
   Object_Ref_Table.h \
   Object_Ref_Table.inl \
-  Object_Reference_Sequence_Element_T.h \
-  Object_Reference_Traits_Base_T.h \
-  Object_Reference_Traits_T.h \
   Object_T.cpp \
   Object_T.h \
   Objref_VarOut_T.cpp \
@@ -587,7 +570,6 @@ nobase_include_HEADERS = \
   Pseudo_VarOut_T.h \
   Pseudo_VarOut_T.inl \
   Queued_Message.h \
-  Range_Checking_T.h \
   Reactive_Connect_Strategy.h \
   Reactive_Flushing_Strategy.h \
   Refcounted_ObjectKey.h \
@@ -606,7 +588,6 @@ nobase_include_HEADERS = \
   Seq_Var_T.cpp \
   Seq_Var_T.h \
   Seq_Var_T.inl \
-  Sequence_T.h \
   ServerRequestInterceptor_Adapter.h \
   ServerRequestInterceptor_Adapter_Factory.h \
   Server_Strategy_Factory.h \
@@ -628,10 +609,6 @@ nobase_include_HEADERS = \
   StringSeqC.h \
   StringSeqS.h \
   String_Alloc.h \
-  String_Manager_T.h \
-  String_Sequence_Element_T.h \
-  String_Traits_Base_T.h \
-  String_Traits_T.h \
   Stub.h \
   Stub.i \
   Stub_Factory.h \
@@ -695,20 +672,8 @@ nobase_include_HEADERS = \
   UShortSeq.pidl \
   UShortSeqC.h \
   UShortSeqS.h \
-  Unbounded_Array_Allocation_Traits_T.h \
-  Unbounded_Array_Sequence_T.h \
-  Unbounded_Basic_String_Sequence_T.h \
-  Unbounded_Object_Reference_Sequence_T.h \
-  Unbounded_Octet_Sequence_T.h \
-  Unbounded_Reference_Allocation_Traits_T.h \
-  Unbounded_Sequence_CDR_T.h \
-  Unbounded_String_Sequence_T.h \
-  Unbounded_Value_Allocation_Traits_T.h \
-  Unbounded_Value_Sequence_T.h \
-  Unbounded_Wstring_Sequence_T.h \
   UserException.h \
   UserException.inl \
-  Value_Traits_T.h \
   Valuetype_Adapter.h \
   Valuetype_Adapter_Factory.h \
   VarOut_T.cpp \
@@ -1337,7 +1302,6 @@ libTAO_PortableServer_la_CPPFLAGS = \
   -DTAO_PORTABLESERVER_BUILD_DLL
 
 libTAO_PortableServer_la_SOURCES = \
-  PortableServer/Acceptor_Filter_Factory.cpp \
   PortableServer/Active_Object_Map.cpp \
   PortableServer/Active_Object_Map_Entry.cpp \
   PortableServer/Active_Policy_Strategies.cpp \
@@ -1396,8 +1360,6 @@ libTAO_PortableServer_la_SOURCES = \
   PortableServer/Operation_Table_Perfect_Hash.cpp \
   PortableServer/POAManager.cpp \
   PortableServer/POAManagerC.cpp \
-  PortableServer/POAManagerFactory.cpp \
-  PortableServer/POAManagerFactoryC.cpp \
   PortableServer/POA_Cached_Policies.cpp \
   PortableServer/POA_Current.cpp \
   PortableServer/POA_Current_Factory.cpp \
@@ -1467,7 +1429,6 @@ libTAO_PortableServer_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
-  PortableServer/Acceptor_Filter_Factory.h \
   PortableServer/Active_Object_Map.h \
   PortableServer/Active_Object_Map.i \
   PortableServer/Active_Object_Map_Entry.h \
@@ -1564,9 +1525,6 @@ nobase_include_HEADERS += \
   PortableServer/POAManager.i \
   PortableServer/POAManager.pidl \
   PortableServer/POAManagerC.h \
-  PortableServer/POAManagerFactory.h \
-  PortableServer/POAManagerFactory.pidl \
-  PortableServer/POAManagerFactoryC.h \
   PortableServer/POA_Cached_Policies.h \
   PortableServer/POA_Cached_Policies.i \
   PortableServer/POA_Current.h \
@@ -2284,74 +2242,6 @@ EXTRA_DIST += \
   DynamicInterface/TAO_DynamicInterface.rc
 
 
-## Makefile.EndpointPolicy.am
-
-lib_LTLIBRARIES += libTAO_EndpointPolicy.la
-
-libTAO_EndpointPolicy_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DTAO_ENDPOINTPOLICY_BUILD_DLL
-
-libTAO_EndpointPolicy_la_SOURCES = \
-  EndpointPolicy/EndpointPolicy.cpp \
-  EndpointPolicy/EndpointPolicyA.cpp \
-  EndpointPolicy/EndpointPolicyC.cpp \
-  EndpointPolicy/EndpointPolicyTypeA.cpp \
-  EndpointPolicy/EndpointPolicyTypeC.cpp \
-  EndpointPolicy/EndpointPolicy_Factory.cpp \
-  EndpointPolicy/EndpointPolicy_ORBInitializer.cpp \
-  EndpointPolicy/EndpointPolicy_i.cpp \
-  EndpointPolicy/Endpoint_Acceptor_Filter.cpp \
-  EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp \
-  EndpointPolicy/IIOPEndpointValueA.cpp \
-  EndpointPolicy/IIOPEndpointValueC.cpp \
-  EndpointPolicy/IIOPEndpointValue_i.cpp
-
-libTAO_EndpointPolicy_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
-
-libTAO_EndpointPolicy_la_LIBADD = \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS += \
-  EndpointPolicy/EndpointPolicy.h \
-  EndpointPolicy/EndpointPolicyA.h \
-  EndpointPolicy/EndpointPolicyC.h \
-  EndpointPolicy/EndpointPolicyC.inl \
-  EndpointPolicy/EndpointPolicyTypeA.h \
-  EndpointPolicy/EndpointPolicyTypeC.h \
-  EndpointPolicy/EndpointPolicy_Export.h \
-  EndpointPolicy/EndpointPolicy_Factory.h \
-  EndpointPolicy/EndpointPolicy_ORBInitializer.h \
-  EndpointPolicy/EndpointPolicy_i.h \
-  EndpointPolicy/Endpoint_Acceptor_Filter.h \
-  EndpointPolicy/Endpoint_Acceptor_Filter_Factory.h \
-  EndpointPolicy/Endpoint_Value_Impl.h \
-  EndpointPolicy/IIOPEndpointValueA.h \
-  EndpointPolicy/IIOPEndpointValueC.h \
-  EndpointPolicy/IIOPEndpointValue_i.h
-
-pkgconfig_DATA += \
-  TAO_EndpointPolicy.pc
-
-CLEANFILES += \
-  TAO_EndpointPolicy.pc
-
-TAO_EndpointPolicy.pc: ${top_builddir}/config.status ${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/EndpointPolicy/TAO_EndpointPolicy.pc.in
-
-EXTRA_DIST += \
-  EndpointPolicy/TAO_EndpointPolicy.pc.in
-
-
 ## Makefile.ObjRefTemplate.am
 
 lib_LTLIBRARIES += libTAO_ObjRefTemplate.la
diff --git a/TAO/tao/Managed_Types.cpp b/TAO/tao/Managed_Types.cpp
new file mode 100644
index 00000000000..1334d4ac165
--- /dev/null
+++ b/TAO/tao/Managed_Types.cpp
@@ -0,0 +1,73 @@
+// $Id$
+
+#include "tao/Managed_Types.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Managed_Types.i"
+#endif /* __ACE_INLINE__ */
+
+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;
+
+  return *this;
+}
+
+// assignment from String_var
+TAO_SeqElem_String_Manager&
+TAO_SeqElem_String_Manager::operator= (const CORBA::String_var &var)
+{
+  if (this->release_)
+    {
+      CORBA::string_free (*this->ptr_);
+    }
+
+  *this->ptr_ = CORBA::string_dup (var.in ());
+  return *this;
+}
+
+// ****************************************************************
+
+// assignment from CORBA::WString_var makes a copy
+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;
+
+  return *this;
+}
+
+// assignment from WString_var
+TAO_SeqElem_WString_Manager&
+TAO_SeqElem_WString_Manager::operator= (const CORBA::WString_var &var)
+{
+  if (this->release_)
+    {
+      CORBA::wstring_free (*this->ptr_);
+    }
+
+  *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
new file mode 100644
index 00000000000..7d2dde4137d
--- /dev/null
+++ b/TAO/tao/Managed_Types.h
@@ -0,0 +1,383 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Managed_Types.h
+ *
+ *  $Id$
+ *
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
+#ifndef TAO_MANAGED_TYPES_H
+#define TAO_MANAGED_TYPES_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/TAO_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/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
+ *
+ * @brief Manager for strings.
+ *
+ * This class implements the generic string manager and is used in the C++
+ * mapping of "struct" members that are of type "string". The difference
+ * between this class and the CORBA::String_var class is that the default
+ * constructor initializes the underlying string to an empty string in this
+ * class whereas it is a NUL string for the _var class.
+ */
+class TAO_Export TAO_String_Manager
+{
+public:
+
+  /// default CTOR will initialize the underlying ptr_ to empty string.
+  TAO_String_Manager (void);
+
+  /// 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);
+
+  /// assignment from another managed type
+  TAO_String_Manager &operator= (const TAO_String_Manager&);
+
+  /// assignment from var type will make a copy
+  TAO_String_Manager &operator= (const CORBA::String_var&);
+
+  /// assignment from a constant char* will make a copy
+  TAO_String_Manager &operator= (const char *);
+
+  /// assignment from char* will not make a copy. The String_Manager will now
+  /// own the string.
+  TAO_String_Manager &operator= (char *);
+
+  /// cast  (read-only)
+  operator const char*() const;
+
+  /// for in parameter.
+  const char *in (void) const;
+
+  /// for inout parameter.
+  char *&inout (void);
+
+  /// for out parameter.
+  char *&out (void);
+
+  /// for string of return type.
+  char *_retn (void);
+
+private:
+  /// The underlying string
+  char *ptr_;
+
+};
+
+/****************************************************************/
+
+/**
+ * @class TAO_SeqElem_String_Manager
+ *
+ * @brief TAO_SeqElem_String_Manager
+ *
+ * Manager for strings that are the element type of sequences.
+ * Similar to the mapping for sequences of objects (and other
+ * pseudo objects) the mapping for sequences of strings requires
+ * an auxiliar class or <Manager> to handle the allocation and
+ * deallocation of the string.  The main difference with respect
+ * to String_var classes is that automatic release is not
+ * controlled on a per-item basis, but for the sequence as a
+ * whole.  The difference wrt Object_Manager is that strings are
+ * duplicated using CORBA::string_dup () as opposed to
+ * T::_duplicate(), and released using CORBA::string_free()
+ * instead of CORBA::release()
+ * This class implements the generic string manager and is used to
+ * instantiate the proper sequence types.
+ * This class will have the same semantics as the string manager classes
+ * defined earlier with respect to the various assignment
+ * operators. However, the freeing of old storage will be dependent on the
+ * "release" value of the parent sequence class.
+ */
+class TAO_Export TAO_SeqElem_String_Manager
+{
+public:
+  friend class TAO_Unbounded_String_Sequence;
+
+  // @@ Giving friendship to a template is not implemented on several
+  // compilers:
+  // friend template<CORBA::ULong MAX>
+  //   class TAO_Bounded_String_Sequence<TAO_SeqElem_String_Manager,MAX>;
+
+  /// copy constructor
+  TAO_SeqElem_String_Manager (const TAO_SeqElem_String_Manager &);
+
+  /// constructor from address of an element
+  TAO_SeqElem_String_Manager (char **buffer, CORBA::Boolean release);
+
+  /// destructor
+  ~TAO_SeqElem_String_Manager (void);
+
+  /// assignment from another managed type
+  TAO_SeqElem_String_Manager &operator= (const TAO_SeqElem_String_Manager&);
+
+  /// assignment from var type will make a copy
+  TAO_SeqElem_String_Manager &operator= (const CORBA::String_var&);
+
+  /// assignment from a constant char* will make a copy
+  TAO_SeqElem_String_Manager &operator= (const char *);
+
+  /// assignment from char* will not make a copy. The SeqElem_String_Manager will now
+  /// own the string.
+  TAO_SeqElem_String_Manager &operator= (char *);
+
+  /// cast  (read-only)
+  operator const char*() const;
+
+  /// for in parameter.
+  const char *in (void) const;
+
+  /// for inout parameter.
+  char *&inout (void);
+
+  /// for out parameter.
+  char *&out (void);
+
+  /// for string of return type.
+  char *_retn (void);
+
+private:
+  /// Address of string element from the parent's buffer.
+  char **ptr_;
+
+  /// control memory managment semantics.
+  CORBA::Boolean release_;
+
+  // following are now allowed since these managed class will be used only by
+  // the [] operator of the sequence class. The [] operator will not use the
+  // following ctors to instantiate the managed instance
+
+  /// default ctor
+  TAO_SeqElem_String_Manager (void);
+
+};
+
+// ****************************************************************
+
+/**
+ * @class TAO_WString_Manager
+ *
+ * @brief Manager for wide strings.
+ *
+ * This class implements the generic wstring manager and is used
+ * in the C++ mapping of "struct" members that are of type
+ * "wstring".
+ * The difference between this class and the CORBA::WString_var
+ * class is that the default constructor initializes the
+ * underlying wstring to an empty string in this class whereas it
+ * is a NUL wstring for the _var class.
+ */
+class TAO_Export TAO_WString_Manager
+{
+public:
+
+  /// default CTOR will initialize the underlying ptr_ to empty string.
+  TAO_WString_Manager (void);
+
+  /// 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);
+
+  /// assignment from another managed type
+  TAO_WString_Manager &operator= (const TAO_WString_Manager&);
+
+  /// assignment from var type will make a copy
+  TAO_WString_Manager &operator= (const CORBA::WString_var&);
+
+  /// assignment from a constant wchar* will make a copy
+  TAO_WString_Manager &operator= (const CORBA::WChar *);
+
+  /// assignment from wchar* will not make a copy. The WString_Manager
+  /// will now own the string.
+  TAO_WString_Manager &operator= (CORBA::WChar *);
+
+  /// cast  (read-only)
+  operator const CORBA::WChar*() const;
+
+  /// for in parameter.
+  const CORBA::WChar *in (void) const;
+
+  /// for inout parameter.
+  CORBA::WChar *&inout (void);
+
+  /// for out parameter.
+  CORBA::WChar *&out (void);
+
+  /// for string of return type.
+  CORBA::WChar *_retn (void);
+
+private:
+  /// The underlying wide string
+  CORBA::WChar *ptr_;
+
+};
+
+/****************************************************************/
+
+/**
+ * @class TAO_SeqElem_WString_Manager
+ *
+ * @brief TAO_SeqElem_WString_Manager
+ *
+ * Manager for strings that are the element type of sequences.
+ * Similar to the mapping for sequences of objects (and other
+ * pseudo objects) the mapping for sequences of strings requires
+ * an auxiliar class or <Manager> to handle the allocation and
+ * deallocation of the string.  The main difference with respect
+ * to WString_var classes is that automatic release is not
+ * controlled on a per-item basis, but for the sequence as a
+ * whole.  The difference wrt Object_Manager is that strings are
+ * duplicated using CORBA::WString_dup () as opposed to
+ * T::_duplicate(), and released using CORBA::WString_free()
+ * instead of CORBA::release()
+ * This class implements the generic string manager and is used to
+ * instantiate the proper sequence types.
+ * This class will have the same semantics as the string manager
+ * classes defined earlier with respect to the various assignment
+ * operators. However, the freeing of old storage will be
+ * dependent on the "release" value of the parent sequence class.
+ */
+class TAO_Export TAO_SeqElem_WString_Manager
+{
+public:
+  friend class TAO_Unbounded_WString_Sequence;
+
+  // @@ Giving friendship to a template is not implemented on several
+  // compilers:
+  // friend template<CORBA::ULong MAX>
+  //   class TAO_Bounded_WString_Sequence<TAO_SeqElem_WString_Manager,MAX>;
+
+  /// constructor from address of an element
+  TAO_SeqElem_WString_Manager (CORBA::WChar **buffer,
+                               CORBA::Boolean release);
+
+  /// copy constructor
+  TAO_SeqElem_WString_Manager (const TAO_SeqElem_WString_Manager &);
+
+  /// destructor
+  ~TAO_SeqElem_WString_Manager (void);
+
+  /// assignment from another managed type
+  TAO_SeqElem_WString_Manager &operator= (const TAO_SeqElem_WString_Manager&);
+
+  /// assignment from var type will make a copy
+  TAO_SeqElem_WString_Manager &operator= (const CORBA::WString_var&);
+
+  /// assignment from a constant char* will make a copy
+  TAO_SeqElem_WString_Manager &operator= (const CORBA::WChar *);
+
+  /// assignment from char* will not make a copy. The
+  /// SeqElem_WString_Manager will now own the string.
+  TAO_SeqElem_WString_Manager &operator= (CORBA::WChar *);
+
+  /// cast  (read-only)
+  operator const CORBA::WChar*() const;
+
+  /// for in parameter.
+  const CORBA::WChar *in (void) const;
+
+  /// for inout parameter.
+  CORBA::WChar *&inout (void);
+
+  /// for out parameter.
+  CORBA::WChar *&out (void);
+
+  /// for string of return type.
+  CORBA::WChar *_retn (void);
+
+private:
+  /// Address of string element from the parent's buffer.
+  CORBA::WChar **ptr_;
+
+  /// control memory managment semantics.
+  CORBA::Boolean release_;
+
+  // following are now allowed since these managed class will be used only by
+  // the [] operator of the sequence class. The [] operator will not use the
+  // following ctors to instantiate the managed instance
+
+  /// default ctor
+  TAO_SeqElem_WString_Manager (void);
+
+};
+
+// 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 */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
+#include "tao/Managed_Types.i"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_MANAGED_TYPES_H */
diff --git a/TAO/tao/Managed_Types.i b/TAO/tao/Managed_Types.i
new file mode 100644
index 00000000000..aa03deb7c56
--- /dev/null
+++ b/TAO/tao/Managed_Types.i
@@ -0,0 +1,407 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    Managed_Types.i
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+// ****************************************************************
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// default CTOR initializes to empty string
+ACE_INLINE
+TAO_String_Manager::TAO_String_Manager (void)
+  :  ptr_ (CORBA::string_dup (""))
+{
+}
+
+// copy ctor copies storage
+ACE_INLINE
+TAO_String_Manager::TAO_String_Manager (const TAO_String_Manager &rhs)
+  :  ptr_ (CORBA::string_dup (rhs.ptr_))
+{
+}
+
+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)
+{
+  CORBA::string_free (this->ptr_);
+}
+
+// assignment
+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;
+
+  return *this;
+}
+
+// assignment from const char* makes a copy
+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;
+
+  return *this;
+}
+
+// assignment from char* owns the string
+ACE_INLINE TAO_String_Manager &
+TAO_String_Manager::operator= (char * p)
+{
+  CORBA::string_free (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+TAO_String_Manager::operator const char* (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const char *
+TAO_String_Manager::in (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE char *&
+TAO_String_Manager::inout (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE char *&
+TAO_String_Manager::out (void)
+{
+  CORBA::string_free (this->ptr_);
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE char *
+TAO_String_Manager::_retn (void)
+{
+  char *temp = this->ptr_;
+  this->ptr_ = 0;
+  return temp;
+}
+
+// ****************************************************************
+
+// copy ctor
+ACE_INLINE
+TAO_SeqElem_String_Manager::
+TAO_SeqElem_String_Manager (const TAO_SeqElem_String_Manager &rhs)
+  :  ptr_ (rhs.ptr_),
+     release_ (rhs.release_)
+{
+}
+
+ACE_INLINE
+TAO_SeqElem_String_Manager::TAO_SeqElem_String_Manager (char **buffer,
+                                                        CORBA::Boolean release)
+  :  ptr_ (buffer),
+     release_ (release)
+{
+}
+
+ACE_INLINE
+TAO_SeqElem_String_Manager::~TAO_SeqElem_String_Manager (void)
+{
+}
+
+// assignment
+ACE_INLINE TAO_SeqElem_String_Manager&
+TAO_SeqElem_String_Manager::operator= (const TAO_SeqElem_String_Manager &rhs)
+{
+  if (this == &rhs)
+    return *this;
+
+  if (this->release_)
+    CORBA::string_free (*this->ptr_);
+  *this->ptr_ = CORBA::string_dup (*rhs.ptr_);
+  return *this;
+}
+
+// assignment from const char* will make copy
+ACE_INLINE TAO_SeqElem_String_Manager &
+TAO_SeqElem_String_Manager::operator= (const char *p)
+{
+  if (this->release_)
+    CORBA::string_free (*this->ptr_);
+  *this->ptr_ = CORBA::string_dup (p);
+  return *this;
+}
+
+// assignment from char* will own it
+ACE_INLINE TAO_SeqElem_String_Manager &
+TAO_SeqElem_String_Manager::operator= (char *p)
+{
+  if (this->release_)
+    CORBA::string_free (*this->ptr_);
+  *this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+TAO_SeqElem_String_Manager::operator const char* (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE const char *
+TAO_SeqElem_String_Manager::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE char *&
+TAO_SeqElem_String_Manager::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE char *&
+TAO_SeqElem_String_Manager::out (void)
+{
+  CORBA::string_free (*this->ptr_);
+  *this->ptr_ = 0;
+  return *this->ptr_;
+}
+
+ACE_INLINE char *
+TAO_SeqElem_String_Manager::_retn (void)
+{
+  char *temp = *this->ptr_;
+  *this->ptr_ = 0;
+  return temp;
+}
+
+// ****************************************************************
+
+// default CTOR initializes to empty string
+ACE_INLINE
+TAO_WString_Manager::TAO_WString_Manager (void)
+  :  ptr_ (0) // @@ CORBA::wstring_dup (""))
+{
+}
+
+// copy ctor copies storage
+ACE_INLINE
+TAO_WString_Manager::TAO_WString_Manager (const TAO_WString_Manager &rhs)
+  :  ptr_ (CORBA::wstring_dup (rhs.ptr_))
+{
+}
+
+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)
+{
+  CORBA::wstring_free (this->ptr_);
+}
+
+// assignment
+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;
+
+  return *this;
+}
+
+// assignment from const CORBA::WChar* makes a copy
+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;
+
+  return *this;
+}
+
+// assignment from CORBA::WChar* owns the string
+ACE_INLINE TAO_WString_Manager &
+TAO_WString_Manager::operator= (CORBA::WChar * p)
+{
+  CORBA::wstring_free (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+TAO_WString_Manager::operator const CORBA::WChar* (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE const CORBA::WChar *
+TAO_WString_Manager::in (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE CORBA::WChar *&
+TAO_WString_Manager::inout (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE CORBA::WChar *&
+TAO_WString_Manager::out (void)
+{
+  CORBA::wstring_free (this->ptr_);
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE CORBA::WChar *
+TAO_WString_Manager::_retn (void)
+{
+  CORBA::WChar *temp = this->ptr_;
+  this->ptr_ = 0;
+  return temp;
+}
+
+// ****************************************************************
+
+// copy ctor
+ACE_INLINE
+TAO_SeqElem_WString_Manager::
+TAO_SeqElem_WString_Manager (const TAO_SeqElem_WString_Manager &rhs)
+  :  ptr_ (rhs.ptr_),
+     release_ (rhs.release_)
+{
+}
+
+ACE_INLINE
+TAO_SeqElem_WString_Manager::
+    TAO_SeqElem_WString_Manager (CORBA::WChar **buffer,
+                                 CORBA::Boolean release)
+  :  ptr_ (buffer),
+     release_ (release)
+{
+}
+
+ACE_INLINE
+TAO_SeqElem_WString_Manager::~TAO_SeqElem_WString_Manager (void)
+{
+}
+
+// assignment
+ACE_INLINE TAO_SeqElem_WString_Manager&
+TAO_SeqElem_WString_Manager::operator= (const TAO_SeqElem_WString_Manager &rhs)
+{
+  if (this == &rhs)
+    return *this;
+
+  if (this->release_)
+    CORBA::wstring_free (*this->ptr_);
+  *this->ptr_ = CORBA::wstring_dup (*rhs.ptr_);
+  return *this;
+}
+
+// assignment from const CORBA::WChar* will make copy
+ACE_INLINE TAO_SeqElem_WString_Manager &
+TAO_SeqElem_WString_Manager::operator= (const CORBA::WChar *p)
+{
+  if (this->release_)
+    CORBA::wstring_free (*this->ptr_);
+  *this->ptr_ = CORBA::wstring_dup (p);
+  return *this;
+}
+
+// assignment from CORBA::WChar* will own it
+ACE_INLINE TAO_SeqElem_WString_Manager &
+TAO_SeqElem_WString_Manager::operator= (CORBA::WChar *p)
+{
+  if (this->release_)
+    CORBA::wstring_free (*this->ptr_);
+  *this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+TAO_SeqElem_WString_Manager::operator const CORBA::WChar* (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE const CORBA::WChar *
+TAO_SeqElem_WString_Manager::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE CORBA::WChar *&
+TAO_SeqElem_WString_Manager::inout (void)
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE CORBA::WChar *&
+TAO_SeqElem_WString_Manager::out (void)
+{
+  CORBA::wstring_free (*this->ptr_);
+  *this->ptr_ = 0;
+  return *this->ptr_;
+}
+
+ACE_INLINE CORBA::WChar *
+TAO_SeqElem_WString_Manager::_retn (void)
+{
+  CORBA::WChar *temp = *this->ptr_;
+  *this->ptr_ = 0;
+  return temp;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/ExceptionHolderC.cpp b/TAO/tao/Messaging/ExceptionHolderC.cpp
index 3c9396ae7da..8de5efc6d7b 100644
--- a/TAO/tao/Messaging/ExceptionHolderC.cpp
+++ b/TAO/tao/Messaging/ExceptionHolderC.cpp
@@ -90,12 +90,6 @@ Messaging::ExceptionHolder::_tao_obv_repository_id (void) const
 }
 
 void
-Messaging::ExceptionHolder::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const
-{
-  ids.push_back (this->_tao_obv_static_repository_id ());
-}
-
-void
 Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionHolder *_tao_tmp_pointer =
@@ -106,49 +100,57 @@ Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
 Messaging::ExceptionHolder::~ExceptionHolder (void)
 {}
 
-::CORBA::Boolean
-Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) const
+::CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) const
 {
   return this->_tao_marshal__Messaging_ExceptionHolder (strm);
 }
 
-::CORBA::Boolean
-Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm)
+::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm)
 {
   return this->_tao_unmarshal__Messaging_ExceptionHolder (strm);
 }
 
-::CORBA::Boolean
-Messaging::ExceptionHolder::_tao_match_formal_type (ptrdiff_t formal_type_id) const
-{
-  return formal_type_id ==
-    reinterpret_cast<ptrdiff_t>(&Messaging::ExceptionHolder::_downcast);
-}
-
-::CORBA::Boolean
-Messaging::ExceptionHolder::_tao_unmarshal (
+::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
     TAO_InputCDR &strm,
     ExceptionHolder *&new_object
   )
 {
   ::CORBA::ValueBase *base = 0;
+  ::CORBA::ValueFactory_var factory;
   ::CORBA::Boolean retval =
     ::CORBA::ValueBase::_tao_unmarshal_pre (
         strm,
+        factory.out (),
         base,
         ExceptionHolder::_tao_obv_static_repository_id ()
       );
 
   if (retval == 0)
+    {
       return 0;
+    }
 
-  if (base != 0 && !base->_tao_unmarshal_v (strm))
+  if (factory.in () != 0)
+    {
+      base = factory->create_for_unmarshal ();
+
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+
+      retval = base->_tao_unmarshal_v (strm);
+
+      if (retval == 0)
+        {
           return 0;
+        }
+    }
 
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ExceptionHolder::_downcast (base);
-  return 1;
+  return retval;
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/Messaging/ExceptionHolderC.h b/TAO/tao/Messaging/ExceptionHolderC.h
index edbcde265bd..841d6712b25 100644
--- a/TAO/tao/Messaging/ExceptionHolderC.h
+++ b/TAO/tao/Messaging/ExceptionHolderC.h
@@ -42,7 +42,7 @@
 
 #include "tao/Messaging/messaging_export.h"
 #include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/Valuetype_Adapter_Factory_Impl.h"
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -109,8 +109,6 @@ namespace Messaging
 
     virtual const char* _tao_obv_repository_id (void) const;
 
-    virtual void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const;
-
     static const char* _tao_obv_static_repository_id (void);
 
     static void _tao_any_destructor (void *);
@@ -162,7 +160,6 @@ namespace Messaging
 
     virtual ::CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
     virtual ::CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-    virtual ::CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
 
   private:
     ExceptionHolder (const ExceptionHolder &);
@@ -298,3 +295,5 @@ 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
new file mode 100644
index 00000000000..133a1701ad9
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderA.cpp
@@ -0,0 +1,194 @@
+// -*- 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/Messaging/OldExceptionHolderA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/value_typecode.cpp:63
+
+
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_ExceptionHolder[] =
+  {
+    { "is_system_exception", &CORBA::_tc_boolean, ::CORBA::PUBLIC_MEMBER },
+    { "byte_order", &CORBA::_tc_boolean, ::CORBA::PUBLIC_MEMBER },
+    { "marshaled_exception", &CORBA::_tc_OctetSeq, ::CORBA::PUBLIC_MEMBER }
+
+  };
+static TAO::TypeCode::Value<char const *,
+                     ::CORBA::TypeCode_ptr const *,
+                     TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                     TAO::Null_RefCount_Policy>
+  _tao_tc_Messaging_ExceptionHolder (
+    ::CORBA::tk_value,
+    "IDL:omg.org/Messaging/ExceptionHolder:1.0",
+    "ExceptionHolder",
+    ::CORBA::VM_NONE,
+    &::CORBA::_tc_null,
+    _tao_fields_Messaging_ExceptionHolder,
+    3);
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr const _tc_ExceptionHolder =
+    &_tao_tc_Messaging_ExceptionHolder;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_cs.cpp:57
+
+namespace TAO
+{
+  template<>
+  ::CORBA::Boolean
+  Any_Impl_T<Messaging::ExceptionHolder>::to_value (
+      ::CORBA::ValueBase *&_tao_elem
+    ) const
+  {
+    ::CORBA::add_ref (this->value_);
+    _tao_elem = this->value_;
+    return 1;
+  }
+}
+
+
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace Messaging
+{
+  // Copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      ExceptionHolder *_tao_elem
+    )
+  {
+    ::CORBA::add_ref (_tao_elem);
+    _tao_any <<= &_tao_elem;
+  }
+
+  // Non-copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      ExceptionHolder **_tao_elem
+    )
+  {
+    TAO::Any_Impl_T<ExceptionHolder>::insert (
+        _tao_any,
+        ExceptionHolder::_tao_any_destructor,
+        _tc_ExceptionHolder,
+        *_tao_elem
+      );
+  }
+
+  ::CORBA::Boolean
+  operator>>= (
+      const ::CORBA::Any &_tao_any,
+      ExceptionHolder *&_tao_elem
+    )
+  {
+    return
+      TAO::Any_Impl_T<ExceptionHolder>::extract (
+          _tao_any,
+          ExceptionHolder::_tao_any_destructor,
+          _tc_ExceptionHolder,
+          _tao_elem
+        );
+  }
+
+
+}
+
+#else
+// Copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder *_tao_elem
+  )
+{
+  ::CORBA::add_ref (_tao_elem);
+  _tao_any <<= &_tao_elem;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder **_tao_elem
+  )
+{
+  TAO::Any_Impl_T<Messaging::ExceptionHolder>::insert (
+      _tao_any,
+      Messaging::ExceptionHolder::_tao_any_destructor,
+      Messaging::_tc_ExceptionHolder,
+      *_tao_elem
+    );
+}
+
+::CORBA::Boolean
+operator>>= (
+    const ::CORBA::Any &_tao_any,
+    Messaging::ExceptionHolder *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<Messaging::ExceptionHolder>::extract (
+        _tao_any,
+        Messaging::ExceptionHolder::_tao_any_destructor,
+        Messaging::_tc_ExceptionHolder,
+        _tao_elem
+      );
+}
+
+
+
+#endif
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderA.h b/TAO/tao/Messaging/OldExceptionHolderA.h
new file mode 100644
index 00000000000..11613cef0bd
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderA.h
@@ -0,0 +1,88 @@
+// -*- 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_OLDEXCEPTIONHOLDERA_H_
+#define _TAO_IDL_OLDEXCEPTIONHOLDERA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/Messaging/messaging_export.h"
+#include "tao/Messaging/OldExceptionHolderC.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
+
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace Messaging
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
+  extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ExceptionHolder;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module Messaging
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/any_op_ch.cpp:55
+
+
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace Messaging
+{
+  TAO_Messaging_Export void operator<<= ( ::CORBA::Any &, ExceptionHolder *); // copying
+  TAO_Messaging_Export void operator<<= ( ::CORBA::Any &, ExceptionHolder **); // non-copying
+  TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ExceptionHolder *&);
+}
+
+#else
+
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::ExceptionHolder *); // copying
+TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::ExceptionHolder **); // non-copying
+TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messaging::ExceptionHolder *&);
+
+#endif
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.cpp b/TAO/tao/Messaging/OldExceptionHolderC.cpp
new file mode 100644
index 00000000000..e26cccea3c6
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderC.cpp
@@ -0,0 +1,344 @@
+// -*- 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/Messaging/OldExceptionHolderC.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Messaging/OldExceptionHolderC.inl"
+#endif /* !defined INLINE */
+
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:70
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
+
+void
+TAO::Value_Traits<Messaging::ExceptionHolder>::add_ref (
+    Messaging::ExceptionHolder * p
+  )
+{
+  ::CORBA::add_ref (p);
+}
+
+void
+TAO::Value_Traits<Messaging::ExceptionHolder>::remove_ref (
+    Messaging::ExceptionHolder * p
+  )
+{
+  ::CORBA::remove_ref (p);
+}
+
+void
+TAO::Value_Traits<Messaging::ExceptionHolder>::release (
+    Messaging::ExceptionHolder * p
+  )
+{
+  ::CORBA::remove_ref (p);
+}
+
+Messaging::ExceptionHolder *
+Messaging::ExceptionHolder::_downcast ( ::CORBA::ValueBase *v)
+{
+  return dynamic_cast< ::Messaging::ExceptionHolder * > (v);
+}
+
+const char *
+Messaging::ExceptionHolder::_tao_obv_repository_id (void) const
+{
+  return this->_tao_obv_static_repository_id ();
+}
+
+void
+Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ExceptionHolder *_tao_tmp_pointer =
+    static_cast<ExceptionHolder *> (_tao_void_pointer);
+  ::CORBA::remove_ref (_tao_tmp_pointer);
+}
+
+Messaging::ExceptionHolder::~ExceptionHolder (void)
+{}
+
+::CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) const
+{
+  return this->_tao_marshal__Messaging_ExceptionHolder (strm);
+}
+
+::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm)
+{
+  return this->_tao_unmarshal__Messaging_ExceptionHolder (strm);
+}
+
+::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
+    TAO_InputCDR &strm,
+    ExceptionHolder *&new_object
+  )
+{
+  ::CORBA::ValueBase *base = 0;
+  ::CORBA::ValueFactory_var factory;
+  ::CORBA::Boolean retval =
+    ::CORBA::ValueBase::_tao_unmarshal_pre (
+        strm,
+        factory.out (),
+        base,
+        ExceptionHolder::_tao_obv_static_repository_id ()
+      );
+
+  if (retval == 0)
+    {
+      return 0;
+    }
+
+  if (factory.in () != 0)
+    {
+      base = factory->create_for_unmarshal ();
+
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+
+      retval = base->_tao_unmarshal_v (strm);
+
+      if (retval == 0)
+        {
+          return 0;
+        }
+    }
+
+  // Now base must be null or point to the unmarshaled object.
+  // Align the pointer to the right subobject.
+  new_object = ExceptionHolder::_downcast (base);
+  return retval;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_init_cs.cpp:85
+
+Messaging::ExceptionHolder_init::ExceptionHolder_init (void)
+{
+}
+
+Messaging::ExceptionHolder_init::~ExceptionHolder_init (void)
+{
+}
+
+Messaging::ExceptionHolder_init *
+Messaging::ExceptionHolder_init::_downcast ( ::CORBA::ValueFactoryBase *v)
+{
+  return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v);
+}
+
+const char*
+Messaging::ExceptionHolder_init::tao_repository_id (void)
+{
+  return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
+}
+
+::CORBA::ValueBase *
+Messaging::ExceptionHolder_init::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
+{
+  ::CORBA::ValueBase *ret_val = 0;
+  ACE_NEW_THROW_EX (
+      ret_val,
+      OBV_Messaging::ExceptionHolder,
+      ::CORBA::NO_MEMORY ()
+    );
+  return ret_val;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
+
+OBV_Messaging::ExceptionHolder::ExceptionHolder (void)
+{}
+
+OBV_Messaging::ExceptionHolder::~ExceptionHolder (void)
+{}
+
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm) const
+{
+  return _tao_marshal_state (strm);
+}
+
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm)
+{
+  return _tao_unmarshal_state (strm);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/field_cs.cpp:592
+
+// Accessor to set the member.
+void
+OBV_Messaging::ExceptionHolder::is_system_exception (CORBA::Boolean val)
+{
+  // Set the value.
+  this->_pd_is_system_exception = val;
+}
+
+// Retrieve the member
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::is_system_exception (void) const
+{
+  return this->_pd_is_system_exception;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/field_cs.cpp:592
+
+// Accessor to set the member.
+void
+OBV_Messaging::ExceptionHolder::byte_order (CORBA::Boolean val)
+{
+  // Set the value.
+  this->_pd_byte_order = val;
+}
+
+// Retrieve the member
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::byte_order (void) const
+{
+  return this->_pd_byte_order;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/field_cs.cpp:763
+
+// Accessor to set the member.
+void
+OBV_Messaging::ExceptionHolder::marshaled_exception (const CORBA::OctetSeq &val)
+{
+  this->_pd_marshaled_exception = val;
+}
+
+// Readonly get method.
+const CORBA::OctetSeq &
+OBV_Messaging::ExceptionHolder::marshaled_exception (void) const
+{
+  return this->_pd_marshaled_exception;
+}
+
+// Read/write get method.
+CORBA::OctetSeq &
+OBV_Messaging::ExceptionHolder::marshaled_exception (void)
+{
+  return this->_pd_marshaled_exception;
+}
+
+// TAO_IDL - Generated from
+// be\be_valuetype.cpp:487
+
+void
+CORBA::add_ref (Messaging::ExceptionHolder * vt)
+{
+  if (vt != 0)
+    {
+      vt->_add_ref ();
+    }
+}
+
+void
+CORBA::remove_ref (Messaging::ExceptionHolder * vt)
+{
+  if (vt != 0)
+    {
+      vt->_remove_ref ();
+    }
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
+
+::CORBA::Boolean
+operator<< (
+    TAO_OutputCDR &strm,
+    const Messaging::ExceptionHolder *_tao_valuetype
+  )
+{
+  return
+    ::CORBA::ValueBase::_tao_marshal (
+        strm,
+        _tao_valuetype,
+        reinterpret_cast<ptrdiff_t> (&Messaging::ExceptionHolder::_downcast)
+      );
+}
+
+::CORBA::Boolean
+operator>> (
+    TAO_InputCDR &strm,
+    Messaging::ExceptionHolder *&_tao_valuetype
+  )
+{
+  return Messaging::ExceptionHolder::_tao_unmarshal (strm, _tao_valuetype);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/marshal_cs.cpp:44
+
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm) const
+{
+  return (
+      (strm << ::ACE_OutputCDR::from_boolean (_pd_is_system_exception)) &&
+      (strm << ::ACE_OutputCDR::from_boolean (_pd_byte_order)) &&
+      (strm << _pd_marshaled_exception)
+    );
+}
+
+::CORBA::Boolean
+OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
+{
+  return (
+    (strm >> ::ACE_InputCDR::to_boolean (_pd_is_system_exception)) &&
+    (strm >> ::ACE_InputCDR::to_boolean (_pd_byte_order)) &&
+    (strm >> _pd_marshaled_exception)
+  );
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.h b/TAO/tao/Messaging/OldExceptionHolderC.h
new file mode 100644
index 00000000000..a3bcc4ed8bb
--- /dev/null
+++ b/TAO/tao/Messaging/OldExceptionHolderC.h
@@ -0,0 +1,305 @@
+// -*- 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_OLDEXCEPTIONHOLDERC_H_
+#define _TAO_IDL_OLDEXCEPTIONHOLDERC_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/Messaging/messaging_export.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
+#include "tao/Valuetype/ValueFactory.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Valuetype/Value_VarOut_T.h"
+
+#include "tao/OctetSeqC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Messaging_Export
+
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:49
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace Messaging
+{
+
+  // TAO_IDL - Generated from
+  // be\be_valuetype.cpp:524
+
+
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_)
+#define _MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_
+
+  class ExceptionHolder;
+  typedef
+    TAO_Value_Var_T<
+        ExceptionHolder
+      >
+    ExceptionHolder_var;
+
+  typedef
+    TAO_Value_Out_T<
+        ExceptionHolder
+      >
+    ExceptionHolder_out;
+
+#endif /* end #if !defined */
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_ch.cpp:61
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER_CH_)
+#define _MESSAGING_EXCEPTIONHOLDER_CH_
+
+  class TAO_Messaging_Export ExceptionHolder
+    : public virtual ::CORBA::ValueBase
+  {
+  public:
+    typedef ExceptionHolder_var _var_type;
+
+    static ExceptionHolder* _downcast ( ::CORBA::ValueBase *);
+
+    // (TAO extensions or internals)
+    static ::CORBA::Boolean _tao_unmarshal (
+        TAO_InputCDR &,
+        ExceptionHolder *&
+      );
+
+    virtual const char* _tao_obv_repository_id (void) const;
+
+    static const char* _tao_obv_static_repository_id (void);
+
+    static void _tao_any_destructor (void *);
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:469
+
+    virtual void is_system_exception (::CORBA::Boolean) = 0;
+    virtual ::CORBA::Boolean is_system_exception (void) const = 0;
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:469
+
+    virtual void byte_order (::CORBA::Boolean) = 0;
+    virtual ::CORBA::Boolean byte_order (void) const = 0;
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:542
+
+    virtual void marshaled_exception (const CORBA::OctetSeq &) = 0;
+    virtual const CORBA::OctetSeq &marshaled_exception (void) const = 0;
+    virtual CORBA::OctetSeq &marshaled_exception (void) = 0;
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/valuetype_ch.cpp:251
+
+  protected:
+    ExceptionHolder (void);
+
+    virtual ~ExceptionHolder (void);
+
+    virtual ::CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
+    virtual ::CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
+
+  private:
+    ExceptionHolder (const ExceptionHolder &);
+    void operator= (const ExceptionHolder &);
+
+  protected:
+    virtual ::CORBA::Boolean
+    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const = 0;
+
+    virtual ::CORBA::Boolean
+    _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CH_)
+#define _MESSAGING_EXCEPTIONHOLDER___INIT_CH_
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_init_ch.cpp:72
+
+  class TAO_Messaging_Export ExceptionHolder_init : public virtual ::CORBA::ValueFactoryBase
+  {
+  public:
+    ExceptionHolder_init (void);
+
+    static ExceptionHolder_init* _downcast ( ::CORBA::ValueFactoryBase *);
+
+    virtual ::CORBA::ValueBase *
+    create_for_unmarshal (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      );
+
+    // TAO-specific extensions
+  public:
+    virtual const char* tao_repository_id (void);
+
+  protected:
+    virtual ~ExceptionHolder_init (void);
+  };
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:78
+
+} // module Messaging
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/obv_module.cpp:55
+
+namespace OBV_Messaging
+{
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER___OBV_CH_)
+#define _MESSAGING_EXCEPTIONHOLDER___OBV_CH_
+
+  // OBV_ class
+  class TAO_Messaging_Export ExceptionHolder
+    : public virtual Messaging::ExceptionHolder,
+      public virtual ::CORBA::DefaultValueRefCountBase
+  {
+  public:
+    ExceptionHolder (void);
+    virtual ~ExceptionHolder (void);
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:469
+
+    virtual void is_system_exception (::CORBA::Boolean);
+    virtual ::CORBA::Boolean is_system_exception (void) const;
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:469
+
+    virtual void byte_order (::CORBA::Boolean);
+    virtual ::CORBA::Boolean byte_order (void) const;
+
+    // TAO_IDL - Generated from
+    // be\be_visitor_valuetype/field_ch.cpp:542
+
+    virtual void marshaled_exception (const CORBA::OctetSeq &);
+    virtual const CORBA::OctetSeq &marshaled_exception (void) const;
+    virtual CORBA::OctetSeq &marshaled_exception (void);
+
+  protected:
+    virtual ::CORBA::Boolean
+    _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const;
+
+    virtual ::CORBA::Boolean
+    _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &);
+
+    ::CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &) const;
+    ::CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
+
+  private:
+    ::CORBA::Boolean _pd_is_system_exception;
+    ::CORBA::Boolean _pd_byte_order;
+    CORBA::OctetSeq _pd_marshaled_exception;
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_MESSAGING_EXCEPTIONHOLDER__TRAITS_)
+#define _MESSAGING_EXCEPTIONHOLDER__TRAITS_
+
+  template<>
+  struct TAO_Messaging_Export Value_Traits<Messaging::ExceptionHolder>
+  {
+    static void add_ref (Messaging::ExceptionHolder *);
+    static void remove_ref (Messaging::ExceptionHolder *);
+    static void release (Messaging::ExceptionHolder *);
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_valuetype.cpp:431
+
+namespace CORBA
+{
+  extern TAO_Messaging_Export void add_ref (Messaging::ExceptionHolder *);
+  extern TAO_Messaging_Export void remove_ref (Messaging::ExceptionHolder *);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
+
+TAO_Messaging_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *);
+TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1040
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#if defined (__ACE_INLINE__)
+#include "tao/Messaging/OldExceptionHolderC.inl"
+#endif /* defined INLINE */
+
+#endif /* */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyTypeC.cpp b/TAO/tao/Messaging/OldExceptionHolderC.inl
index a3f9a0e196d..c2586897783 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicyTypeC.cpp
+++ b/TAO/tao/Messaging/OldExceptionHolderC.inl
@@ -25,25 +25,24 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:283
 
+// TAO_IDL - Generated from
+// be\be_visitor_valuetype/valuetype_ci.cpp:56
 
-#include "tao/EndpointPolicy/EndpointPolicyTypeC.h"
-#include "tao/CDR.h"
+#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
-// TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:70
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+ACE_INLINE
+Messaging::ExceptionHolder::ExceptionHolder (void)
+{}
 
-
-// Arg traits specializations.
-namespace TAO
+ACE_INLINE const char*
+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/ORB.cpp b/TAO/tao/ORB.cpp
index 85b04ebe58c..3bcc3e37d36 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -189,7 +189,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);
@@ -1279,6 +1279,7 @@ TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
       ++orb_init_count;
     }
 
+#if defined (ACE_HAS_EXCEPTIONS)
   // This must be done after the system TypeCodes and Exceptions have
   // been initialized.  An unexpected exception will cause TAO's
   // unexpected exception handler to be called.  That handler
@@ -1292,6 +1293,39 @@ TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
    */
   TAO_Singleton_Manager::instance ()->_set_unexpected (
     ::TAO_unexpected_exception_handler);
+#endif /* ACE_HAS_EXCEPTIONS */
+
+  // Verify some of the basic implementation requirements.  This test
+  // gets optimized away by a decent compiler (or else the rest of the
+  // routine does).
+  //
+  // NOTE:  we still "just" assume that native floating point is IEEE.
+  if (   sizeof (CORBA::Boolean)    != 1
+      || sizeof (CORBA::Short)      != 2
+      || sizeof (CORBA::Long)       != 4
+      || sizeof (CORBA::LongLong)   != 8
+      || sizeof (CORBA::Float)      != 4
+      || sizeof (CORBA::Double)     != 8
+      || sizeof (CORBA::LongDouble) != 16
+      || sizeof (CORBA::WChar)      < 2
+      || sizeof (void *)            != ACE_SIZEOF_VOID_P)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "%N; ERROR: unexpected basic type size; "
+                  "b:%d s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n"
+                  "please reconfigure TAO\n",
+                  sizeof (CORBA::Boolean),
+                  sizeof (CORBA::Short),
+                  sizeof (CORBA::Long),
+                  sizeof (CORBA::LongLong),
+                  sizeof (CORBA::Float),
+                  sizeof (CORBA::Double),
+                  sizeof (CORBA::LongDouble),
+                  sizeof (CORBA::WChar),
+                  sizeof (void *)));
+
+      ACE_THROW (CORBA::INITIALIZE ());
+    }
 }
 
 const ACE_CString &
@@ -1419,7 +1453,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 ();
                 }
             }
@@ -1431,9 +1465,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 ();
@@ -1529,7 +1563,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...
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 652495aaa26..3487f46ca0a 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -136,8 +136,7 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
     iorinterceptor_adapter_factory_name_ ("IORInterceptor_Adapter_Factory"),
     valuetype_adapter_factory_name_ ("valuetype_Adapter_Factory"),
     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", ""))),
-    alt_connection_timeout_hook_ (0)
+    poa_factory_directive_ (ACE_TEXT_TO_CHAR_IN (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", "TAO_PortableServer", "_make_TAO_Object_Adapter_Factory", "")))
 {
 }
 
@@ -339,9 +338,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
   // Use SO_KEEPALIVE (default 0).
   int so_keepalive = 0;
 
-  // Use SO_DONTROUTE (default 0)
-  int so_dontroute = 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
@@ -363,8 +359,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
   int linger = -1;
 
-  int use_parallel_connects = 0;
-
   // Copy command line parameter not to use original.
   ACE_Argv_Type_Converter command_line (argc, argv);
 
@@ -438,7 +432,7 @@ 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 ();
         }
@@ -461,15 +455,6 @@ 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("-ORBDontRoute"))))
-        {
-          // Use SO_DONTROUTE or not.
-          so_dontroute =
-            ACE_OS::atoi (current_arg);
-
-          arg_shifter.consume_arg ();
-        }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBTradingServicePort"))))
         {
           // Specify the port number for the TradingService.
@@ -590,7 +575,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                 (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,
@@ -663,9 +648,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)
@@ -687,7 +672,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                 (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 ();
         }
@@ -746,7 +731,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 ())
             {
@@ -824,7 +809,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           // 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 ();
         }
@@ -858,7 +843,7 @@ 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);
 
@@ -873,7 +858,7 @@ 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);
 
@@ -890,13 +875,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,
@@ -930,20 +915,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
          {
            negotiate_codesets =
              (ACE_OS::atoi (current_arg));
-
-           arg_shifter.consume_arg ();
-         }
-       else if ((current_arg = arg_shifter.get_the_parameter
-                 (ACE_LIB_TEXT("-ORBUseParallelConnects"))))
-         {
-           use_parallel_connects = ACE_OS::atoi (current_arg);
-           arg_shifter.consume_arg ();
-         }
-       else if ((current_arg = arg_shifter.get_the_parameter
-                 (ACE_LIB_TEXT("-ORBParallelConnectDelay"))))
-         {
-           this->orb_params ()->parallel_connect_delay
-             (ACE_OS::atoi (current_arg));
            arg_shifter.consume_arg ();
          }
       else if (0 != (current_arg = arg_shifter.get_the_parameter
@@ -1184,14 +1155,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
   this->orb_params ()->cache_incoming_by_dotted_decimal_address
                                             (no_server_side_name_lookups
                                              || dotted_decimal_addresses);
-
-  this->orb_params ()->use_parallel_connects
-    (use_parallel_connects != 0);
-
   this->orb_params ()->linger (linger);
   this->orb_params ()->nodelay (nodelay);
   this->orb_params ()->sock_keepalive (so_keepalive);
-  this->orb_params ()->sock_dontroute (so_dontroute);
   if (rcv_sock_size >= 0)
     this->orb_params ()->sock_rcvbuf_size (rcv_sock_size);
   if (snd_sock_size >= 0)
@@ -1300,7 +1266,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.
@@ -1711,7 +1677,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 (
@@ -2481,7 +2447,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,
@@ -2837,77 +2803,15 @@ TAO_ORB_Core::call_timeout_hook (TAO_Stub *stub,
       return;
     }
   (*timeout_hook) (this, stub, has_timeout, time_value);
-
-  Timeout_Hook alt_connection_timeout_hook =
-    TAO_ORB_Core_Static_Resources::instance ()->alt_connection_timeout_hook_;
-
-  if (alt_connection_timeout_hook == 0)
-    return;
-
-  if (!has_timeout || time_value == ACE_Time_Value::zero )
-    {
-      (*alt_connection_timeout_hook) (this, stub, has_timeout,time_value);
-      return;
-    }
-
-  // At this point, both the primary and alternate hooks are defined, and
-  // the primary did indeed set a value
-  ACE_Time_Value tv1;
-  bool ht1;
-  (*alt_connection_timeout_hook) (this, stub, ht1,tv1);
-  if (ht1 && tv1 > ACE_Time_Value::zero && tv1 < time_value)
-    time_value = tv1;
 }
 
 void
 TAO_ORB_Core::set_timeout_hook (Timeout_Hook hook)
 {
   // Saving the hook pointer so that we can use it later when needed.
-  // For now there are only two entry points that may supply a connection
-  // timeout hook. But there might be future entry points, so this should
-  // probably be addressed by a more sophisticated mechanism.
-
-#define TOCSRi TAO_ORB_Core_Static_Resources::instance ()
-
-  // A consern was raised that since this function is called by two
-  // different initializers there may be a race condition that might
-  // require a lock. We are not using a lock at this time because of
-  // two callers, one happens only during service directive processing
-  // and the other only during ORB Initialization time. The former
-  // happens when the OC_Endpoint_Selector_Factory is loaded, the
-  // latter is part of the messaging library. The messaging library
-  // calls this function as part of pre_init processing, and this call
-  // happes for every ORB instance. This was the case before these The
-  // latter call occurs when the messaging library is loaded. The
-  // redundant calls occured then as well. Second, it isn't clear how
-  // a lock in this static method would react in the face of windows
-  // dlls, shared memory segments, etc. Therefore we are continuing to
-  // keep this code lockless as it always was, assuming no
-  // simultanious overwrite will occur.
-
-  if (TOCSRi->connection_timeout_hook_ == 0)
-    {
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("TAO (%P|%t) setting primary hook\n")));
-      TOCSRi->connection_timeout_hook_ = hook;
-    }
-  else if (TOCSRi->connection_timeout_hook_ != hook &&
-           TOCSRi->alt_connection_timeout_hook_ == 0)
-    {
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("TAO (%P|%t) setting alternate hook\n")));
-      TOCSRi->alt_connection_timeout_hook_ = hook;
-    }
-  else
-    if (TAO_debug_level > 2)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) not overwriting alternate hook.")
-                  ACE_TEXT (" Is it still null? %d\n"),
-                  TOCSRi->alt_connection_timeout_hook_ == 0));
+  TAO_ORB_Core_Static_Resources::instance ()->timeout_hook_ = hook;
 
-#undef TOCSRi
+  return;
 }
 
 void
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 5b2a3b7a1ae..d0144373b4b 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -508,30 +508,6 @@ public:
                            ACE_Time_Value &time_value);
 
   /// Define the Timeout_Hook signature
-  /**
-   * The connection timeout hook was originally defined to allow the
-   * TAO Messaging code to be factored out of the core TAO library and
-   * placed in to an optional library. Since then, a new invocation
-   * endpoint selector, the optimised connection endpoint selector
-   * (see Strategies/OC_Endpoint_Selector.h) reused this connection
-   * timeout hook. However, this set up a problem when both the
-   * Messaging library and OCES are being used in the same
-   * application.
-   *
-   * The solution was to add a new connection timeout hook attribute
-   * (see alt_connection_timeout_hook_ below). This method now checks
-   * to see if the connection timeout hook is already set, and if so
-   * assigns the supplied hook value to the alternate connection
-   * timeout hook.  This functionality has a side-effect of assuming
-   * that hooks are NEVER unloaded or actively replaced. IOW, no one
-   * will call this method with a 0 or some other pointer value to
-   * replace an existing hook.
-   *
-   * If such functionality as unloading a hook pointer is required,
-   * then this method must be extended to give some kind of identity
-   * for the hook. Additional changes to the definition of the hook
-   * will also be necessary to support such identity and manipulation.
-   */
   static void connection_timeout_hook (Timeout_Hook hook);
 
   void call_sync_scope_hook (TAO_Stub *stub,
@@ -1403,9 +1379,6 @@ public:
    */
   ACE_CString poa_factory_directive_;
 
-  /// An alternative hook to be set for the ConnectionTimeoutPolicy
-  TAO_ORB_Core::Timeout_Hook alt_connection_timeout_hook_;
-
 private:
 
   /// Constructor.
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
index ef7dde2671c..b3a94f7c90a 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
@@ -92,12 +92,6 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const
 }
 
 void
-TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const
-{
-  ids.push_back (this->_tao_obv_static_repository_id ());
-}
-
-void
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceTemplate *_tao_tmp_pointer =
@@ -118,42 +112,53 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_v (TAO_I
   return this->_tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (strm);
 }
 
-CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_match_formal_type (ptrdiff_t formal_type_id) const
-{
-  return formal_type_id ==
-    reinterpret_cast<ptrdiff_t>(&TAO_Default_ORT::ObjectReferenceTemplate::_downcast);
-}
-
 CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
     TAO_InputCDR &strm,
     ObjectReferenceTemplate *&new_object
   )
 {
   CORBA::ValueBase *base = 0;
+  CORBA::ValueFactory_var factory;
   CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (
         strm,
+        factory.out (),
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
+    {
       return 0;
-
-  if (base != 0 && ! base->_tao_unmarshal_v (strm))
+    }
+  
+  if (factory.in () != 0)
+    {
+      base = factory->create_for_unmarshal ();
+      
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+      
+      retval = base->_tao_unmarshal_v (strm);
+      
+      if (retval == 0)
+        {
           return 0;
-
+        }
+    }
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
-  return 1;
+  return retval;
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
 
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
-: require_truncation_ (false)
 {}
 
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
@@ -237,10 +242,4 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
   );
 }
 
-void
-OBV_TAO_Default_ORT::ObjectReferenceTemplate::truncation_hook (void)
-{
-  this->require_truncation_ = true;
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h
index cce4f9d2850..bf461b7efcd 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.h
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h
@@ -42,7 +42,7 @@
 
 #include "tao/ObjRefTemplate/ort_export.h"
 #include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/Valuetype_Adapter_Factory_Impl.h"
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -71,22 +71,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Default_ORT
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_valuetype.cpp:524
-
-
+  
+  
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
-
+  
   class ObjectReferenceTemplate;
   typedef
     TAO_Value_Var_T<
         ObjectReferenceTemplate
       >
     ObjectReferenceTemplate_var;
-
+  
   typedef
     TAO_Value_Out_T<
         ObjectReferenceTemplate
@@ -94,64 +94,61 @@ namespace TAO_Default_ORT
     ObjectReferenceTemplate_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
-
+  
   class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual PortableInterceptor::ObjectReferenceTemplate
   {
   public:
     typedef ObjectReferenceTemplate_var _var_type;
-
+    
     static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
-
+    
     // (TAO extensions or internals)
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         ObjectReferenceTemplate *&
       );
-
+    
     virtual const char* _tao_obv_repository_id (void) const;
-
-    virtual void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const;
-
+    
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_valuetype/valuetype_ch.cpp:246
-
+  
   protected:
     ObjectReferenceTemplate (void);
-
+    
     virtual ~ObjectReferenceTemplate (void);
-
+    
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-    virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
-
+    
   private:
     ObjectReferenceTemplate (const ObjectReferenceTemplate &);
     void operator= (const ObjectReferenceTemplate &);
-
+    
   protected:
     virtual CORBA::Boolean
     _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) const = 0;
-
+    
     virtual CORBA::Boolean
     _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate;
 
 // TAO_IDL - Generated from
@@ -164,37 +161,35 @@ namespace TAO_Default_ORT
 
 namespace OBV_TAO_Default_ORT
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
-
+  
   // OBV_ class
   class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual TAO_Default_ORT::ObjectReferenceTemplate
   {
   public:
-
+    
   protected:
     ObjectReferenceTemplate (void);
     virtual ~ObjectReferenceTemplate (void);
-
+    
   protected:
     virtual CORBA::Boolean
     _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) const;
-
+    
     virtual CORBA::Boolean
     _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
-
+    
     CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &) const;
     CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
-    virtual void truncation_hook (void);
-
+  
   private:
-    CORBA::Boolean require_truncation_;
-};
+  };
 
 #endif /* end #if !defined */
 }
@@ -208,7 +203,7 @@ namespace TAO
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__TRAITS_CH_
-
+  
   template<>
   struct TAO_ORT_Export Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>
   {
@@ -262,3 +257,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index 8672196c8f2..1a419ab1be5 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -118,12 +118,6 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_repository_id (void) const
 }
 
 void
-PortableInterceptor::ObjectReferenceFactory::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const
-{
-  ids.push_back (this->_tao_obv_static_repository_id ());
-}
-
-void
 PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceFactory *_tao_tmp_pointer =
@@ -134,30 +128,47 @@ PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_voi
 PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void)
 {}
 
-CORBA::Boolean
-PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
+CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
     TAO_InputCDR &strm,
     ObjectReferenceFactory *&new_object
   )
 {
   CORBA::ValueBase *base = 0;
+  CORBA::ValueFactory_var factory;
   CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (
         strm,
+        factory.out (),
         base,
         ObjectReferenceFactory::_tao_obv_static_repository_id ()
       );
 
   if (retval == 0)
+    {
       return 0;
+    }
 
-  if (base != 0 && ! base->_tao_unmarshal_v (strm))
+  if (factory.in () != 0)
+    {
+      base = factory->create_for_unmarshal ();
+
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
+
+      retval = base->_tao_unmarshal_v (strm);
+
+      if (retval == 0)
+        {
           return 0;
+        }
+    }
 
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceFactory::_downcast (base);
-  return 1;
+  return retval;
 }
 
 // TAO_IDL - Generated from
@@ -200,12 +211,6 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_repository_id (void) cons
 }
 
 void
-PortableInterceptor::ObjectReferenceTemplate::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const
-{
-  ids.push_back (this->_tao_obv_static_repository_id ());
-}
-
-void
 PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectReferenceTemplate *_tao_tmp_pointer =
@@ -222,30 +227,41 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
   )
 {
   CORBA::ValueBase *base = 0;
+  CORBA::ValueFactory_var factory;
   CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (
         strm,
+        factory.out (),
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
 
   if (retval == 0)
-    return 0;
+    {
+      return 0;
+    }
+
+  if (factory.in () != 0)
+    {
+      base = factory->create_for_unmarshal ();
+
+      if (base == 0)
+        {
+          return 0;  // %! except.?
+        }
 
-  if (base != 0 && ! base->_tao_unmarshal_v (strm))
-    return 0;
+      retval = base->_tao_unmarshal_v (strm);
+
+      if (retval == 0)
+        {
+          return 0;
+        }
+    }
 
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
-  return 1;
-}
-
-CORBA::Boolean
-PortableInterceptor::ObjectReferenceFactory::_tao_match_formal_type (ptrdiff_t formal_type_id) const
-{
-  return formal_type_id ==
-    reinterpret_cast<ptrdiff_t>(&PortableInterceptor::ObjectReferenceFactory::_downcast);
+  return retval;
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
index 6997ded8853..eab7a48e6b6 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -45,7 +45,7 @@
 
 #include "tao/ObjRefTemplate/ort_export.h"
 #include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/Valuetype_Adapter_Factory_Impl.h"
+#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -127,8 +127,6 @@ namespace PortableInterceptor
 
     static const char* _tao_obv_static_repository_id (void);
 
-    virtual void _tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const;
-
     static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
@@ -147,7 +145,6 @@ namespace PortableInterceptor
 
     virtual ~ObjectReferenceFactory (void);
 
-    virtual CORBA::Boolean _tao_match_formal_type(ptrdiff_t ) const;
 
   private:
     ObjectReferenceFactory (const ObjectReferenceFactory &);
@@ -207,8 +204,6 @@ namespace PortableInterceptor
 
     virtual const char* _tao_obv_repository_id (void) const;
 
-    virtual void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const;
-
     static const char* _tao_obv_static_repository_id (void);
 
     static void _tao_any_destructor (void *);
@@ -445,3 +440,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index e39e2e473a3..0df3b311b58 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -158,7 +158,7 @@ CORBA::Object::marshal (TAO_OutputCDR &cdr)
 }
 
 /*static*/ CORBA::Boolean
-CORBA::Object::marshal (const CORBA::Object_ptr x,
+CORBA::Object::marshal (CORBA::Object_ptr x,
                         TAO_OutputCDR &cdr)
 {
   if (x == 0)
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 7c806d0a58b..c6bd922d66a 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -276,8 +276,8 @@ namespace CORBA
 
     /// Marshalling operator used by the stub code. A long story why
     /// the stub code uses this, let us keep it short here.
-    static CORBA::Boolean marshal (const Object_ptr x,
-                                   TAO_OutputCDR &cdr);
+    static CORBA::Boolean marshal (const Object_ptr obj,
+                                   TAO_OutputCDR &strm);
 
     /// Accessor for the cached servant reference held on the stub
     /// if this object is collocated
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index f5071ad0466..22de5e5fa4f 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -57,7 +57,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;
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
index 4ace2af6e7b..f704658e38c 100644
--- a/TAO/tao/PI_Forward.pidl
+++ b/TAO/tao/PI_Forward.pidl
@@ -43,7 +43,7 @@ module PortableInterceptor
   typedef string ORBId;
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::OctetSeq ObjectId;
-  typedef string AdapterManagerId;
+  typedef long AdapterManagerId;
   typedef short AdapterState;
   typedef unsigned long SlotId;
   typedef short ReplyStatus;
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index 898705618bc..d8672822375 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -100,9 +100,8 @@ namespace PortableInterceptor
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
 
-  typedef char * AdapterManagerId;
-  typedef CORBA::String_var AdapterManagerId_var;
-  typedef CORBA::String_out AdapterManagerId_out;
+  typedef CORBA::Long AdapterManagerId;
+  typedef CORBA::Long_out AdapterManagerId_out;
 
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
deleted file mode 100644
index 033aace13b3..00000000000
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// @(#) $Id$
-
-#include "tao/PortableServer/Acceptor_Filter_Factory.h"
-#include "tao/PortableServer/Default_Acceptor_Filter.h"
-
-ACE_RCSID(PortableServer,
-          Acceptor_Filter_Factory,
-          "$Id$")
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Acceptor_Filter_Factory::~TAO_Acceptor_Filter_Factory(void)
-{
-}
-
-TAO_Acceptor_Filter*
-TAO_Acceptor_Filter_Factory::create_object (TAO_POA_Manager& )
-{
-  TAO_Acceptor_Filter *filter;
-
-  ACE_NEW_RETURN (filter,
-                  TAO_Default_Acceptor_Filter (),
-                  0);
-
-  return filter;
-}
-
-
-int
-TAO_Acceptor_Filter_Factory::initialize (void)
-{
-  return ACE_Service_Config::process_directive
-    (ace_svc_desc_TAO_Acceptor_Filter_Factory);
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-static int
-TAO_Requires_Acceptor_Filter_Factory =
-TAO_Acceptor_Filter_Factory::initialize ();
-
-ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_Acceptor_Filter_Factory)
-ACE_STATIC_SVC_DEFINE (TAO_Acceptor_Filter_Factory,
-                       ACE_TEXT ("TAO_Acceptor_Filter_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Acceptor_Filter_Factory),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
-                       0)
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
deleted file mode 100644
index 3d4267ff944..00000000000
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Acceptor_Filter_Factory.h
- *
- *  $Id$
- *
- *  Provides default acceptor filters for use by the POA.
- *
- *  @author  Yan Dai <dai_y@ociweb.com>
- *  @author  Phil Mesnier <mesnier_p@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_ACCEPTOR_FILTER_FACTORY_H
-#define TAO_ACCEPTOR_FILTER_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Versioned_Namespace.h"
-
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
-
-class TAO_POA_Manager;
-class TAO_Acceptor_Filter;
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Acceptor_Filter_Factory
- *
- * @brief Default class for factories providing the endpoint acceptor
- *        filter objects.
- *
- * The TAO_Acceptor_Filter_Factory is a loadable service object. It exists
- * to allow external application of filters used to control the assembly of
- * object references and how endpoints are assigned.
- */
-class TAO_PortableServer_Export TAO_Acceptor_Filter_Factory
-  : public ACE_Service_Object
-{
-public:
-  virtual ~TAO_Acceptor_Filter_Factory(void);
-
-  virtual TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager);
-
-  /// Static initializer ensures the factory is loaded
-  static int initialize (void);
-
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE (TAO_Acceptor_Filter_Factory)
-ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Acceptor_Filter_Factory)
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ACCEPTOR_FILTER_FACTORY_H */
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
index 3b1bca11b17..b9288216837 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -46,7 +46,7 @@ public:
   TAO_Default_Acceptor_Filter (void);
 
   /// Populate @a mprofile with all available endpoints.
-  virtual int fill_profile (const TAO::ObjectKey &object_key,
+  int fill_profile (const TAO::ObjectKey &object_key,
                     TAO_MProfile &mprofile,
                     TAO_Acceptor **acceptors_begin,
                     TAO_Acceptor **acceptors_end,
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 44d6a2356dd..ae93dee3d61 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -15,7 +15,7 @@ TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
 
 TAO_Root_POA *
 TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
-                                                 PortableServer::POAManager_ptr poa_manager,
+                                                 TAO_POA_Manager &poa_manager,
                                                  const TAO_POA_Policy_Set &policies,
                                                  ACE_Lock &lock,
                                                  TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
index e5f5f2b71db..412e8eea9c6 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
@@ -62,7 +62,7 @@ public:
   /// Factory method for creating new POA's.
   TAO_Root_POA *create_Root_POA (
         const ACE_CString &name,
-        PortableServer::POAManager_ptr poa_manager,
+        TAO_POA_Manager &poa_manager,
         const TAO_POA_Policy_Set &policies,
         ACE_Lock &lock,
         TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 45519170d6e..224b531864f 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -11,7 +11,6 @@
 #include "tao/PortableServer/Default_Servant_Dispatcher.h"
 #include "tao/PortableServer/Collocated_Object_Proxy_Broker.h"
 #include "tao/PortableServer/POAManager.h"
-#include "tao/PortableServer/POAManagerFactory.h"
 #include "tao/PortableServer/Servant_Base.h"
 
 // -- ACE Include --
@@ -592,17 +591,14 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
                TAO_Default_Servant_Dispatcher);
     }
 
-  ACE_NEW_THROW_EX (this->poa_manager_factory_,
-                    TAO_POAManager_Factory (*this),
+  TAO_POA_Manager *poa_manager;
+  ACE_NEW_THROW_EX (poa_manager,
+                    TAO_POA_Manager (*this),
                     CORBA::NO_MEMORY ());
-
-  ::CORBA::PolicyList policy;
-  PortableServer::POAManager_var poa_manager
-    = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME,
-                                              policy
-                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
+  PortableServer::POAManager_var safe_poa_manager = poa_manager;
+
   // This makes sure that the default resources are open when the Root
   // POA is created.
   this->orb_core_.thread_lane_resources_manager ().open_default_resources (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -643,7 +639,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   TAO_Root_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME);
   this->root_ =
     this->servant_dispatcher_->create_Root_POA (root_poa_name,
-                                                poa_manager.in (),
+                                                *poa_manager,
                                                 policies,
                                                 this->lock (),
                                                 this->thread_lock (),
@@ -666,6 +662,11 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   // for this servant.
   this->root_->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
+
+  // Release the POA_Manager_var since we got here without error.  The
+  // TAO_POA object takes ownership of the POA_Manager object
+  // (actually it shares the ownership with its peers).
+  (void) safe_poa_manager._retn ();
 }
 
 void
@@ -683,18 +684,14 @@ TAO_Object_Adapter::close (int wait_for_completion
   // destroyed. In the case of the POA, this means that all object
   // etherealizations have finished and root POA has been destroyed
   // (implying that all descendent POAs have also been destroyed).
+
   TAO_Root_POA *root = 0;
-  TAO_POAManager_Factory* factory = 0;
   {
     ACE_GUARD (ACE_Lock, ace_mon, this->lock ());
     if (this->root_ == 0)
       return;
     root = this->root_;
     this->root_ = 0;
-    if (this->poa_manager_factory_ == 0)
-      return;
-    factory = this->poa_manager_factory_;
-    this->poa_manager_factory_ = 0;
   }
   CORBA::Boolean etherealize_objects = 1;
   root->destroy (etherealize_objects,
@@ -702,7 +699,6 @@ TAO_Object_Adapter::close (int wait_for_completion
                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ::CORBA::release (root);
-  ::CORBA::release (factory);
 }
 
 void
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 6d36e4631a4..edcdda83bc7 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -50,7 +50,6 @@ class TAO_POA_Manager;
 class TAO_TSS_Resources;
 class TAO_Transport;
 class TAO_Servant_Dispatcher;
-class TAO_POAManager_Factory;
 
 namespace TAO
 {
@@ -494,9 +493,6 @@ private:
   /// The Root POA
   TAO_Root_POA *root_;
 
-  /// The POAManager factory.
-  TAO_POAManager_Factory *poa_manager_factory_;
-
   /// The default validator and the beginning of the chain of
   /// policy validators.
   TAO_POA_Default_Policy_Validator default_validator_;
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index c0b75b8b6fe..d4a44d9cb18 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -51,7 +51,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 +77,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);
     }
 
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 1c92bb471e0..8a8055d8c23 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/PortableServer/POAManager.h"
-#include "tao/PortableServer/POAManagerFactory.h"
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/poa_macros.h"
 #include "tao/Server_Strategy_Factory.h"
@@ -18,36 +17,23 @@ ACE_RCSID (PortableServer,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_POA_Manager::TAO_POA_Manager (
-  TAO_Object_Adapter &object_adapter,
-  const char * id,
-  const ::CORBA::PolicyList &policies,
-  PortableServer::POAManagerFactory_ptr poa_manager_factory)
+TAO_POA_Manager::TAO_POA_Manager (TAO_Object_Adapter &object_adapter)
   : state_ (PortableServer::POAManager::HOLDING),
     lock_ (object_adapter.lock ()),
     poa_collection_ (),
     object_adapter_ (object_adapter),
-    id_ (id == 0 ? this->generate_manager_id () : CORBA::string_dup (id)),
-    poa_manager_factory_ (* (dynamic_cast <TAO_POAManager_Factory*> (poa_manager_factory))),
-    policies_ (policies)
+    poa_manager_id_ (this->generate_manager_id ())
 {
-  poa_manager_factory->_add_ref ();
 }
 
 TAO_POA_Manager::~TAO_POA_Manager (void)
 {
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t)~TAO_POA_Manager : %s\n", this->id_.in ()));
-    }
-  poa_manager_factory_._remove_ref ();
 }
 
-char *
-TAO_POA_Manager::get_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+PortableInterceptor::AdapterManagerId
+TAO_POA_Manager::get_manager_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
-  return CORBA::string_dup (this->id_.in ());
+  return this->poa_manager_id_;
 }
 
 void
@@ -176,7 +162,7 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat
 
   if (ior_adapter)
     {
-      ior_adapter->adapter_manager_state_changed (this->id_.in (),
+      ior_adapter->adapter_manager_state_changed (TAO_POA_Manager::poa_manager_id_,
                                                   adapter_state
                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -317,7 +303,7 @@ TAO_POA_Manager::remove_poa (TAO_Root_POA *poa)
     {
       if (this->poa_collection_.is_empty ())
         {
-          this->poa_manager_factory_.remove_poamanager (this);
+          ::CORBA::release (this);
         }
     }
 
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 5e90d177cc2..056efb7578c 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -42,13 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Forward decl.
 class TAO_Root_POA;
 class TAO_Object_Adapter;
-class TAO_POAManager_Factory;
 
-namespace PortableServer
-{
-  class POAManagerFactory;
-  typedef POAManagerFactory *POAManagerFactory_ptr;
-}
 
 class TAO_PortableServer_Export TAO_POA_Manager :
   public PortableServer::POAManager,
@@ -86,16 +80,12 @@ public:
   PortableServer::POAManager::State get_state (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char *get_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  TAO_POA_Manager (TAO_Object_Adapter &object_adapter,
-                   const char * id,
-                   const ::CORBA::PolicyList & policies,
-                   PortableServer::POAManagerFactory_ptr poa_manager_factory);
+  TAO_POA_Manager (TAO_Object_Adapter &object_adapter);
 
   ~TAO_POA_Manager (void);
 
+  PortableInterceptor::AdapterManagerId get_manager_id (ACE_ENV_SINGLE_ARG_DECL);
+
   /// Check the state of this POA manager
   void check_state (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -106,8 +96,6 @@ public:
       ACE_ENV_SINGLE_ARG_DECL
     );
 
-  CORBA::PolicyList& get_policies ();
-
 protected:
 
   void activate_i (ACE_ENV_SINGLE_ARG_DECL)
@@ -146,6 +134,13 @@ protected:
 
   int register_poa (TAO_Root_POA *poa);
 
+  /**
+   * Generate an AdapterManagerId for this POAManager.
+   * @return A value that uniquely identifies the POAManager within a
+   *         given process.
+   */
+  PortableInterceptor::AdapterManagerId generate_manager_id (void) const;
+
 protected:
 
   PortableServer::POAManager::State state_;
@@ -158,21 +153,8 @@ protected:
 
   TAO_Object_Adapter &object_adapter_;
 
-  CORBA::String_var id_;
-
-  TAO_POAManager_Factory& poa_manager_factory_;
-
-  CORBA::PolicyList policies_;
-
-private :
+  PortableInterceptor::AdapterManagerId poa_manager_id_;
 
-  /**
-   * Generate an id for this POAManager.
-   * @return A value that uniquely identifies the POAManager within a
-   *         given process.
-   * @note: The id_ has the ownership of the memory allocated in this method.
-   */
-  char* generate_manager_id (void) const;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index 5dad4c14de5..19adb23dd8f 100644
--- a/TAO/tao/PortableServer/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
@@ -84,7 +84,7 @@ TAO_POA_Manager::get_state (ACE_ENV_SINGLE_ARG_DECL)
   return this->get_state_i ();
 }
 
-ACE_INLINE char*
+ACE_INLINE PortableInterceptor::AdapterManagerId
 TAO_POA_Manager::generate_manager_id (void) const
 {
   // The AdapterManagerId must be unique across all Adapter Managers
@@ -101,7 +101,7 @@ TAO_POA_Manager::generate_manager_id (void) const
   // shifting of 64 bit addresses is performed since the
   // TAO_POA_Manager object is not large enough to allow that trick.
 
-  CORBA::Long id = 0;
+  PortableInterceptor::AdapterManagerId id = 0;
 
   // Note that we reinterpret_cast to an "unsigned long" instead of
   // CORBA::ULong since we need to first cast to an integer large
@@ -109,10 +109,14 @@ TAO_POA_Manager::generate_manager_id (void) const
   // 64-bit platforms.
 
   if (sizeof (this) == 4)       // 32 bit address
-    id = reinterpret_cast <ptrdiff_t> (this);
+    id =
+      static_cast <PortableInterceptor::AdapterManagerId>
+                       (reinterpret_cast <ptrdiff_t> (this));
 
   else if (sizeof (this) == 8)  // 64 bit address -- use lower 32 bits
-    id = reinterpret_cast <ptrdiff_t> (this) & 0xFFFFFFFFu;
+    id =
+      static_cast <PortableInterceptor::AdapterManagerId>
+                       (reinterpret_cast <ptrdiff_t> (this) & 0xFFFFFFFFu);
 
   // @@ If we ever hit a platform where neither of the above cases are
   //    satisfied, we're up the creek!
@@ -122,16 +126,7 @@ TAO_POA_Manager::generate_manager_id (void) const
 //     // ORB, or perhaps specific to the process.
 //     id = ...GENERATE_ID_ATOMICALLY...;  // Fallback
 
-  char* buf = new char [25];
-  ACE_OS::sprintf (buf, "POAManager%d", id);
-  return buf;
+  return id;
 }
 
-ACE_INLINE 
-CORBA::PolicyList& TAO_POA_Manager::get_policies ()
-{
-  return this->policies_;
-}
-
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POAManager.pidl b/TAO/tao/PortableServer/POAManager.pidl
index c678575ac30..6c9f72580be 100644
--- a/TAO/tao/PortableServer/POAManager.pidl
+++ b/TAO/tao/PortableServer/POAManager.pidl
@@ -50,8 +50,6 @@ module PortableServer
       raises(AdapterInactive);
 
     State get_state ();
-
-    string get_id();
   };
 };
 
diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h
index 7de37664de8..9d767071182 100644
--- a/TAO/tao/PortableServer/POAManagerC.h
+++ b/TAO/tao/PortableServer/POAManagerC.h
@@ -248,13 +248,6 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 
-    virtual char * get_id (
-        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
 
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp
deleted file mode 100644
index 3a697f1bdb6..00000000000
--- a/TAO/tao/PortableServer/POAManagerFactory.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-#include "tao/PortableServer/POAManagerFactory.h"
-#include "tao/PortableServer/POAManager.h"
-#include "tao/EndpointPolicy/EndpointPolicyTypeC.h"
-
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (PortableServer,
-           POAManagerFactory,
-           "$Id$")
-
-
-TAO_POAManager_Factory::TAO_POAManager_Factory (TAO_Object_Adapter &object_adapter) :
-  object_adapter_ (object_adapter)
-{
-}
-
-TAO_POAManager_Factory::~TAO_POAManager_Factory (void)
-{
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t)~TAO_POAManager_Factory \n"));
-    }
-
-  for (POAMANAGERSET::iterator iterator = this->poamanager_set_.begin ();
-        iterator != this->poamanager_set_.end ();
-        ++iterator)
-    {
-      ::PortableServer::POAManager_ptr poamanager = (*iterator);
-      CORBA::release (poamanager);
-    }
-}
-
-::PortableServer::POAManager_ptr
-TAO_POAManager_Factory::create_POAManager (
-  const char * id,
-  const ::CORBA::PolicyList & policies
-  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::PortableServer::POAManagerFactory::ManagerAlreadyExists,
-                     ::CORBA::PolicyError))
-{
-  if (policies.length () > 1
-    || (policies.length () == 1 &&
-        policies[0]->policy_type () != EndpointPolicy::ENDPOINT_POLICY_TYPE))
-  {
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY),
-                      ::PortableServer::POAManager::_nil ());
-  }
-
-  PortableServer::POAManager_var poamanager =
-    PortableServer::POAManager::_nil ();
-  if (id != 0)
-  {
-    poamanager = this->find (id ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ());
-
-    // If we already have a manager with the same name throw an exception
-    if (!CORBA::is_nil (poamanager))
-      {
-        ACE_THROW_RETURN (
-          ::PortableServer::POAManagerFactory::ManagerAlreadyExists (),
-          ::PortableServer::POAManager::_nil ());
-      }
-  }
-
-  // this indirection brought to you by borland's compiler and its refusal
-  // to directly assign the newly crated TAO_POA_Manager to a POAManager_var.
-  {
-    PortableServer::POAManager_ptr pm = 0;
-    ACE_NEW_THROW_EX (pm,
-                      TAO_POA_Manager (object_adapter_, id, policies, this),
-                      CORBA::NO_MEMORY
-                      (CORBA::SystemException::_tao_minor_code (0, ENOMEM),
-                       CORBA::COMPLETED_NO));
-    ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ());
-    poamanager = pm;
-  }
-
-  this->register_poamanager (poamanager.in ());
-
-  return PortableServer::POAManager::_duplicate (poamanager.in ());
-}
-
-::PortableServer::POAManagerFactory::POAManagerSeq *
-TAO_POAManager_Factory::list (
-  ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers;
-  CORBA::ULong number_of_poamanagers = static_cast <CORBA::ULong>
-                                              (this->poamanager_set_.size ());
-  ACE_NEW_THROW_EX (poamanagers,
-                    PortableServer::POAManagerFactory::POAManagerSeq (
-                      number_of_poamanagers),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  poamanagers->length (number_of_poamanagers);
-
-  CORBA::ULong index = 0;
-  for (POAMANAGERSET::iterator iterator = this->poamanager_set_.begin ();
-        iterator != this->poamanager_set_.end ();
-        ++iterator, ++index)
-    {
-      ::PortableServer::POAManager_ptr poamanager = (*iterator);
-      poamanagers[index] =
-        PortableServer::POAManager::_duplicate (poamanager);
-    }
-
-  return poamanagers._retn ();
-}
-
-::PortableServer::POAManager_ptr
-TAO_POAManager_Factory::find (
-  const char * id ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ::PortableServer::POAManager_ptr poamanager =
-    ::PortableServer::POAManager::_nil();
-
-  for (POAMANAGERSET::iterator iterator = this->poamanager_set_.begin ();
-        iterator != this->poamanager_set_.end ();
-        ++iterator)
-    {
-      CORBA::String_var poamanagerid =
-        (*iterator)->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::PortableServer::POAManager::_nil());
-
-      if (ACE_OS::strcmp (id, poamanagerid) == 0)
-        {
-          poamanager = PortableServer::POAManager::_duplicate (*iterator);
-          break;
-        }
-    }
-
-  return poamanager;
-}
-
-int
-TAO_POAManager_Factory::remove_poamanager (
-  ::PortableServer::POAManager_ptr poamanager)
-{
-  int retval = 0;
-  retval = this->poamanager_set_.remove (poamanager);
-
-  if (retval == 0)
-    {
-      CORBA::release (poamanager);
-    }
-
-  return retval;
-}
-
-int
-TAO_POAManager_Factory::register_poamanager (
-  ::PortableServer::POAManager_ptr poamanager)
-{
-  return this->poamanager_set_.insert (
-    PortableServer::POAManager::_duplicate (poamanager));
-}
diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h
deleted file mode 100644
index ce8a82d0ac0..00000000000
--- a/TAO/tao/PortableServer/POAManagerFactory.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    POAManagerFactory.h
- *
- *  $Id$
- *
- *   POAManagerFactory
- *
- *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_POAMANAGERFACTORY_H
-#define TAO_POAMANAGERFACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/POAManagerFactoryC.h"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/LocalObject.h"
-#include "ace/Unbounded_Set.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 */
-
-class TAO_PortableServer_Export TAO_POAManager_Factory :
-  public ::PortableServer::POAManagerFactory,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  TAO_POAManager_Factory (TAO_Object_Adapter &object_adapter);
-
-  virtual ~TAO_POAManager_Factory (void);
-
-  virtual ::PortableServer::POAManager_ptr create_POAManager (
-      const char * id,
-      const ::CORBA::PolicyList & policies
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                      ::PortableServer::POAManagerFactory::ManagerAlreadyExists,
-                      ::CORBA::PolicyError));
-
-  virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual ::PortableServer::POAManager_ptr find (
-      const char * id ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-  int remove_poamanager (::PortableServer::POAManager_ptr poamanager);
-
-  int register_poamanager (::PortableServer::POAManager_ptr poamanager);
-
-private:
-  TAO_Object_Adapter &object_adapter_;
-
-  typedef ACE_Unbounded_Set < ::PortableServer::POAManager_ptr> POAMANAGERSET;
-
-  POAMANAGERSET poamanager_set_;
-};
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_POAMANAGERFACTORY_H */
diff --git a/TAO/tao/PortableServer/POAManagerFactory.pidl b/TAO/tao/PortableServer/POAManagerFactory.pidl
deleted file mode 100644
index 562190c8685..00000000000
--- a/TAO/tao/PortableServer/POAManagerFactory.pidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @file POAManagerFactory.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the PortableServer module.
- *
-  $ACE_ROOT/bin/tao_idl \
-  -Gp -Gd -Ge 1 -Sc -Sci -I$TAO_ROOT \
-  -Wb,export_macro=TAO_PortableServer_Export \
-  -Wb,export_include="tao/PortableServer/portableserver_export.h" \
-  -Wb,pre_include="ace/pre.h" \
-  -Wb,post_include="ace/post.h" \
-  POAManagerFactory.pidl
- */
-
-#ifndef _PORTABLESERVER_POAMANAGER_FACTORY_IDL
-#define _PORTABLESERVER_POAMANAGER_FACTORY_IDL
-
-#include "tao/Policy.pidl"
-
-#pragma prefix "omg.org"
-
-module PortableServer
-{
-# pragma version PortableServer 2.3
-
-  local interface POAManager;
-
-  local interface POAManagerFactory
-  {
-    typedef sequence<POAManager> POAManagerSeq;
-
-    exception ManagerAlreadyExists {};
-
-    POAManager create_POAManager(
-      in string id,
-      in CORBA::PolicyList policies
-    ) raises(ManagerAlreadyExists, CORBA::PolicyError);
-
-    POAManagerSeq list();
-
-    POAManager find(in string id);
-  };
-};
-
-#endif // _PORTABLESERVER_POAMANAGER_FACTORY_IDL
diff --git a/TAO/tao/PortableServer/POAManagerFactoryC.cpp b/TAO/tao/PortableServer/POAManagerFactoryC.cpp
deleted file mode 100644
index ae838de1e98..00000000000
--- a/TAO/tao/PortableServer/POAManagerFactoryC.cpp
+++ /dev/null
@@ -1,423 +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:282
-
-
-#include "POAManagerFactoryC.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/Sequence_TypeCode_Static.h"
-#include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
-#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
-#include "ace/OS_NS_string.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:71
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::POAManagerFactory.
-
-PortableServer::POAManagerFactory_ptr
-TAO::Objref_Traits<PortableServer::POAManagerFactory>::duplicate (
-    PortableServer::POAManagerFactory_ptr p
-  )
-{
-  return PortableServer::POAManagerFactory::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableServer::POAManagerFactory>::release (
-    PortableServer::POAManagerFactory_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-PortableServer::POAManagerFactory_ptr
-TAO::Objref_Traits<PortableServer::POAManagerFactory>::nil (void)
-{
-  return PortableServer::POAManagerFactory::_nil ();
-}
-
-::CORBA::Boolean
-TAO::Objref_Traits<PortableServer::POAManagerFactory>::marshal (
-    const PortableServer::POAManagerFactory_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return ::CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_PORTABLESERVER_POAMANAGERFACTORY_POAMANAGERSEQ_CS_)
-#define _PORTABLESERVER_POAMANAGERFACTORY_POAMANAGERSEQ_CS_
-
-PortableServer::POAManagerFactory::POAManagerSeq::POAManagerSeq (void)
-{}
-
-PortableServer::POAManagerFactory::POAManagerSeq::POAManagerSeq (
-    ::CORBA::ULong max
-  )
-  : TAO::unbounded_object_reference_sequence<
-        PortableServer::POAManager,
-        PortableServer::POAManager_var
-      >
-    (max)
-{}
-
-PortableServer::POAManagerFactory::POAManagerSeq::POAManagerSeq (
-    ::CORBA::ULong max,
-    ::CORBA::ULong length,
-    PortableServer::POAManager_ptr * buffer,
-    ::CORBA::Boolean release
-  )
-  : TAO::unbounded_object_reference_sequence<
-        PortableServer::POAManager,
-        PortableServer::POAManager_var
-      >
-    (max, length, buffer, release)
-{}
-
-PortableServer::POAManagerFactory::POAManagerSeq::POAManagerSeq (
-    const POAManagerSeq &seq
-  )
-  : TAO::unbounded_object_reference_sequence<
-        PortableServer::POAManager,
-        PortableServer::POAManager_var
-      >
-    (seq)
-{}
-
-PortableServer::POAManagerFactory::POAManagerSeq::~POAManagerSeq (void)
-{}
-
-void PortableServer::POAManagerFactory::POAManagerSeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  POAManagerSeq * _tao_tmp_pointer =
-    static_cast<POAManagerSeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:942
-
-namespace PortableServer
-{
-  extern ::CORBA::TypeCode_ptr const _tc_POAManager;
-}
-
-
-#ifndef _TAO_TYPECODE_PortableServer_POAManagerFactory_POAManagerSeq_GUARD
-#define _TAO_TYPECODE_PortableServer_POAManagerFactory_POAManagerSeq_GUARD
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      PortableServer_POAManagerFactory_POAManagerSeq_0 (
-        ::CORBA::tk_sequence,
-        &PortableServer::_tc_POAManager,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_PortableServer_POAManagerFactory_POAManagerSeq_0 =
-      &PortableServer_POAManagerFactory_POAManagerSeq_0;
-    
-  }
-}
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-#endif /* _TAO_TYPECODE_PortableServer_POAManagerFactory_POAManagerSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManagerFactory_POAManagerSeq (
-    ::CORBA::tk_alias,
-    "IDL:omg.org/PortableServer/POAManagerFactory/POAManagerSeq:2.3",
-    "POAManagerSeq",
-    &TAO::TypeCode::tc_PortableServer_POAManagerFactory_POAManagerSeq_0);
-  
-::CORBA::TypeCode_ptr const PortableServer::POAManagerFactory::_tc_POAManagerSeq =
-  &_tao_tc_PortableServer_POAManagerFactory_POAManagerSeq;
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POAManagerFactory::ManagerAlreadyExists::ManagerAlreadyExists (void)
-  : ::CORBA::UserException (
-        "IDL:omg.org/PortableServer/POAManagerFactory/ManagerAlreadyExists:2.3",
-        "ManagerAlreadyExists"
-      )
-{
-}
-
-PortableServer::POAManagerFactory::ManagerAlreadyExists::~ManagerAlreadyExists (void)
-{
-}
-
-PortableServer::POAManagerFactory::ManagerAlreadyExists::ManagerAlreadyExists (const ::PortableServer::POAManagerFactory::ManagerAlreadyExists &_tao_excp)
-  : ::CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POAManagerFactory::ManagerAlreadyExists&
-PortableServer::POAManagerFactory::ManagerAlreadyExists::operator= (const ::PortableServer::POAManagerFactory::ManagerAlreadyExists &_tao_excp)
-{
-  this->::CORBA::UserException::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POAManagerFactory::ManagerAlreadyExists::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ManagerAlreadyExists *_tao_tmp_pointer =
-    static_cast<ManagerAlreadyExists *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POAManagerFactory::ManagerAlreadyExists *
-PortableServer::POAManagerFactory::ManagerAlreadyExists::_downcast ( ::CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<ManagerAlreadyExists *> (_tao_excp);
-}
-
-const PortableServer::POAManagerFactory::ManagerAlreadyExists *
-PortableServer::POAManagerFactory::ManagerAlreadyExists::_downcast ( ::CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const ManagerAlreadyExists *> (_tao_excp);
-}
-
-::CORBA::Exception *PortableServer::POAManagerFactory::ManagerAlreadyExists::_alloc (void)
-{
-  ::CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POAManagerFactory::ManagerAlreadyExists, 0);
-  return retval;
-}
-
-::CORBA::Exception *
-PortableServer::POAManagerFactory::ManagerAlreadyExists::_tao_duplicate (void) const
-{
-  ::CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POAManagerFactory::ManagerAlreadyExists (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POAManagerFactory::ManagerAlreadyExists::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POAManagerFactory::ManagerAlreadyExists::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW ( ::CORBA::MARSHAL ());
-}
-
-void PortableServer::POAManagerFactory::ManagerAlreadyExists::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW ( ::CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-::CORBA::TypeCode_ptr PortableServer::POAManagerFactory::ManagerAlreadyExists::_tao_type (void) const
-{
-  return ::PortableServer::POAManagerFactory::_tc_ManagerAlreadyExists;
-}
-
-// 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_POAManagerFactory_ManagerAlreadyExists = 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_POAManagerFactory_ManagerAlreadyExists (
-    ::CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POAManagerFactory/ManagerAlreadyExists:2.3",
-    "ManagerAlreadyExists",
-    _tao_fields_PortableServer_POAManagerFactory_ManagerAlreadyExists,
-    0);
-  
-::CORBA::TypeCode_ptr const PortableServer::POAManagerFactory::_tc_ManagerAlreadyExists =
-  &_tao_tc_PortableServer_POAManagerFactory_ManagerAlreadyExists;
-
-PortableServer::POAManagerFactory::POAManagerFactory (void)
-{}
-
-PortableServer::POAManagerFactory::~POAManagerFactory (void)
-{}
-
-PortableServer::POAManagerFactory_ptr
-PortableServer::POAManagerFactory::_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return POAManagerFactory::_duplicate (
-      dynamic_cast<POAManagerFactory_ptr> (_tao_objref)
-    );
-}
-
-PortableServer::POAManagerFactory_ptr
-PortableServer::POAManagerFactory::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return POAManagerFactory::_duplicate (
-      dynamic_cast<POAManagerFactory_ptr> (_tao_objref)
-    );
-}
-
-PortableServer::POAManagerFactory_ptr
-PortableServer::POAManagerFactory::_duplicate (POAManagerFactory_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableServer::POAManagerFactory::_tao_release (POAManagerFactory_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-::CORBA::Boolean
-PortableServer::POAManagerFactory::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/POAManagerFactory: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* PortableServer::POAManagerFactory::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POAManagerFactory:2.3";
-}
-
-::CORBA::Boolean
-PortableServer::POAManagerFactory::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_POAManagerFactory (
-    ::CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/POAManagerFactory:2.3",
-    "POAManagerFactory");
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_POAManagerFactory =
-    &_tao_tc_PortableServer_POAManagerFactory;
-}
-
-
-
diff --git a/TAO/tao/PortableServer/POAManagerFactoryC.h b/TAO/tao/PortableServer/POAManagerFactoryC.h
deleted file mode 100644
index 77890521957..00000000000
--- a/TAO/tao/PortableServer/POAManagerFactoryC.h
+++ /dev/null
@@ -1,381 +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_POAMANAGERFACTORYC_H_
-#define _TAO_IDL_POAMANAGERFACTORYC_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/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/AnyTypeCode/PolicyA.h"
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_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_PortableServer_Export
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:49
-
-namespace PortableServer
-{
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:640
-
-#if !defined (_PORTABLESERVER_POAMANAGER__VAR_OUT_CH_)
-#define _PORTABLESERVER_POAMANAGER__VAR_OUT_CH_
-  
-  class POAManager;
-  typedef POAManager *POAManager_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        POAManager
-      >
-    POAManager_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        POAManager
-      >
-    POAManager_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:640
-
-#if !defined (_PORTABLESERVER_POAMANAGERFACTORY__VAR_OUT_CH_)
-#define _PORTABLESERVER_POAMANAGERFACTORY__VAR_OUT_CH_
-  
-  class POAManagerFactory;
-  typedef POAManagerFactory *POAManagerFactory_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        POAManagerFactory
-      >
-    POAManagerFactory_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        POAManagerFactory
-      >
-    POAManagerFactory_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_POAMANAGERFACTORY_CH_)
-#define _PORTABLESERVER_POAMANAGERFACTORY_CH_
-  
-  class TAO_PortableServer_Export POAManagerFactory
-    : public virtual ::CORBA::Object
-  {
-  public:
-    typedef POAManagerFactory_ptr _ptr_type;
-    typedef POAManagerFactory_var _var_type;
-    
-    // The static operations.
-    static POAManagerFactory_ptr _duplicate (POAManagerFactory_ptr obj);
-    
-    static void _tao_release (POAManagerFactory_ptr obj);
-    
-    static POAManagerFactory_ptr _narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static POAManagerFactory_ptr _unchecked_narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static POAManagerFactory_ptr _nil (void)
-    {
-      return static_cast<POAManagerFactory_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_PORTABLESERVER_POAMANAGERFACTORY_POAMANAGERSEQ_CH_)
-#define _PORTABLESERVER_POAMANAGERFACTORY_POAMANAGERSEQ_CH_
-    
-    class POAManagerSeq;
-    
-    typedef
-      TAO_VarSeq_Var_T<
-          POAManagerSeq
-        >
-      POAManagerSeq_var;
-    
-    typedef
-      TAO_Seq_Out_T<
-          POAManagerSeq
-        >
-      POAManagerSeq_out;
-    
-    class TAO_PortableServer_Export POAManagerSeq
-      : public
-          TAO::unbounded_object_reference_sequence<
-              PortableServer::POAManager,
-              PortableServer::POAManager_var
-            >
-    {
-    public:
-      POAManagerSeq (void);
-      POAManagerSeq ( ::CORBA::ULong max);
-      POAManagerSeq (
-          ::CORBA::ULong max,
-          ::CORBA::ULong length,
-          PortableServer::POAManager_ptr* buffer, 
-          ::CORBA::Boolean release = false
-        );
-      POAManagerSeq (const POAManagerSeq &);
-      ~POAManagerSeq (void);
-      
-      static void _tao_any_destructor (void *);
-      
-      typedef POAManagerSeq_var _var_type;
-    };
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_typecode/typecode_decl.cpp:49
-    
-    static ::CORBA::TypeCode_ptr const _tc_POAManagerSeq;
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:53
-
-#if !defined (_PORTABLESERVER_POAMANAGERFACTORY_MANAGERALREADYEXISTS_CH_)
-#define _PORTABLESERVER_POAMANAGERFACTORY_MANAGERALREADYEXISTS_CH_
-    
-    class TAO_PortableServer_Export ManagerAlreadyExists : public ::CORBA::UserException
-    {
-    public:
-      
-      ManagerAlreadyExists (void);
-      ManagerAlreadyExists (const ManagerAlreadyExists &);
-      ~ManagerAlreadyExists (void);
-
-      ManagerAlreadyExists &operator= (const ManagerAlreadyExists &);
-      
-      static void _tao_any_destructor (void *);
-      
-      static ManagerAlreadyExists *_downcast ( ::CORBA::Exception *);
-      static const ManagerAlreadyExists *_downcast ( ::CORBA::Exception const *);
-      
-      static ::CORBA::Exception *_alloc (void);
-      
-      virtual ::CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &cdr
-          ACE_ENV_ARG_DECL
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &cdr
-          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_ManagerAlreadyExists;
-
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::POAManager_ptr create_POAManager (
-        const char * id,
-        const ::CORBA::PolicyList & policies
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
-        ::PortableServer::POAManagerFactory::ManagerAlreadyExists,
-        ::CORBA::PolicyError
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (
-        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 ::PortableServer::POAManager_ptr find (
-        const char * id
-        ACE_ENV_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.
-    POAManagerFactory (void);
-    
-    virtual ~POAManagerFactory (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    POAManagerFactory (const POAManagerFactory &);
-    
-    void operator= (const POAManagerFactory &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:49
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POAManagerFactory;
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:78
-
-} // module PortableServer
-
-// TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:63
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_)
-#define _PORTABLESERVER_POAMANAGER__TRAITS_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManager>
-  {
-    static ::PortableServer::POAManager_ptr duplicate (
-        ::PortableServer::POAManager_ptr
-      );
-    static void release (
-        ::PortableServer::POAManager_ptr
-      );
-    static ::PortableServer::POAManager_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::PortableServer::POAManager_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_POAMANAGERFACTORY__TRAITS_)
-#define _PORTABLESERVER_POAMANAGERFACTORY__TRAITS_
-  
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManagerFactory>
-  {
-    static ::PortableServer::POAManagerFactory_ptr duplicate (
-        ::PortableServer::POAManagerFactory_ptr
-      );
-    static void release (
-        ::PortableServer::POAManagerFactory_ptr
-      );
-    static ::PortableServer::POAManagerFactory_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::PortableServer::POAManagerFactory_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1092
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
index 256499a7456..4c27f187332 100644
--- a/TAO/tao/PortableServer/PortableServer.h
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -41,7 +41,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #include "tao/PortableServer/PortableServerC.h"
 #undef TAO_PORTABLESERVER_SAFE_INCLUDE
 #include "tao/PortableServer/POAManagerC.h"
-#include "tao/PortableServer/POAManagerFactoryC.h"
 #include "tao/PortableServer/PS_CurrentC.h"
 #include "tao/PortableServer/PortableServer_Functions.h"
 #include "tao/PortableServer/PortableServer_WFunctions.h"
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 50000e9bcb8..938c7edeaec 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -74,12 +74,9 @@ module PortableServer
   const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID     = 21;
   const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID    = 22;
 
-  // Forward declaration POAManager interface.
+  // Forward declaration
   local interface POAManager;
 
-  // Forward declaration POAManagerFactory interface.
-  local interface POAManagerFactory;
-  
   // Forward declaration AdapterActivator interface.
   local interface AdapterActivator;
 
@@ -149,7 +146,6 @@ module PortableServer
     readonly attribute POA          the_parent;
     readonly attribute POAList      the_children;
     readonly attribute POAManager   the_POAManager;
-    readonly attribute POAManagerFactory   the_POAManagerFactory;
     attribute AdapterActivator      the_activator;
 
     // Servant Manager registration:
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 80c5bdc4fcc..f84d9eeaa47 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -197,25 +197,6 @@ namespace PortableServer
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLESERVER_POAMANAGERFACTORY__VAR_OUT_CH_)
-#define _PORTABLESERVER_POAMANAGERFACTORY__VAR_OUT_CH_
-  
-  class POAManagerFactory;
-  typedef POAManagerFactory *POAManagerFactory_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        POAManagerFactory
-      >
-    POAManagerFactory_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        POAManagerFactory
-      >
-    POAManagerFactory_out;
-
-#endif /* end #if !defined */
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
@@ -997,13 +978,6 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 
-    virtual ::PortableServer::POAManagerFactory_ptr the_POAManagerFactory (
-        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
 
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
index d980f303b74..db6f88df047 100644
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
@@ -18,7 +18,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);
 
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
index 08f4965c8e7..7383d7bd9cf 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (PortableServer,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name,
-                                  PortableServer::POAManager_ptr poa_manager,
+                  TAO_POA_Manager &poa_manager,
                   const TAO_POA_Policy_Set &policies,
                   TAO_Root_POA *parent,
                   ACE_Lock &lock,
diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h
index eddd7bf3205..7a6d3c2289c 100644
--- a/TAO/tao/PortableServer/Regular_POA.h
+++ b/TAO/tao/PortableServer/Regular_POA.h
@@ -39,7 +39,7 @@ class TAO_PortableServer_Export TAO_Regular_POA
 {
 public:
   TAO_Regular_POA (const String &name,
-                   PortableServer::POAManager_ptr poa_manager,
+                   TAO_POA_Manager &poa_manager,
                    const TAO_POA_Policy_Set &policies,
                    TAO_Root_POA *parent,
                    ACE_Lock &lock,
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index b476ae8bec6..2ec60bb2e41 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -19,7 +19,6 @@
 #include "tao/PortableServer/AdapterActivatorC.h"
 #include "tao/PortableServer/Non_Servant_Upcall.h"
 #include "tao/PortableServer/POAManager.h"
-#include "tao/PortableServer/POAManagerFactory.h"
 #include "tao/PortableServer/ServantManagerC.h"
 #include "tao/PortableServer/poa_macros.h"
 #include "tao/PortableServer/POA_Guard.h"
@@ -31,7 +30,6 @@
 #include "tao/PortableServer/ServantRetentionStrategy.h"
 #include "tao/PortableServer/ImplicitActivationStrategy.h"
 #include "tao/PortableServer/ThreadStrategy.h"
-#include "tao/PortableServer/Acceptor_Filter_Factory.h"
 
 #include "tao/StringSeqC.h"
 #include "tao/PortableInterceptorC.h"
@@ -201,7 +199,7 @@ TAO_Root_POA::set_obj_ref_factory (
 }
 
 TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
-                            PortableServer::POAManager_ptr poa_manager,
+                            TAO_POA_Manager &poa_manager,
                             const TAO_POA_Policy_Set &policies,
                             TAO_Root_POA *parent,
                             ACE_Lock &lock,
@@ -210,8 +208,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
                             TAO_Object_Adapter *object_adapter
                             ACE_ENV_ARG_DECL)
   : name_ (name),
-    poa_manager_ (* (dynamic_cast <TAO_POA_Manager*> (poa_manager))),
-    poa_manager_factory_ (* (object_adapter->poa_manager_factory_)),
+    poa_manager_ (poa_manager),
     tagged_component_ (),
     tagged_component_id_ (),
     profile_id_array_ (0),
@@ -235,7 +232,6 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
     wait_for_completion_pending_ (0),
     waiting_destruction_ (0),
     servant_deactivation_condition_ (thread_lock),
-    filter_factory_ (0),
     caller_key_to_object_ (0),
     servant_for_key_to_object_ (0)
 {
@@ -315,10 +311,6 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
 
 TAO_Root_POA::~TAO_Root_POA (void)
 {
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t)~TAO_Root_POA : %s\n", this->the_name ()));
-    }
 }
 
 void
@@ -407,53 +399,41 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
   // created and associated with the new POA. Otherwise, the specified
   // POAManager object is associated with the new POA. The POAManager
   // object can be obtained using the attribute name the_POAManager.
-
-  PortableServer::POAManager_var the_poa_manager;
-
+  TAO_POA_Manager* tao_poa_manager = 0;
+  PortableServer::POAManager_var safe_poa_manager;
   if (CORBA::is_nil (poa_manager))
     {
-      PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
-      PortableServer::POA_var root_poa;
-
-      // Find the RootPOA by traversing the POA hierarchy until the
-      // RootPOA is reached.  The RootPOA has no parent.
-      while (!CORBA::is_nil (poa.in ()))
-      {
-        root_poa = poa;
-        poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-      }
-
-      // Get the POAManagerFactory instance owned by RootPOA.
-      PortableServer::POAManagerFactory_var tao_poa_manager_factory
-        = root_poa->the_POAManagerFactory ();
-
-      CORBA::PolicyList empty_policies;
-      // The POAManager name will be generated when the POAManager instance
-      // is created.
-      the_poa_manager
-        = tao_poa_manager_factory->create_POAManager (0,
-                                                      empty_policies
-                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_NEW_THROW_EX (tao_poa_manager,
+                        TAO_POA_Manager (this->object_adapter ()),
+                        CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+      safe_poa_manager = tao_poa_manager;
     }
   else
     {
-      the_poa_manager = PortableServer::POAManager::_duplicate (poa_manager);
+      // This is the POAManager that was passed in.  Do not put it 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.
+      tao_poa_manager = dynamic_cast<TAO_POA_Manager *> (poa_manager);
     }
 
   PortableServer::POA_var poa = this->create_POA_i (adapter_name,
-                                                    the_poa_manager.in (),
+                                                    *tao_poa_manager,
                                                     tao_policies
                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
+  // Release the POA_Manager_var since we got here without error.  The
+  // TAO_Regular_POA object takes ownership of the POA_Manager object
+  // (actually it shares the ownership with its peers).
+  (void) safe_poa_manager._retn ();
+
   return poa._retn ();
 }
 
 TAO_Root_POA *
 TAO_Root_POA::new_POA (const String &name,
-                       PortableServer::POAManager_ptr poa_manager,
+                       TAO_POA_Manager &poa_manager,
                        const TAO_POA_Policy_Set &policies,
                        TAO_Root_POA *parent,
                        ACE_Lock &lock,
@@ -482,7 +462,7 @@ TAO_Root_POA::new_POA (const String &name,
 
 PortableServer::POA_ptr
 TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
-                            PortableServer::POAManager_ptr poa_manager,
+                            TAO_POA_Manager &poa_manager,
                             const TAO_POA_Policy_Set &policies
                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -2163,7 +2143,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.
@@ -2196,7 +2176,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 ()
@@ -2272,22 +2252,13 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  if (this->filter_factory_ == 0)
-    this->filter_factory_
-      = ACE_Dynamic_Service<TAO_Acceptor_Filter_Factory>::instance ("TAO_Acceptor_Filter_Factory");
-
-  TAO_Acceptor_Filter* filter =
-    this->filter_factory_->create_object (this->poa_manager_);
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Acceptor_Filter> new_filter (filter);
-
+  TAO_Default_Acceptor_Filter filter;
   TAO_Stub *data =
     this->create_stub_object (
       key,
       type_id,
       client_exposed_policies._retn (),
-      filter,
+      &filter,
       this->orb_core_.lane_resources ().acceptor_registry ()
       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -2561,8 +2532,8 @@ TAO_Root_POA::ORT_adapter_i (void)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Cannot initialize the "
-                           "object_reference_template_adapter\n");
+                           "Cannot initialize the "
+                           "object_reference_template_adapter");
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
@@ -2891,14 +2862,13 @@ TAO_Root_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return PortableServer::POAManager::_duplicate (&this->poa_manager_);
 }
 
-PortableServer::POAManagerFactory_ptr
-TAO_Root_POA::the_POAManagerFactory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+PortableInterceptor::AdapterManagerId
+TAO_Root_POA::get_manager_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_);
+  return this->poa_manager_.get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-
 CORBA::ORB_ptr
 TAO_Root_POA::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index eb6502c9ad1..59d8e490c0c 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -68,11 +68,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward Declaration
 class TAO_Acceptor_Filter;
-class TAO_Acceptor_Filter_Factory;
 class TAO_Acceptor_Registry;
 class TAO_IORInfo;
 class TAO_Regular_POA;
-class TAO_POAManager_Factory;
 
 namespace PortableInterceptor
 {
@@ -210,8 +208,11 @@ public:
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAManagerFactory_ptr the_POAManagerFactory (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  /// @todo At the moment to POAManagerFactory is implemented and the
+  /// POAManager has the get_id method this can be zapped, IORInfo can
+  /// then just call get_id
+  PortableInterceptor::AdapterManagerId get_manager_id (
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method returns the adapter_name as a sequence of strings of
@@ -358,7 +359,7 @@ public:
     );
 
   TAO_Root_POA (const String &name,
-                PortableServer::POAManager_ptr poa_manager,
+                TAO_POA_Manager &poa_manager,
                 const TAO_POA_Policy_Set &policies,
                 TAO_Root_POA *parent,
                 ACE_Lock &lock,
@@ -604,7 +605,7 @@ protected:
 
   /// Template method for creating new POA's of this type.
   virtual TAO_Root_POA *new_POA (const String &name,
-                            PortableServer::POAManager_ptr poa_manager,
+                            TAO_POA_Manager &poa_manager,
                             const TAO_POA_Policy_Set &policies,
                             TAO_Root_POA *parent,
                             ACE_Lock &lock,
@@ -624,7 +625,7 @@ protected:
                      PortableServer::POA::InvalidPolicy));
 
   PortableServer::POA_ptr create_POA_i (const String &adapter_name,
-                                        PortableServer::POAManager_ptr poa_manager,
+                                        TAO_POA_Manager &poa_manager,
                                         const TAO_POA_Policy_Set &policies
                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -878,10 +879,8 @@ protected:
 
   String name_;
 
-  /// Reference to the POAManager that this poa assicuates with.
+  /// The POA Manager belonging to this POA
   TAO_POA_Manager &poa_manager_;
-  /// Reference to the POAManagerFactory that generate the POAManager.
-  TAO_POAManager_Factory& poa_manager_factory_;
 
   IOP::TaggedComponentList tagged_component_;
 
@@ -943,8 +942,6 @@ protected:
 
   TAO_SYNCH_CONDITION servant_deactivation_condition_;
 
-  TAO_Acceptor_Filter_Factory * filter_factory_;
-
 public:
     // @todo Temporarily for servant retention
   CORBA::ULong caller_key_to_object_;
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index 10c062e52d1..d2741f46546 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -36,12 +36,6 @@ class TAO_Root_POA;
 class TAO_ORB_Core;
 class TAO_ServerRequest;
 
-namespace PortableServer
-{
-  class POAManager;
-  typedef POAManager *POAManager_ptr;
-}
-
 /**
  * @class TAO_Servant_Dispatcher
  *
@@ -76,7 +70,7 @@ public:
   /// Factory method for creating new POA's.
   virtual TAO_Root_POA *create_Root_POA (
       const ACE_CString &name,
-      PortableServer::POAManager_ptr poa_manager,
+      TAO_POA_Manager &poa_manager,
       const TAO_POA_Policy_Set &policies,
       ACE_Lock &lock,
       TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 6807655a876..9879ff26ef4 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -10,7 +10,6 @@
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "tao/PolicyC.h"
-#include "tao/Endpoint.h"
 
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
@@ -255,8 +254,8 @@ TAO_Profile::decode (TAO_InputCDR& cdr)
                   encap_len));
     }
 
-  // Decode any additional endpoints per profile. This is used by RTCORBA
-  // and by IIOP when TAG_ALTERNATE_IIOP_ADDRESS components are present.
+  // Decode any additional endpoints per profile.  (At the present,
+  // only RTCORBA takes advantage of this feature.)
   if (this->decode_endpoints () == -1)
     {
       return -1;
@@ -729,36 +728,6 @@ TAO_Profile::is_equivalent (const TAO_Profile *other)
   return result;
 }
 
-CORBA::Boolean
-TAO_Profile::compare_key (const TAO_Profile *other) const
-{
-  return (this->ref_object_key_ == other->ref_object_key_) ||
-    ((this->ref_object_key_ != 0 &&
-      other->ref_object_key_ != 0 &&
-      this->ref_object_key_->object_key() ==
-      other->ref_object_key_->object_key()));
-}
-
-TAO_Endpoint *
-TAO_Profile::first_filtered_endpoint (void)
-{
-  return this->endpoint()->next_filtered(this->orb_core_,0);
-}
-
-TAO_Endpoint *
-TAO_Profile::next_filtered_endpoint (TAO_Endpoint *source)
-{
-  if (source == 0)
-    return this->first_filtered_endpoint();
-  return this->endpoint()->next_filtered(this->orb_core_,this->endpoint());
-}
-
-void
-TAO_Profile::add_generic_endpoint (TAO_Endpoint *)
-{
-  // noop for the base type
-}
-
 TAO_Service_Callbacks::Profile_Equivalence
 TAO_Profile::is_equivalent_hook (const TAO_Profile *other)
 {
@@ -791,12 +760,6 @@ TAO_Profile::encode_alternate_endpoints(void)
   return 0;
 }
 
-void
-TAO_Profile::remove_generic_endpoint (TAO_Endpoint *)
-{
-  // default for virtual methods, thus a no-op
-}
-
 //@@ TAO_PROFILE_SPL_COMMENT_HOOK_END
 
 //@@ TAO_PROFILE_SPL_METHODS_ADD_HOOK
@@ -935,8 +898,6 @@ TAO_Unknown_Profile::create_profile_body (TAO_OutputCDR &) const
   return;
 }
 
-
-
 // *************************************************************
 // Operators for TAO_opaque encoding and decoding
 // *************************************************************
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 700b257c6ec..d31e55b6257 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -206,7 +206,7 @@ public:
   virtual int encode_alternate_endpoints (void);
 
   /**
-   * Return a pointer to this profile's endpoint.  If the profile
+   * Return pointer to this profile's endpoint.  If the profile
    * contains more than one endpoint, i.e., a list, the method returns
    * the head of the list.
    */
@@ -215,33 +215,6 @@ public:
   /// Return how many endpoints this profile contains.
   virtual CORBA::ULong endpoint_count (void) const = 0;
 
-  /**
-   * Return the first endpoint in the list that matches some filtering
-   * constraint, such as IPv6 compatibility for IIOP endpoints. This
-   * method is implemented in terms of TAO_Endpoint;:next_filtered().
-   */
-  TAO_Endpoint *first_filtered_endpoint (void);
-
-  /// Return the next filtered endpoint in the list after the one
-  /// passed in. This method is implemented in terms of
-  /// TAO_Endpoint;:next_filtered(). If the supplied source endpoint
-  /// is null, this returns the first filtered endpoint.
-  TAO_Endpoint *next_filtered_endpoint (TAO_Endpoint *source);
-
-  /**
-   * Remove the provided endpoint from the profile. Some
-   * subclasses of TAO_Profile already have a protocol-specific
-   * version of remove_endpoint, but this generic interface is
-   * required. The default implementation is a no-op. Protocol
-   * maintainers wishing to add support for the EndpointPolicy must
-   * implement remove_generic_endpoint to call their protocol-specific
-   * version of remove_endpoint
-   */
-  virtual void remove_generic_endpoint (TAO_Endpoint *ep);
-
-  /// Add a protocol-agnostic endpoint
-  virtual void add_generic_endpoint (TAO_Endpoint *ep);
-
   /// Verify profile equivalance.
   /**
    * Two profiles are equivalent if their tag, object_key, version
@@ -254,12 +227,6 @@ public:
    */
   CORBA::Boolean is_equivalent (const TAO_Profile* other_profile);
 
-  /**
-   * Compare the object key for this profile with that of
-   * another. This is weaker than is_equivalent
-   */
-  CORBA::Boolean compare_key (const TAO_Profile *other) const;
-
   /// Return a hash value for this object.
   virtual CORBA::ULong hash (CORBA::ULong max
                              ACE_ENV_ARG_DECL) = 0;
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 8f87bb6f619..123dc6c1425 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -14,7 +14,6 @@
 #include "tao/Transport_Connector.h"
 #include "tao/Endpoint.h"
 #include "tao/SystemException.h"
-#include "tao/Client_Strategy_Factory.h"
 
 #include "ace/Countdown_Time.h"
 
@@ -120,6 +119,7 @@ namespace TAO
       }
   }
 
+
   bool
   Profile_Transport_Resolver::try_connect (
       TAO_Transport_Descriptor_Interface *desc,
@@ -127,28 +127,6 @@ namespace TAO
        ACE_ENV_ARG_DECL
      )
   {
-    return this->try_connect_i (desc,max_time_value,0 ACE_ENV_ARG_PARAMETER);
-  };
-
-  bool
-  Profile_Transport_Resolver::try_parallel_connect (
-       TAO_Transport_Descriptor_Interface *desc,
-       ACE_Time_Value *max_time_value
-       ACE_ENV_ARG_DECL
-     )
-  {
-    return this->try_connect_i (desc,max_time_value,1 ACE_ENV_ARG_PARAMETER);
-  };
-
-
-  bool
-  Profile_Transport_Resolver::try_connect_i (
-       TAO_Transport_Descriptor_Interface *desc,
-       ACE_Time_Value *max_time_value,
-       bool parallel
-       ACE_ENV_ARG_DECL
-     )
-  {
     TAO_Connector_Registry *conn_reg =
       this->stub_->orb_core ()->connector_registry (
         ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -169,30 +147,28 @@ namespace TAO
     bool const is_conn_timeout =
       this->get_connection_timeout (connection_timeout);
 
-    ACE_Time_Value *max_wait_time =
-      is_conn_timeout ? &connection_timeout : max_time_value;
 
-    if (parallel)
+    ACE_Time_Value *max_wait_time = 0;
+
+    if (is_conn_timeout == true)
       {
-        this->transport_ =
-          conn_reg->get_connector (desc->endpoint ()->tag ())->
-          parallel_connect (this,
-                            desc,
-                            max_wait_time
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
+        max_wait_time = &connection_timeout;
       }
     else
       {
+        max_wait_time = max_time_value;
+      }
+
+
     // Obtain a connection.
     this->transport_ =
-          conn_reg->get_connector (desc->endpoint ()->tag ())->
-          connect (this,
+      conn_reg->get_connector (desc->endpoint ()->tag ())->connect (
+        this,
         desc,
         max_wait_time
         ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (false);
-      }
+
     // A timeout error occurred.
     // If the user has set a roundtrip timeout policy, throw a timeout
     // exception.  Otherwise, just fall through and return false to
@@ -217,20 +193,6 @@ namespace TAO
   }
 
   bool
-  Profile_Transport_Resolver::use_parallel_connect (void) const
-  {
-    TAO_ORB_Core *oc = this->stub_->orb_core();
-    return (oc->orb_params()->use_parallel_connects()
-#if 0       // it was decided that even with blocked connects
-            // parallel connects could be useful, at least for cache
-            // processing.
-            oc->client_factory()->connect_strategy() !=
-            TAO_Client_Strategy_Factory::TAO_BLOCKED_CONNECT
-#endif /* 0 */
-            );
-  }
-
-  bool
   Profile_Transport_Resolver::get_connection_timeout (
     ACE_Time_Value &max_wait_time)
   {
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 34cef016395..5ec4889a76b 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -130,27 +130,13 @@ namespace TAO
     /// released back to the cache.
     void transport_released (void) const;
 
-    /// This is a callback method used by the endpoint selectors to
+    /// This is a callback method used by the endpoint selectors, to
     /// delegate the responsibility of reserving a transport from the
-    /// connection cache for this invocation. When the descriptor
-    /// contains more than one endpoint (as part of a linked list) and
-    /// the parallel flag is true then the connector will look for a
-    /// connection on any of the endpoints if it supports that
-    /// behavior, otherwise an ENOTSUP errno will be set and the
-    /// method will return false.
+    /// connection cache for this invocation.
     bool try_connect (TAO_Transport_Descriptor_Interface *desc,
                       ACE_Time_Value *val
                       ACE_ENV_ARG_DECL);
 
-    bool try_parallel_connect (TAO_Transport_Descriptor_Interface *desc,
-                               ACE_Time_Value *val
-                               ACE_ENV_ARG_DECL);
-
-    /// This method wraps a call to the orb core to see if parallel
-    /// connection attempts are even desired. This is controlled by
-    /// the -ORBUseParallelConnects 1|0 commandline option.
-    bool use_parallel_connect (void) const;
-
     /// Initialize the inconsistent policy list that this object has
     /// cached.
     void init_inconsistent_policies (ACE_ENV_SINGLE_ARG_DECL)
@@ -166,10 +152,6 @@ namespace TAO
     bool get_connection_timeout (ACE_Time_Value &max_wait_time);
 
   private:
-    bool try_connect_i (TAO_Transport_Descriptor_Interface *desc,
-                        ACE_Time_Value *val,
-                        bool parallel
-                        ACE_ENV_ARG_DECL);
 
     /// Target object
     mutable CORBA::Object *obj_;
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index 464c35660aa..8e49acb273c 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -89,7 +89,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;
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 7cfc74d470f..6d4baacc932 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -38,7 +38,7 @@ ACE_RCSID (RTPortableServer,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
-                        PortableServer::POAManager_ptr poa_manager,
+                        TAO_POA_Manager &poa_manager,
                         const TAO_POA_Policy_Set &policies,
                         TAO_Root_POA *parent,
                         ACE_Lock &lock,
@@ -71,7 +71,7 @@ TAO_RT_POA::~TAO_RT_POA (void)
 
 TAO_Root_POA *
 TAO_RT_POA::new_POA (const String &name,
-                     PortableServer::POAManager_ptr poa_manager,
+                     TAO_POA_Manager &poa_manager,
                      const TAO_POA_Policy_Set &policies,
                      TAO_Root_POA *parent,
                      ACE_Lock &lock,
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 2e255935f4b..5ae1c845166 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -256,7 +256,7 @@ public:
                                                       ACE_ENV_ARG_DECL);
 
   TAO_RT_POA (const String &name,
-              PortableServer::POAManager_ptr poa_manager,
+              TAO_POA_Manager &poa_manager,
               const TAO_POA_Policy_Set &policies,
               TAO_Root_POA *parent,
               ACE_Lock &lock,
@@ -273,7 +273,7 @@ protected:
 
   /// Template method for creating new POA's of this type.
   virtual TAO_Root_POA *new_POA (const String &name,
-                                 PortableServer::POAManager_ptr poa_manager,
+                            TAO_POA_Manager &poa_manager,
                             const TAO_POA_Policy_Set &policies,
                             TAO_Root_POA *parent,
                             ACE_Lock &lock,
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 25b735ea832..9273b3d716c 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -173,8 +173,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_));
 
@@ -186,8 +186,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 */
 
@@ -227,8 +227,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,
@@ -244,8 +244,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_));
             }
@@ -372,7 +372,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
 
 TAO_Root_POA *
 TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
-                                            PortableServer::POAManager_ptr poa_manager,
+                                            TAO_POA_Manager &poa_manager,
                                             const TAO_POA_Policy_Set &policies,
                                             ACE_Lock &lock,
                                             TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index 2e3af3ce333..138523ff62a 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -63,7 +63,7 @@ public:
 
   /// Factory method for creating new POA's.
   TAO_Root_POA *create_Root_POA (const ACE_CString &name,
-                                 PortableServer::POAManager_ptr poa_manager,
+                                 TAO_POA_Manager &poa_manager,
                                  const TAO_POA_Policy_Set &policies,
                                  ACE_Lock &lock,
                                  TAO_SYNCH_MUTEX &thread_lock,
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index d0a8fc4c313..7157b3d84c4 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -203,7 +203,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
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
index 17a9d2d642a..0883b3ee91c 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -3,7 +3,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/Transport.h"
-#include "tao/LF_Multi_Event.h"
 
 #include "ace/Synch_Options.h"
 
@@ -42,14 +41,9 @@ TAO_Reactive_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
 }
 
 int
-TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev,
-                                       TAO_Transport *,
-                                       ACE_Time_Value * max_wait_time)
+TAO_Reactive_Connect_Strategy::wait (TAO_Connection_Handler *ch,
+                                     ACE_Time_Value *max_wait_time)
 {
-  int result = 0;
-  if (ev == 0)
-    return -1;
-
   if (TAO_debug_level > 2)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -57,10 +51,12 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev,
                   ACE_TEXT ("connection completion - wait ()\n")));
     }
 
+  int result = 0;
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      while (ev->keep_waiting ())
+      while (ch->keep_waiting ())
         {
           result =
             this->orb_core_->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER);
@@ -88,7 +84,7 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev,
   ACE_ENDTRY;
 
   // Set the result.
-  if (result != -1 && ev->error_detected ())
+  if (ch->error_detected () && result != -1)
     {
       result = -1;
     }
@@ -96,4 +92,15 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev,
   return result;
 }
 
+int
+TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t,
+                                     ACE_Time_Value *val)
+{
+  if (t == 0)
+    return -1;
+
+  return this->wait (t->connection_handler (),
+                     val);
+}
+
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h
index 694bbb49560..305b5e9576e 100644
--- a/TAO/tao/Reactive_Connect_Strategy.h
+++ b/TAO/tao/Reactive_Connect_Strategy.h
@@ -28,6 +28,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+class TAO_Connector;
+
 /**
  * @class TAO_Reactive_Connect_Strategy
  *
@@ -51,8 +53,12 @@ public:
   virtual void synch_options (ACE_Time_Value *val,
                               ACE_Synch_Options &opt);
 
-protected:
-  virtual int wait_i (TAO_LF_Event *ch, TAO_Transport *, ACE_Time_Value *val);
+  virtual int wait (TAO_Connection_Handler *ch,
+                     ACE_Time_Value *val);
+
+
+  virtual int wait (TAO_Transport *t,
+                     ACE_Time_Value *val);
 
 };
 
diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp
index 6ce7297a70f..34f0cd5ab2e 100644
--- a/TAO/tao/Resume_Handle.cpp
+++ b/TAO/tao/Resume_Handle.cpp
@@ -1,6 +1,5 @@
 #include "tao/Resume_Handle.h"
 #include "tao/ORB_Core.h"
-#include "debug.h"
 
 #include "ace/Reactor.h"
 
@@ -47,35 +46,35 @@ TAO_Resume_Handle::handle_input_return_value_hook (int& return_value)
        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,
+      // 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));
+                      "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,
+      // 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"));
+                      "handle_input returning -1, so handle is not resumed.\n"));
+        }
     }
-  }
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
new file mode 100644
index 00000000000..f39bd28f6ba
--- /dev/null
+++ b/TAO/tao/Sequence.cpp
@@ -0,0 +1,1116 @@
+// $Id$
+
+#include "tao/Sequence.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Sequence.i"
+#endif /* __ACE_INLINE__ */
+
+#include "tao/SystemException.h"
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+# include "ace/Message_Block.h"
+#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 1) */
+
+#include "ace/Log_Msg.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_Memory.h"
+
+
+ACE_RCSID (tao,
+           Sequence,
+           "$Id$")
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// *************************************************************
+// Operations for class TAO_Base_Sequence
+// *************************************************************
+
+TAO_Base_Sequence::~TAO_Base_Sequence (void)
+{
+}
+
+void TAO_Base_Sequence::_shrink_buffer (CORBA::ULong, CORBA::ULong)
+{
+
+  // default is no op.
+}
+
+void
+TAO_Base_Sequence::_downcast (void *,
+                              CORBA::Object *
+                              ACE_ENV_ARG_DECL_NOT_USED)
+{
+  // default is no op.
+  // @@ TODO Maybe throw an exception?
+}
+
+CORBA::Object *
+TAO_Base_Sequence::_upcast (void *) const
+{
+  return 0;
+}
+
+void
+TAO_Base_Sequence::check_bounds (char const * filename,
+                                 unsigned long lineno,
+                                 CORBA::ULong tao_idx,
+                                 CORBA::ULong tao_max) const
+{
+  // TODO use hook
+  if (tao_idx >= tao_max)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "Access error in TAO_Base_Sequence file=%s, line=%u, "
+                  "idx=%u, max=%u\n",
+                  ACE_TEXT_TO_TCHAR_IN (filename),
+                  lineno,
+                  tao_idx,
+                  tao_max));
+
+      // @todo When we have a hook setup, we can totally ignore this or
+      //       even remove this.
+#if defined (ACE_HAS_EXCEPTIONS)
+      ACE_THROW (CORBA::BAD_PARAM ());
+#else
+      ACE_OS::abort ();
+#endif /* ACE_HAS_EXCEPTIONS */
+    }
+}
+
+// *************************************************************
+// Operations for class TAO_Unbounded_Base_Sequence
+// *************************************************************
+
+TAO_Unbounded_Base_Sequence::~TAO_Unbounded_Base_Sequence (void)
+{
+}
+
+// *************************************************************
+// Operations for class TAO_Bounded_Base_Sequence
+// *************************************************************
+
+TAO_Bounded_Base_Sequence::~TAO_Bounded_Base_Sequence (void)
+{
+}
+
+// *************************************************************
+
+// constructor for unbounded string seq
+TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
+    CORBA::ULong maximum
+  )
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_String_Sequence::allocbuf (maximum)
+      )
+{
+}
+
+TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
+    const TAO_Unbounded_String_Sequence & rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      char* *tmp1 =
+        TAO_Unbounded_String_Sequence::allocbuf (this->maximum_);
+
+      char ** const tmp2 =
+        reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA::string_dup (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+TAO_Unbounded_String_Sequence::~TAO_Unbounded_String_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+TAO_Unbounded_String_Sequence &
+TAO_Unbounded_String_Sequence::operator= (
+    const TAO_Unbounded_String_Sequence & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      char ** tmp = reinterpret_cast<char **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::string_free (tmp[i]);
+          tmp[i] = 0;
+        }
+
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the older buffer.
+          TAO_Unbounded_String_Sequence::freebuf (tmp);
+          this->buffer_ =
+            TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  char ** tmp1 = reinterpret_cast <char **> (this->buffer_);
+  char ** const tmp2 = reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = CORBA::string_dup (tmp2[i]);
+    }
+
+  return *this;
+}
+
+TAO_SeqElem_String_Manager
+TAO_Unbounded_String_Sequence::operator[] (CORBA::ULong slot) const
+{
+  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
+  char ** const tmp =
+    reinterpret_cast<char ** ACE_CAST_CONST> (this->buffer_);
+  return TAO_SeqElem_String_Manager (tmp + slot,
+                                     this->release_);
+}
+
+char **
+TAO_Unbounded_String_Sequence::allocbuf (CORBA::ULong nelems)
+{
+  char ** buf = 0;
+  ACE_NEW_RETURN (buf,
+                  char * [nelems],
+                  0);
+
+  for (CORBA::ULong i = 0; i < nelems; ++i)
+    {
+      buf[i] = 0;
+    }
+
+  return buf;
+}
+
+void
+TAO_Unbounded_String_Sequence::freebuf (char ** buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  // {orbos/97-05-15:16.11}
+  // The freebuf function ensures that the destructor for each element
+  // is called before the buffer is destroyed, except for string
+  // elements, which are freed using string_free(), and object
+  // reference elements, which are freed using release(). The freebuf
+  // function will ignore null pointers passed to it.
+
+  // @@ How are we supposed to implement that! We don't know the
+  // length of the buffer here.
+  //  Mark the length in the first four bytes? For the moment we let
+  //  that be.
+
+  delete [] buffer;
+}
+
+void
+TAO_Unbounded_String_Sequence::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  TAO_Unbounded_String_Sequence * tmp =
+    static_cast <TAO_Unbounded_String_Sequence *> (_tao_void_pointer);
+  delete tmp;
+}
+
+char **
+TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
+{
+  char ** result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result = allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result = reinterpret_cast <char **> (this->buffer_);
+        }
+    }
+  else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish
+          // ownership.
+          result = reinterpret_cast <char **> (this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
+const char **
+TAO_Unbounded_String_Sequence::get_buffer (void) const
+{
+  return reinterpret_cast<const char ** ACE_CAST_CONST> (this->buffer_);
+}
+
+void
+TAO_Unbounded_String_Sequence::_allocate_buffer (CORBA::ULong length)
+{
+  char ** tmp = TAO_Unbounded_String_Sequence::allocbuf (length);
+
+  if (this->buffer_ != 0)
+    {
+      char ** old = reinterpret_cast <char **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          // Only call duplicate when we did not own the previous
+          // buffer, since after this method we own it we must also
+          // own the objects.  If we already own the objects there is
+          // no need to copy them, if we did we would also have to
+          // remove the old instances.
+          if (!this->release_)
+            {
+              tmp [i] = CORBA::string_dup (old[i]);
+            }
+          else
+            {
+              tmp [i] = old[i];
+            }
+        }
+
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+void
+TAO_Unbounded_String_Sequence::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+
+  char ** tmp = reinterpret_cast <char **> (this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::string_free (tmp[i]);
+      tmp[i] = 0;
+    }
+
+  TAO_Unbounded_String_Sequence::freebuf (tmp);
+  this->buffer_ = 0;
+  this->length_ = 0;
+  this->release_ = 0;
+  this->maximum_ = 0;
+}
+
+void
+TAO_Unbounded_String_Sequence::_shrink_buffer (CORBA::ULong nl,
+                                               CORBA::ULong ol)
+{
+  char ** tmp = reinterpret_cast <char **> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::string_free (tmp[i]);
+      tmp[i] = 0;
+    }
+}
+
+void
+TAO_Unbounded_String_Sequence::replace (CORBA::ULong maximum,
+                                        CORBA::ULong length,
+                                        char ** data,
+                                        CORBA::Boolean release)
+{
+  if (this->release_ == 1)
+    {
+      char ** tmp = reinterpret_cast <char **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::string_free (tmp[i]);
+          tmp[i] = 0;
+        }
+    }
+
+  this->maximum_ = maximum;
+  this->length_ = length;
+
+  // If 'release' is 1, it is the caller's responsibility to allocate
+  // 'data' with CORBA::string_alloc.
+  this->buffer_ = data;
+  this->release_ = release;
+}
+// *************************************************************
+
+// constructor for unbounded wide string seq
+TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
+    CORBA::ULong maximum
+  )
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_WString_Sequence::allocbuf (maximum)
+      )
+{
+}
+
+TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
+    const TAO_Unbounded_WString_Sequence & rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::WChar ** tmp1 =
+        TAO_Unbounded_WString_Sequence::allocbuf (this->maximum_);
+
+      CORBA::WChar ** const tmp2 =
+        reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA::wstring_dup (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+TAO_Unbounded_WString_Sequence::~TAO_Unbounded_WString_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+TAO_Unbounded_WString_Sequence &
+TAO_Unbounded_WString_Sequence::operator= (
+    const TAO_Unbounded_WString_Sequence & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      CORBA::WChar ** tmp = reinterpret_cast <CORBA::WChar **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::wstring_free (tmp[i]);
+          tmp[i] = 0;
+        }
+
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // free the older buffer
+          TAO_Unbounded_WString_Sequence::freebuf (tmp);
+          this->buffer_ =
+            TAO_Unbounded_WString_Sequence::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_WString_Sequence::allocbuf (rhs.maximum_);
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  CORBA::WChar ** tmp1 = reinterpret_cast <CORBA::WChar **> (this->buffer_);
+  CORBA::WChar ** const tmp2 =
+    reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i=0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = CORBA::wstring_dup (tmp2[i]);
+    }
+
+  return *this;
+}
+
+TAO_SeqElem_WString_Manager
+TAO_Unbounded_WString_Sequence::operator[] (CORBA::ULong slot) const
+{
+  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
+  CORBA::WChar ** const tmp =
+    reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (this->buffer_);
+  return TAO_SeqElem_WString_Manager (tmp + slot,
+                                      this->release_);
+}
+
+CORBA::WChar **
+TAO_Unbounded_WString_Sequence::allocbuf (CORBA::ULong nelems)
+{
+  CORBA::WChar ** buf = 0;
+  ACE_NEW_RETURN (buf,
+                  CORBA::WChar * [nelems],
+                  0);
+
+  for (CORBA::ULong i = 0; i < nelems; ++i)
+    {
+      buf[i] = 0;
+    }
+
+  return buf;
+}
+
+void
+TAO_Unbounded_WString_Sequence::freebuf (CORBA::WChar ** buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  // {orbos/97-05-15:16.11}
+  // The freebuf function ensures that the destructor for each element
+  // is called before the buffer is destroyed, except for string
+  // elements, which are freed using wstring_free(), and object
+  // reference elements, which are freed using release(). The freebuf
+  // function will ignore null pointers passed to it.
+
+  // @@ How are we supposed to implement that! We don't know the
+  // length of the buffer here.
+  //  Mark the length in the first four bytes? For the moment we let
+  //  that be.
+
+  delete [] buffer;
+}
+
+void
+TAO_Unbounded_WString_Sequence::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  TAO_Unbounded_WString_Sequence * tmp =
+    static_cast<TAO_Unbounded_WString_Sequence *> (_tao_void_pointer);
+  delete tmp;
+}
+
+CORBA::WChar **
+TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::WChar ** result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          result = allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+        }
+    }
+  else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish
+          // ownership.
+          result = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
+const CORBA::WChar **
+TAO_Unbounded_WString_Sequence::get_buffer (void) const
+{
+  return reinterpret_cast<const CORBA::WChar ** ACE_CAST_CONST> (this->buffer_);
+}
+
+void
+TAO_Unbounded_WString_Sequence::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::WChar ** tmp = TAO_Unbounded_WString_Sequence::allocbuf (length);
+
+  if (this->buffer_ != 0)
+    {
+      CORBA::WChar ** old = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          // Only call duplicate when we did not own the previous
+          // buffer, since after this method we own it we must also
+          // own the objects.  If we already own the objects there is
+          // no need to copy them, if we did we would also have to
+          // remove the old instances.
+          if (!this->release_)
+            {
+              tmp [i] = CORBA::wstring_dup (old[i]);
+            }
+          else
+            {
+              tmp [i] = old[i];
+            }
+        }
+
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+void
+TAO_Unbounded_WString_Sequence::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+
+  CORBA::WChar **tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::wstring_free (tmp[i]);
+      tmp[i] = 0;
+    }
+
+  TAO_Unbounded_WString_Sequence::freebuf (tmp);
+  this->buffer_ = 0;
+  this->length_ = 0;
+  this->release_ = 0;
+  this->maximum_ = 0;
+}
+
+void
+TAO_Unbounded_WString_Sequence::_shrink_buffer (CORBA::ULong nl,
+                                                CORBA::ULong ol)
+{
+  CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::wstring_free (tmp[i]);
+      tmp[i] = 0;
+    }
+}
+
+void
+TAO_Unbounded_WString_Sequence::replace (CORBA::ULong maximum,
+                                         CORBA::ULong length,
+                                         CORBA::WChar* *data,
+                                         CORBA::Boolean release)
+{
+  if (this->release_ == 1)
+    {
+      CORBA::WChar **tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::wstring_free (tmp[i]);
+          tmp[i] = 0;
+        }
+    }
+
+  this->maximum_ = maximum;
+  this->length_ = length;
+
+  // If 'release' is 1, it is the caller's responsibility to allocate
+  // 'data' with CORBA::wstring_alloc.
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+// ****************************************************************
+
+TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
+    const TAO_Unbounded_Sequence<CORBA::Octet> &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  , mb_ (0)
+#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::Octet * tmp1 =
+       TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->maximum_);
+
+
+      CORBA::Octet * const tmp2 =
+        reinterpret_cast<CORBA::Octet * ACE_CAST_CONST> (rhs.buffer_);
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (rhs.mb_ == 0)
+        {
+          ACE_OS::memcpy (tmp1,
+                          tmp2,
+                          this->length_);
+        }
+      else
+        {
+          size_t offset = 0;
+
+          for (const ACE_Message_Block *i = rhs.mb_; i != 0; i = i->cont ())
+            {
+              ACE_OS::memcpy (tmp1 + offset,
+                              i->rd_ptr (),
+                              i->length ());
+
+              offset += i->length ();
+            }
+        }
+#else /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
+      ACE_OS::memcpy (tmp1, tmp2, this->length_);
+#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 1) */
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+TAO_Unbounded_Sequence<CORBA::Octet> &
+TAO_Unbounded_Sequence<CORBA::Octet>::operator= (
+    const TAO_Unbounded_Sequence<CORBA::Octet> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  if (this->mb_ != 0)
+    {
+      ACE_Message_Block::release (this->mb_);
+      this->mb_ = 0;
+      this->buffer_ =
+        TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_);
+    }
+  else
+#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
+    if (this->release_)
+    {
+      if (this->maximum_ < rhs.length_)
+        {
+          // free the old buffer
+          CORBA::Octet * tmp = reinterpret_cast<CORBA::Octet *> (this->buffer_);
+          TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
+          this->buffer_ =
+            TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_);
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.maximum_);
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  CORBA::Octet * tmp1 = reinterpret_cast<CORBA::Octet *> (this->buffer_);
+  CORBA::Octet * const tmp2 =
+    reinterpret_cast<CORBA::Octet * ACE_CAST_CONST> (rhs.buffer_);
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  // for (CORBA::ULong i = 0; i < this->length_; ++i)
+  // tmp1[i] = tmp2[i];
+  if (rhs.mb_ == 0)
+    {
+      ACE_OS::memcpy (tmp1,
+                      tmp2,
+                      this->length_);
+    }
+  else
+    {
+      size_t offset = 0;
+
+      for (const ACE_Message_Block *i = rhs.mb_; i != 0; i = i->cont ())
+        {
+          ACE_OS::memcpy (tmp1 + offset,
+                          i->rd_ptr (),
+                          i->length ());
+          offset += i->length ();
+        }
+    }
+#else /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
+  ACE_OS::memcpy (tmp1, tmp2, this->length_);
+#endif /* (TAO_NO_COPY_OCTET_SEQUENCES == 0) */
+
+  return *this;
+}
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
+    CORBA::ULong length,
+    const ACE_Message_Block * mb
+  )
+  :  TAO_Unbounded_Base_Sequence (length,
+                                  length,
+                                  mb->rd_ptr (),
+                                  0),
+     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);
+    }
+}
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+
+TAO_Unbounded_Sequence<CORBA::Octet>::~TAO_Unbounded_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+// This function is a little too big to be inlined, but some compilers
+// (Sun/CC 4.1?) die if it isn't :-(
+CORBA::Octet *
+TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan)
+{
+  CORBA::Octet * result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+
+      if (this->buffer_ == 0)
+        {
+          // The buffer was not allocated, we must allocate it now.
+          result =
+            TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
+          this->buffer_ = result;
+          this->release_ = 1;
+        }
+      else
+        {
+          result =
+            reinterpret_cast<CORBA::Octet*> (this->buffer_);
+        }
+    }
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  else if (this->mb_ != 0) // (orphan == 1)
+    {
+      // We must create a copy anyway:
+      //   the user is supposed to call freebuf() to release the
+      //   buffer, but the buffer is inside a Message_Block...
+      //   We thought about storing the pointer to the Message_Block
+      //   somewhere at the beginning of the buffer (before the actual
+      //   data), but that will not work in 64 bit machines when the
+      //   buffer comes from a CDR stream.
+      //
+      result = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (this->length_);
+      ACE_OS::memcpy (result, this->buffer_, this->length_);
+    }
+  else if (this->release_ != 0)
+    {
+      // We set the state back to default and relinquish
+      // ownership.
+      result = reinterpret_cast<CORBA::Octet *> (this->buffer_);
+      this->maximum_ = 0;
+      this->length_ = 0;
+      this->buffer_ = 0;
+      this->release_ = 0;
+    }
+#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+  else
+    {
+      result = reinterpret_cast<CORBA::Octet*> (this->buffer_);
+
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish
+          // ownership.
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+  /* else
+     // Oops, it's not our buffer to relinquish...
+     return 0;
+  */
+  return result;
+}
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+void
+TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong length,
+                                               const ACE_Message_Block * mb)
+{
+  this->_deallocate_buffer ();
+
+  // 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);
+    }
+
+  this->buffer_ = this->mb_->rd_ptr ();
+  this->maximum_ = length;
+  this->length_ = length;
+  this->release_ = 0;
+}
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+
+void
+TAO_Unbounded_Sequence<CORBA::Octet>::_tao_any_destructor (void * x)
+{
+  TAO_Unbounded_Sequence<CORBA::Octet> * tmp =
+    static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (x);
+  delete tmp;
+}
+
+void
+TAO_Unbounded_Sequence<CORBA::Octet>::_allocate_buffer (CORBA::ULong length)
+{
+  CORBA::Octet *tmp = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (length);
+
+  if (this->buffer_ != 0)
+    {
+      CORBA::Octet * old = reinterpret_cast<CORBA::Octet *> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      if (this->mb_ != 0)
+        {
+          ACE_Message_Block::release (this->mb_);
+          this->mb_ = 0;
+        }
+      else
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+        if (this->release_)
+        {
+          TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (old);
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+void TAO_Unbounded_Sequence<CORBA::Octet>::_deallocate_buffer (void)
+{
+  if (this->buffer_ != 0
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+      && this->mb_ == 0
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+      && this->release_ != 0)
+    {
+      CORBA::Octet * tmp = reinterpret_cast<CORBA::Octet *> (this->buffer_);
+      TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
+    }
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  else
+    {
+      ACE_Message_Block::release (this->mb_);
+      this->mb_ = 0;
+    }
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+
+  this->buffer_ = 0;
+  this->length_ = 0;
+  this->release_ = 0;
+  this->maximum_ = 0;
+}
+
+
+void
+TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong max,
+                                               CORBA::ULong length,
+                                               CORBA::Octet * data,
+                                               CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  if (this->mb_ != 0)
+    {
+      ACE_Message_Block::release (this->mb_);
+      this->mb_ = 0;
+    }
+  else
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+    if (this->buffer_ && this->release_ == 1)
+    {
+      CORBA::Octet * tmp =
+        reinterpret_cast<CORBA::Octet *> (this->buffer_);
+      TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp);
+    }
+
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+// ****************************************************************
+
+bool
+operator== (const TAO_Unbounded_Sequence<CORBA::Octet> & lhs,
+            const TAO_Unbounded_Sequence<CORBA::Octet> & rhs)
+{
+  const CORBA::ULong rlen = rhs.length ();
+
+  if (rlen != lhs.length ())
+    {
+      return false;
+    }
+
+  for (CORBA::ULong i = 0; i < rlen; ++i)
+    {
+      if (rhs[i] != lhs[i])
+        {
+          return false;
+        }
+    }
+
+  return true;
+}
+
+bool
+operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> & lhs,
+            const TAO_Unbounded_Sequence<CORBA::Octet> & rhs)
+{
+  return !(lhs == rhs);
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
new file mode 100644
index 00000000000..641a2c86f9d
--- /dev/null
+++ b/TAO/tao/Sequence.h
@@ -0,0 +1,681 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Sequence.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan
+ *  @author Aniruddha Gokhale
+ */
+//=============================================================================
+
+#ifndef TAO_SEQUENCE_H
+#define TAO_SEQUENCE_H
+
+#include /**/ "ace/pre.h"
+#include "ace/CORBA_macros.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Managed_Types.h"
+#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 TAO_Base_Sequence
+ *
+ * @brief Base class for TAO sequences.
+ *
+ * This class provides a common interface for all IDL sequences,
+ * hence the interpreted marshal engine can manipulate them in a
+ * type safe manner.
+ */
+class TAO_Export TAO_Base_Sequence
+{
+public:
+  /// We give access to TAO_Marshal_Sequence, this allows a safe yet
+  /// small footprint implementation of the marshal engine.
+  friend class TAO_Marshal_Sequence;
+
+  /// Destructor.
+  virtual ~TAO_Base_Sequence (void);
+
+  /// Return the maximum length of the sequence
+  CORBA::ULong maximum (void) const;
+
+  /**
+   * Ensure that the buffer contains space for at least <length>
+   * elements.  The constructor must be called for any new elements,
+   * the old ones (if any) must be copied into the buffer using
+   * operator= and then their destructors must be called.  Finally the
+   * old buffer must be released.
+   */
+  virtual void _allocate_buffer (CORBA::ULong length) = 0;
+
+  /// Must deallocate the buffer and then set it to zero.
+  virtual void _deallocate_buffer (void) = 0;
+
+  /**
+   * Some sequences (of objects and strings) require some cleanup if
+   * the sequence is shrunk. The spec requires the destructor to
+   * release the objects only from position <0> to <length-1>; so
+   * shrink and then delete could result in a memory leak.
+   */
+  virtual void _shrink_buffer (CORBA::ULong new_length,
+                               CORBA::ULong old_length);
+
+  /// Used for sequences of objects to downcast a recently demarshalled
+  /// object reference into the right type.
+  virtual void _downcast (void *target,
+                          CORBA::Object *src
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+  /// Used for sequences of object to convert from the derived type
+  /// into the Object class.
+  virtual CORBA::Object *_upcast (void *src) const;
+
+  // = orbos/98-01-11 proposed extensions.
+  /// Returns the state of the sequence release flag.
+  CORBA::Boolean release (void) const;
+
+protected:
+  /// Default constructor.
+  TAO_Base_Sequence (void);
+
+  /// Constructor with control of ownership.
+  TAO_Base_Sequence (CORBA::ULong maximum,
+                     CORBA::ULong length,
+                     void *buffer,
+                     CORBA::Boolean release = 0);
+
+  /// Assume ownership and set length to 0.
+  TAO_Base_Sequence (CORBA::ULong maximum,
+                     void *buffer);
+
+  void check_bounds(
+      char const * filename, unsigned long lineno,
+      CORBA::ULong tao_idx, CORBA::ULong tao_max) const;
+
+public:
+
+  // = The following two functions should be protected but we made it
+  // public because it breaks some compilers.
+
+  // Copy constructor and assignment operator are protected, the
+  // derived classes must provided the right semantics for the buffer
+  // copy, only the static fields are actually copy.
+  TAO_Base_Sequence (const TAO_Base_Sequence &rhs);
+  TAO_Base_Sequence &operator= (const TAO_Base_Sequence &rhs);
+
+protected:
+
+  /// 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.
+  void *buffer_;
+
+  /// If true then the sequence should release the buffer when it is
+  /// destroyed.
+  CORBA::Boolean release_;
+};
+
+// ****************************************************************
+
+/**
+ * @class TAO_Unbounded_Base_Sequence
+ *
+ * @brief Base class for all bounded sequences.
+ *
+ * This class implements part of the funcionality common to all
+ * bounded sequences, using this intermediate class instead of
+ * virtual methods on TAO_Base_Sequence give us a slight
+ * improvement of performance, but also reduces the amount of
+ * generated code in the templates.
+ */
+class TAO_Export TAO_Unbounded_Base_Sequence : public TAO_Base_Sequence
+{
+public:
+  /**
+   * = SPEC {16.11.2}
+   * For an unbounded sequence, setting the length to a larger value
+   * than the current length may reallocate the sequence
+   * data. Reallocation is conceptually equivalent to creating a new
+   * sequence of the desired new length, copying the old sequence
+   * elements zero through length into the new sequence, and then
+   * assigning the old sequence to be the same as the new sequence.
+   */
+  void length (CORBA::ULong length);
+
+  /**
+   * return the current length, it cannot go into the base class due
+   * to the C++ name lookup rules (if you don't know what I'm talking
+   * about, then try moving it there).
+   */
+  CORBA::ULong length (void) const;
+
+  /// destructor.
+  virtual ~TAO_Unbounded_Base_Sequence (void);
+
+protected:
+  /// Default constructor.
+  TAO_Unbounded_Base_Sequence (void);
+
+  /// Constructor with control of ownership.
+  TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
+                               CORBA::ULong length,
+                               void *buffer,
+                               CORBA::Boolean release = 0);
+
+  /// Assume ownership and set length to 0.
+  TAO_Unbounded_Base_Sequence (CORBA::ULong maximum,
+                               void *buffer);
+};
+
+// ****************************************************************
+
+/**
+ * @class TAO_Bounded_Base_Sequence
+ *
+ * @brief Base class for all bounded sequences.
+ *
+ * This class implements part of the funcionality common to all
+ * bounded sequences, using this intermediate class instead of
+ * virtual methods on TAO_Base_Sequence give us a slight
+ * improvement of performance, but also reduces the amount of
+ * generated code in the templates.
+ */
+class TAO_Export TAO_Bounded_Base_Sequence : public TAO_Base_Sequence
+{
+public:
+  /// Set the length, for this sequences this call is ignored if the
+  /// new length is greater that the maximum.
+  void length (CORBA::ULong length);
+
+  /**
+   * Return the current length, it cannot go into the base class due
+   * to the C++ name lookup rules (if you don't know what I'm talking
+   * about, then try moving it there).
+   */
+  CORBA::ULong length (void) const;
+
+  /// Destructor.
+  virtual ~TAO_Bounded_Base_Sequence (void);
+
+protected:
+  /// Default constructor.
+  TAO_Bounded_Base_Sequence (void);
+
+  /// Constructor with control of ownership.
+  TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
+                             CORBA::ULong length,
+                             void *buffer,
+                             CORBA::Boolean release = 0);
+
+  /// Assume ownership and set length to 0.
+  TAO_Bounded_Base_Sequence (CORBA::ULong maximum,
+                             void *buffer);
+};
+
+// ****************************************************************
+
+/**
+ * @class TAO_Unbounded_String_Sequence
+ *
+ * @brief Unbounded sequence of strings.
+ *
+ * IDL sequences of strings must automatically duplicate and
+ * release their members based on some global <release> flag.
+ */
+class TAO_Export TAO_Unbounded_String_Sequence
+  : public TAO_Unbounded_Base_Sequence
+{
+
+  // = SPEC
+  // 16.8 Mapping for Structured Types
+  // The mapping for struct, union, and sequence (but not array) is a
+  // C++ struct or class with a default constructor, a copy
+  // constructor, an assignment operator, and a destructor.
+  //
+public:
+  // = Operations for the Unbounded_ObjectSequence
+
+  /**
+   * {orbos/97-05-15:16.8}
+   * The default constructor initializes object reference members to
+   * appropriately typed nil object references and string members to
+   * NULL; all other members are initialized via their default
+   * constructors.
+   *
+   * {orbos/97-05-15:16.11}
+   * For both bounded and unbounded sequences, the default constructor
+   * (as shown in the example above) sets the sequence length equal to
+   * 0.
+   */
+  TAO_Unbounded_String_Sequence (void);
+
+  /**
+   * Unbounded sequences provide a constructor that allows only the
+   * initial value of the maximum length to be set (the ``maximum
+   * constructor'' shown in the example above). This allows
+   * applications to control how much buffer space is initially
+   * allocated by the sequence. This constructor also sets the length
+   * to 0 and the release flag to TRUE.
+   */
+  TAO_Unbounded_String_Sequence (CORBA::ULong maximum);
+
+  /**
+   * The ``T *data'' constructor (as shown in the example above)
+   * allows the length and contents of a bounded or unbounded sequence
+   * to be set. For unbounded sequences, it also allows the initial
+   * value of the maximum length to be set. For this constructor,
+   * ownership of the content's vector is determined by the release
+   * parameter---FALSE means the caller owns the storage, while TRUE
+   * means that the sequence assumes ownership of the storage.
+   * If release is TRUE, the content's vector must have been allocated
+   * using the sequence allocbuf function, and the sequence will pass
+   * it to freebuf when finished with it.
+   */
+  TAO_Unbounded_String_Sequence (CORBA::ULong maximum,
+                                 CORBA::ULong length,
+                                 char ** data,
+                                 CORBA::Boolean release = 0);
+
+  /**
+   * The copy constructor performs a deep copy from the existing
+   * structure to create a new structure, including calling _duplicate
+   * on all object  reference members and performing the necessary
+   * heap allocations for all string members.
+   *
+   * The copy constructor creates a new sequence with the same maximum
+   * and length as the given sequence, copies each of its current
+   * elements (items zero through length-1), and sets the release
+   * flag to TRUE.
+   */
+  TAO_Unbounded_String_Sequence(const TAO_Unbounded_String_Sequence&);
+
+  /// The destructor releases all object reference members and frees
+  /// all string members.
+  ~TAO_Unbounded_String_Sequence (void);
+
+  /**
+   * The assignment operator first releases all object reference
+   * members and frees all string  members, and then performs a
+   * deep­copy to create a new structure.
+   *
+   * The assignment operator deep­copies its parameter, releasing
+   * old storage if necessary. It behaves as if the original sequence
+   * is destroyed via its destructor and then the source sequence
+   * copied using the copy constructor. If release=TRUE, the
+   * destructor destroys each of the current elements (items zero
+   * through length--1).
+   * For an unbounded sequence, if a reallocation is necessary due to
+   * a change in the length and the sequence was created using the
+   * release=TRUE parameter in its constructor, the sequence will
+   * deallocate the old storage. If release is FALSE under these
+   * circumstances, old storage will not be freed before the
+   * reallocation is performed. After reallocation, the release flag
+   * is always set to TRUE.
+   */
+  TAO_Unbounded_String_Sequence & operator= (
+      const TAO_Unbounded_String_Sequence &
+    );
+
+  /// read-write accessor
+  TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot) const;
+
+  /**
+   * The allocbuf function allocates a vector of T elements that can
+   * be passed to the T *data constructor. The length of the vector is
+   * given by the nelems function argument.  The allocbuf function
+   * initializes each element using its default constructor, except
+   * for strings, which are initialized to null pointers, and object
+   * references, which are initialized to suitably typed nil object
+   * references. A null pointer is returned if allocbuf for some
+   * reason cannot allocate the requested vector. Vectors allocated by
+   * allocbuf should be freed using the freebuf function.
+   */
+  static char ** allocbuf (CORBA::ULong);
+
+  /**
+   * The freebuf function ensures that the destructor for each element
+   * is called before the buffer is destroyed, except for string
+   * elements, which are freed using string_free(), and object
+   * reference elements, which are freed using release(). The freebuf
+   * function will ignore null pointers passed to it.
+   */
+  static void freebuf (char **);
+
+  static void _tao_any_destructor (void *);
+
+  // = Fast buffer accessors.
+  char ** get_buffer (CORBA::Boolean orphan = 0);
+  const char ** get_buffer (void) const;
+
+  // Functions to create, destroy, and adjust the underlying buffer.
+  virtual void _allocate_buffer (CORBA::ULong length);
+  virtual void _deallocate_buffer (void);
+  virtual void _shrink_buffer (CORBA::ULong new_length,
+                               CORBA::ULong old_length);
+
+  // Parameters work the same as in constructor of the same signature.
+  void replace (CORBA::ULong maximum,
+                CORBA::ULong length,
+                char ** data,
+                CORBA::Boolean release = 0);
+};
+
+// ****************************************************************
+
+/**
+ * @class TAO_Unbounded_WString_Sequence
+ *
+ * @brief Unbounded sequence of wstrings.
+ *
+ * IDL sequences of wstrings must automatically duplicate and
+ * release their members based on some global <release> flag.
+ */
+class TAO_Export TAO_Unbounded_WString_Sequence
+  : public TAO_Unbounded_Base_Sequence
+{
+
+  // = SPEC
+  // 16.8 Mapping for Structured Types
+  // The mapping for struct, union, and sequence (but not array) is a
+  // C++ struct or class with a default constructor, a copy
+  // constructor, an assignment operator, and a destructor.
+  //
+public:
+  // = Operations for the Unbounded_ObjectSequence
+
+  /**
+   * {orbos/97-05-15:16.8}
+   * The default constructor initializes object reference members to
+   * appropriately typed nil object references and wstring members to
+   * NULL; all other members are initialized via their default
+   * constructors.
+   *
+   * {orbos/97-05-15:16.11}
+   * For both bounded and unbounded sequences, the default constructor
+   * (as shown in the example above) sets the sequence length equal to
+   * 0.
+   */
+  TAO_Unbounded_WString_Sequence (void);
+
+  /**
+   * Unbounded sequences provide a constructor that allows only the
+   * initial value of the maximum length to be set (the ``maximum
+   * constructor'' shown in the example above). This allows
+   * applications to control how much buffer space is initially
+   * allocated by the sequence. This constructor also sets the length
+   * to 0 and the release flag to TRUE.
+   */
+  TAO_Unbounded_WString_Sequence (CORBA::ULong maximum);
+
+  /**
+   * The ``T *data'' constructor (as shown in the example above)
+   * allows the length and contents of a bounded or unbounded sequence
+   * to be set. For unbounded sequences, it also allows the initial
+   * value of the maximum length to be set. For this constructor,
+   * ownership of the contents vector is determined by the release
+   * parameter---FALSE means the caller owns the storage, while TRUE
+   * means that the sequence assumes ownership of the storage.
+   * If release is TRUE, the contents vector must have been allocated
+   * using the sequence allocbuf function, and the sequence will pass
+   * it to freebuf when finished with it.
+   */
+  TAO_Unbounded_WString_Sequence (CORBA::ULong maximum,
+                                  CORBA::ULong length,
+                                  CORBA::WChar ** data,
+                                  CORBA::Boolean release = 0);
+
+  /**
+   * The copy constructor performs a deep copy from the existing
+   * structure to create a new structure, including calling _duplicate
+   * on all object  reference members and performing the necessary
+   * heap allocations for all string members.
+   *
+   * The copy constructor creates a new sequence with the same maximum
+   * and length as the given sequence, copies each of its current
+   * elements (items zero through length-1), and sets the release
+   * flag to TRUE.
+   */
+  TAO_Unbounded_WString_Sequence (const TAO_Unbounded_WString_Sequence &);
+
+  /// The destructor releases all object reference members and frees
+  /// all string members.
+  ~TAO_Unbounded_WString_Sequence (void);
+
+  /**
+   * The assignment operator first releases all object reference
+   * members and frees all wstring  members, and then performs a
+   * deep­copy to create a new structure.
+   *
+   * The assignment operator deep­copies its parameter, releasing
+   * old storage if necessary. It behaves as if the original sequence
+   * is destroyed via its destructor and then the source sequence
+   * copied using the copy constructor. If release=TRUE, the
+   * destructor destroys each of the current elements (items zero
+   * through length--1).
+   * For an unbounded sequence, if a reallocation is necessary due to
+   * a change in the length and the sequence was created using the
+   * release=TRUE parameter in its constructor, the sequence will
+   * deallocate the old storage. If release is FALSE under these
+   * circumstances, old storage will not be freed before the
+   * reallocation is performed. After reallocation, the release flag
+   * is always set to TRUE.
+   */
+  TAO_Unbounded_WString_Sequence & operator= (
+      const TAO_Unbounded_WString_Sequence &
+    );
+
+  /// Read-write accessor
+  TAO_SeqElem_WString_Manager operator[] (CORBA::ULong slot) const;
+
+  /**
+   * The allocbuf function allocates a vector of T elements that can
+   * be passed to the T *data constructor. The length of the vector is
+   * given by the nelems function argument.  The allocbuf function
+   * initializes each element using its default constructor, except
+   * for strings, which are initialized to null pointers, and object
+   * references, which are initialized to suitably typed nil object
+   * references. A null pointer is returned if allocbuf for some
+   * reason cannot allocate the requested vector. Vectors allocated by
+   * allocbuf should be freed using the freebuf function.
+   */
+  static CORBA::WChar ** allocbuf (CORBA::ULong);
+
+  /**
+   * The freebuf function ensures that the destructor for each element
+   * is called before the buffer is destroyed, except for string
+   * elements, which are freed using wstring_free(), and object
+   * reference elements, which are freed using release(). The freebuf
+   * function will ignore null pointers passed to it.
+   */
+  static void freebuf (CORBA::WChar **);
+
+  static void _tao_any_destructor (void *);
+
+  // = Fast buffer accessors.
+  CORBA::WChar ** get_buffer (CORBA::Boolean orphan = 0);
+  const CORBA::WChar ** get_buffer (void) const;
+
+  // Functions to create, destroy, and adjust the underlying buffer.
+  virtual void _allocate_buffer (CORBA::ULong length);
+  virtual void _deallocate_buffer (void);
+  virtual void _shrink_buffer (CORBA::ULong new_length,
+                               CORBA::ULong old_length);
+
+  // Parameters work the same as in constructor of the same signature.
+  void replace (CORBA::ULong maximum,
+                CORBA::ULong length,
+                CORBA::WChar ** data,
+                CORBA::Boolean release = 0);
+};
+
+// ****************************************************************
+
+// forward declaration, we are going to specialize that template
+// here.
+// The template itself requires this file so every user of the
+// template should also see the specialization.
+template<class T> class TAO_Unbounded_Sequence;
+
+/**
+ * @class TAO_Unbounded_Sequence<CORBA::Octet>
+ *
+ * @brief An unbounded sequence of Octets
+ *
+ * Marshalling and demarshalling octet sequences can be highly
+ * optimize, for instance at demarshalling we don't require a copy
+ * from the CDR buffer to the octet sequence buffer, we can simply
+ * hold a duplicate of the underlying ACE_Message_Block.
+ * Specializing the TAO_Unbounded_Sequence<T> parametric
+ * class, is an excellent way to achieve this optimizations.
+ */
+template<>
+class TAO_Export TAO_Unbounded_Sequence<CORBA::Octet>
+  : public TAO_Unbounded_Base_Sequence
+{
+public:
+  /// For efficient marshalling and demarshalling.
+  friend class TAO_Marshal_Sequence;
+
+  /// see TAO_Unbounded_Sequence in "Sequence_T.h"
+  TAO_Unbounded_Sequence (void);
+  TAO_Unbounded_Sequence (CORBA::ULong max);
+  TAO_Unbounded_Sequence (CORBA::ULong max,
+                          CORBA::ULong length,
+                          CORBA::Octet *data,
+                          CORBA::Boolean release = 0);
+  virtual ~TAO_Unbounded_Sequence (void);
+
+  /// Use in the implementation of insertion and extraction operators
+  /// from CORBA::Any
+  static void _tao_any_destructor (void*);
+
+  /**
+   * The copy constructor and assignment operators *do* copy the data,
+   * though we could simply duplicate the ref count in the
+   * ACE_Message_Block this will change the semantics for this
+   * operations.
+   */
+  TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence<CORBA::Octet> &);
+  TAO_Unbounded_Sequence<CORBA::Octet>& operator= (
+      const TAO_Unbounded_Sequence<CORBA::Octet> &
+    );
+
+  /**
+   * See the general description in "Sequence_T.h"
+   * NOTE: This last two methods can be rendered useless in certain
+   * cases, see below.
+   */
+  CORBA::Octet &operator[] (CORBA::ULong);
+  const CORBA::Octet &operator[] (CORBA::ULong) const;
+
+  // = Static operations.
+
+  /// Allocate storage for the sequence, please note that the storage
+  /// is always held in a ACE_Message_Block.
+  static CORBA::Octet *allocbuf (CORBA::ULong);
+
+  /// Free the storage.
+  static void freebuf (CORBA::Octet *);
+
+  /// Implement the methods for all the sequence, please see
+  /// TAO_Base_Sequence.
+  virtual void _allocate_buffer (CORBA::ULong length);
+  virtual void _deallocate_buffer (void);
+
+  // = Fast buffer accessors.
+  CORBA::Octet *get_buffer (CORBA::Boolean orphan = 0);
+  const CORBA::Octet *get_buffer (void) const;
+
+  // NOTE: This last two methods can be rendered useless in certain
+  // cases, see below.
+  /// See the general description of this methods in "Sequence_T.h".
+  void replace (CORBA::ULong max,
+                CORBA::ULong length,
+                CORBA::Octet *data,
+                CORBA::Boolean release = 0);
+
+  // = TAO extensions
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+
+  /// Returns the underlying message block, the caller must *not*
+  /// release the copy.
+  ACE_Message_Block* mb (void) const;
+
+  /// Create a sequence of octets from a single message block (i.e. it
+  /// ignores any chaining in the meesage block).
+  TAO_Unbounded_Sequence (CORBA::ULong length,
+                          const ACE_Message_Block* mb);
+
+  /// Replaces the current buffer with <mb>, using only <length> bytes.
+  /// It takes a duplicate of <mb> so the user still owns it.
+  void replace (CORBA::ULong length, const ACE_Message_Block* mb);
+
+  //
+  // NOTE:
+  // In the last two methods if the <mb> is the head of a chain then
+  // the following methods are not warranteed to work properly:
+  //    operator[]
+  //    get_buffer ()
+  // the main purpose of this method is to support custom marshaling;
+  // so the complete chain is marshaled when the octet sequence is.
+  //
+
+private:
+  ACE_Message_Block* mb_;
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+};
+
+// ****************************************************************
+
+// Comparison of octet sequence.
+TAO_Export bool operator== (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
+                            const TAO_Unbounded_Sequence<CORBA::Octet> &r);
+
+TAO_Export bool operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
+                            const TAO_Unbounded_Sequence<CORBA::Octet> &r);
+
+// ****************************************************************
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @brief Safe assertions without including Log_Msg.h
+ */
+#define TAO_SEQUENCE_ASSERT(TAO_IDX,TAO_MAX) \
+  this->check_bounds(__FILE__, __LINE__, (TAO_IDX), (TAO_MAX))
+
+
+#if defined (__ACE_INLINE__)
+#include "tao/Sequence.i"
+#endif /* __ACE_INLINE__ */
+
+#include "tao/Sequence_T.h"
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_SEQUENCE_H */
diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i
new file mode 100644
index 00000000000..1293e10fe7b
--- /dev/null
+++ b/TAO/tao/Sequence.i
@@ -0,0 +1,303 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// Operations on the unbounded sequence class.
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_INLINE
+TAO_Base_Sequence::TAO_Base_Sequence (void)
+  : maximum_ (0),
+    length_ (0),
+    buffer_ (0),
+    release_ (0)
+{
+}
+
+ACE_INLINE
+TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
+                                      CORBA::ULong length,
+                                      void * buffer,
+                                      CORBA::Boolean release)
+  : maximum_ (maximum),
+    length_ (length),
+    buffer_ (buffer),
+    release_ (release)
+{
+}
+
+ACE_INLINE
+TAO_Base_Sequence::TAO_Base_Sequence (CORBA::ULong maximum,
+                                      void * data)
+  : maximum_ (maximum),
+    length_ (0),
+    buffer_ (data),
+    release_ (1)
+{
+}
+
+ACE_INLINE
+TAO_Base_Sequence::TAO_Base_Sequence (const TAO_Base_Sequence & rhs)
+  : maximum_ (rhs.maximum_),
+    length_ (rhs.length_),
+    buffer_ (0),
+    release_ (1)
+{
+}
+
+ACE_INLINE
+CORBA::Boolean
+TAO_Base_Sequence::release (void) const
+{
+  return this->release_;
+}
+
+ACE_INLINE
+TAO_Base_Sequence &
+TAO_Base_Sequence::operator= (const TAO_Base_Sequence & rhs)
+{
+  this->maximum_ = rhs.maximum_;
+  this->length_ = rhs.length_;
+  this->release_ = 1;
+  return *this;
+}
+
+ACE_INLINE
+CORBA::ULong
+TAO_Base_Sequence::maximum (void) const
+{
+  return this->maximum_;
+}
+
+// ****************************************************************
+
+ACE_INLINE
+TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (void)
+{
+}
+
+ACE_INLINE
+TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    void * buffer,
+    CORBA::Boolean release
+  )
+  :  TAO_Base_Sequence (maximum, length, buffer, release)
+{
+}
+
+ACE_INLINE
+TAO_Unbounded_Base_Sequence::TAO_Unbounded_Base_Sequence (
+    CORBA::ULong maximum,
+    void * buffer
+  )
+  :  TAO_Base_Sequence (maximum, buffer)
+{
+}
+
+ACE_INLINE
+CORBA::ULong
+TAO_Unbounded_Base_Sequence::length (void) const
+{
+  return this->length_;
+}
+
+ACE_INLINE
+void
+TAO_Unbounded_Base_Sequence::length (CORBA::ULong length)
+{
+  if (length > this->maximum_)
+    {
+      this->_allocate_buffer (length);
+      this->maximum_ = length;
+      this->release_ = 1;
+    }
+  else if (length < this->length_)
+    {
+      this->_shrink_buffer (length, this->length_);
+    }
+
+  this->length_ = length;
+}
+
+// ****************************************************************
+
+ACE_INLINE
+TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (void)
+{
+}
+
+ACE_INLINE
+TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    void * buffer,
+    CORBA::Boolean release
+  )
+  :  TAO_Base_Sequence (maximum, length, buffer, release)
+{
+}
+
+ACE_INLINE
+TAO_Bounded_Base_Sequence::TAO_Bounded_Base_Sequence (
+    CORBA::ULong maximum,
+    void * buffer
+  )
+  :  TAO_Base_Sequence (maximum, buffer)
+{
+}
+
+ACE_INLINE
+CORBA::ULong
+TAO_Bounded_Base_Sequence::length (void) const
+{
+  return this->length_;
+}
+
+ACE_INLINE
+void
+TAO_Bounded_Base_Sequence::length (CORBA::ULong length)
+{
+  if (this->buffer_ == 0)
+    {
+      this->_allocate_buffer (this->maximum_);
+      this->release_ = 1;
+    }
+
+  if (length > this->maximum_)
+    {
+      return;
+    }
+  else if (length < this->length_)
+    {
+      this->_shrink_buffer (length, this->length_);
+    }
+
+  this->length_ = length;
+}
+
+// ****************************************************************
+
+ACE_INLINE
+TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (void)
+{
+}
+
+ACE_INLINE
+TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    char ** value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+ACE_INLINE
+TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (void)
+{
+}
+
+ACE_INLINE
+TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::WChar ** value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+// ****************************************************************
+
+ACE_INLINE
+CORBA::Octet *
+TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (CORBA::ULong size)
+{
+  return new CORBA::Octet[size];
+}
+
+ACE_INLINE
+void
+TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (CORBA::Octet * buffer)
+{
+  delete [] buffer;
+}
+
+ACE_INLINE
+TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (void)
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  :  mb_ (0)
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+{
+}
+
+ACE_INLINE
+TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
+    CORBA::ULong maximum
+  )
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (maximum)
+      )
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  ,  mb_ (0)
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+{
+}
+
+ACE_INLINE
+TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA::Octet * data,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+  , mb_ (0)
+#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
+{
+}
+
+ACE_INLINE
+const CORBA::Octet *
+TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (void) const
+{
+  return reinterpret_cast<const CORBA::Octet * ACE_CAST_CONST> (this->buffer_);
+}
+
+ACE_INLINE
+CORBA::Octet &
+TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i)
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+  CORBA::Octet * tmp = reinterpret_cast<CORBA::Octet *> (this->buffer_);
+  return tmp[i];
+}
+
+ACE_INLINE
+const CORBA::Octet &
+TAO_Unbounded_Sequence<CORBA::Octet>::operator[] (CORBA::ULong i) const
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+  CORBA::Octet * const tmp =
+    reinterpret_cast<CORBA::Octet * ACE_CAST_CONST> (this->buffer_);
+  return tmp[i];
+}
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+ACE_INLINE
+ACE_Message_Block *
+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
new file mode 100644
index 00000000000..2d57569e8fd
--- /dev/null
+++ b/TAO/tao/Sequence_T.cpp
@@ -0,0 +1,2161 @@
+// $Id$
+
+#ifndef TAO_SEQUENCE_T_CPP
+#define TAO_SEQUENCE_T_CPP
+
+#include "tao/Sequence_T.h"
+#include "tao/Array_VarOut_T.h"
+
+#include "ace/OS_Memory.h"
+
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Sequence_T.i"
+#endif /* __ACE_INLINE__ */
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+template <typename T>
+TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (
+    const TAO_Unbounded_Sequence<T> & rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T * tmp1 = TAO_Unbounded_Sequence<T>::allocbuf (this->maximum_);
+      T * const tmp2 =
+        reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T>
+TAO_Unbounded_Sequence<T> &
+TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> & rhs)
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // Free the old buffer.
+          T * tmp = reinterpret_cast <T *> (this->buffer_);
+          TAO_Unbounded_Sequence<T>::freebuf (tmp);
+          this->buffer_ =
+            TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  T * tmp1 = reinterpret_cast <T *> (this->buffer_);
+  T * const tmp2 = reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
+
+  return *this;
+}
+
+template<typename T>
+TAO_Unbounded_Sequence<T>::~TAO_Unbounded_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template<typename T>
+void
+TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length)
+{
+  T * tmp = TAO_Unbounded_Sequence<T>::allocbuf (length);
+
+  if (this->buffer_ != 0)
+    {
+      T * old = reinterpret_cast <T *> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp[i] = old[i];
+        }
+
+      if (this->release_)
+        {
+          TAO_Unbounded_Sequence<T>::freebuf (old);
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+template<typename T>
+void
+TAO_Unbounded_Sequence<T>::_deallocate_buffer (void)
+{
+  if (this->release_ == 0)
+    {
+      return;
+    }
+
+  T * tmp = reinterpret_cast <T *> (this->buffer_);
+
+  TAO_Unbounded_Sequence<T>::freebuf (tmp);
+  this->buffer_ = 0;
+  this->maximum_ = 0;
+  this->length_  = 0;
+  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)
+{
+  T * result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+        {
+          if (this->length_ > 0)
+            {
+              result = TAO_Unbounded_Sequence<T>::allocbuf (this->length_);
+              this->buffer_ = result;
+              this->release_ = 1;
+            }
+        }
+      else
+        {
+          result = reinterpret_cast <T *> (this->buffer_);
+        }
+    }
+  else
+    {
+      result = reinterpret_cast <T *> (this->buffer_);
+
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
+// The following function is not inline, to avoid build (template
+// instantiation) problems with Sun C++ 4.2 patch 104631-07/SunOS 5.6.
+template <typename T>
+T &
+TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i)
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+  T * tmp = reinterpret_cast <T *> (this->buffer_);
+  return tmp[i];
+}
+
+// The following function is not inline, to avoid build (template
+// instantiation) problems with Sun C++ 4.2 patch 104631-07/SunOS 5.6.
+template <typename T>
+const T &
+TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i) const
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+  T * const tmp = reinterpret_cast <T * ACE_CAST_CONST> (this->buffer_);
+  return tmp[i];
+}
+
+template <typename T>
+void
+TAO_Unbounded_Sequence<T>::replace (CORBA::ULong max,
+                                    CORBA::ULong length,
+                                    T * data,
+                                    CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+
+  if (this->buffer_ && this->release_ == 1)
+    {
+      T * tmp = reinterpret_cast <T *> (this->buffer_);
+      TAO_Unbounded_Sequence<T>::freebuf (tmp);
+    }
+
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+// ****************************************************************
+// Bounded_Sequence
+// ****************************************************************
+
+template <typename T, size_t MAX>
+TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (
+    const TAO_Bounded_Sequence<T,MAX> &rhs
+  )
+  : TAO_Bounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T * tmp1 = TAO_Bounded_Sequence<T,MAX>::allocbuf (MAX);
+
+      T * const tmp2 = reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          tmp1[i] = tmp2[i];
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, size_t MAX>
+TAO_Bounded_Sequence<T,MAX> &
+TAO_Bounded_Sequence<T,MAX>::operator= (
+    const TAO_Bounded_Sequence<T,MAX> &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      // We never need to reallocate the buffer because they are
+      // always of size MAX.
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Bounded_Sequence<T, MAX>::allocbuf (rhs.maximum_);
+        }
+    }
+
+  TAO_Bounded_Base_Sequence::operator= (rhs);
+
+  T * tmp1 = reinterpret_cast <T *> (this->buffer_);
+  T * const tmp2 = reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      tmp1[i] = tmp2[i];
+    }
+
+  return *this;
+}
+
+template<typename T, size_t MAX>
+TAO_Bounded_Sequence<T, MAX>::~TAO_Bounded_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template<typename T, size_t MAX>
+void
+TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
+{
+  // For this class memory is never reallocated so the implementation
+  // is *really* simple.
+  this->buffer_ = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
+}
+
+template<typename T, size_t MAX>
+void
+TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
+{
+  if (this->release_ == 0)
+    {
+      return;
+    }
+
+  T * tmp = reinterpret_cast <T *> (this->buffer_);
+  TAO_Bounded_Sequence<T, MAX>::freebuf (tmp);
+  this->buffer_ = 0;
+  this->length_  = 0;
+  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)
+{
+  T * result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+
+      if (this->buffer_ == 0)
+        {
+          result = TAO_Bounded_Sequence<T,MAX>::allocbuf (this->maximum_);
+          this->buffer_ = result;
+                this->release_ = 1;
+        }
+      else
+        {
+          result = reinterpret_cast <T*> (this->buffer_);
+        }
+    }
+  else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish
+          // ownership.
+          result = reinterpret_cast <T*> (this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
+template <typename T, size_t MAX>
+void
+TAO_Bounded_Sequence<T,MAX>::replace (CORBA::ULong max,
+                                      CORBA::ULong length,
+                                      T * data,
+                                      CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+
+  if (this->buffer_ && this->release_ == 1)
+    {
+      T * tmp = reinterpret_cast <T *> (this->buffer_);
+      TAO_Bounded_Sequence<T,MAX>::freebuf (tmp);
+    }
+
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+// *************************************************************
+// class TAO_Object_Manager
+// *************************************************************
+
+template <typename T, typename T_var>
+TAO_Object_Manager<T,T_var> &
+TAO_Object_Manager<T,T_var>::operator= (
+    const TAO_Object_Manager<T,T_var> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      TAO::Objref_Traits<T>::release (*this->ptr_);
+      *this->ptr_ = TAO::Objref_Traits<T>::duplicate (*rhs.ptr_);
+    }
+  else
+    {
+      *this->ptr_ = *rhs.ptr_;
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var>
+TAO_Object_Manager<T,T_var> &
+TAO_Object_Manager<T,T_var>::operator= (T * p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we will not duplicate the
+      // user provided pointer before assigning it to the internal
+      // variable.
+      TAO::Objref_Traits<T>::release (*this->ptr_);
+      *this->ptr_ = p;
+    }
+  else
+    {
+      *this->ptr_ = p;
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var>
+TAO_Object_Manager<T,T_var> &
+TAO_Object_Manager<T,T_var>::operator= (const T_var & p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we duplicate p's
+      // pointer before assigning it to the internal
+      // variable.
+      TAO::Objref_Traits<T>::release (*this->ptr_);
+      *this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.in ());
+    }
+  else
+    {
+      *this->ptr_ = p.in ();
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var>
+T *&
+TAO_Object_Manager<T,T_var>::out (void)
+{
+  TAO::Objref_Traits<T>::release (*this->ptr_);
+  *this->ptr_ = TAO::Objref_Traits<T>::nil ();
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+T *
+TAO_Object_Manager<T,T_var>::_retn (void)
+{
+  T *temp = *this->ptr_;
+  *this->ptr_ = TAO::Objref_Traits<T>::nil ();
+  return temp;
+}
+
+// *************************************************************
+// class TAO_Pseudo_Object_Manager
+// *************************************************************
+
+template <typename T>
+TAO_Pseudo_Object_Manager<T> &
+TAO_Pseudo_Object_Manager<T>::operator= (
+    const TAO_Pseudo_Object_Manager<T> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      CORBA::release (*this->ptr_);
+      *this->ptr_ = T::_duplicate (*rhs.ptr_);
+    }
+  else
+    {
+      *this->ptr_ = *rhs.ptr_;
+    }
+
+  return *this;
+}
+
+template <typename T>
+TAO_Pseudo_Object_Manager<T> &
+TAO_Pseudo_Object_Manager<T>::operator= (T * p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we will not duplicate the
+      // user provided pointer before assigning it to the internal
+      // variable.  However, we will release it.
+      CORBA::release (*this->ptr_);
+      *this->ptr_ = p;
+    }
+  else
+    {
+      *this->ptr_ = p;
+    }
+
+  return *this;
+}
+
+template <typename T>
+TAO_Pseudo_Object_Manager<T> &
+TAO_Pseudo_Object_Manager<T>::operator= (const T_var_type & p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we duplicate p's
+      // pointer before assigning it to the internal
+      // variable.
+      CORBA::release (*this->ptr_);
+      *this->ptr_ = T::_duplicate (p.in ());
+    }
+  else
+    {
+      *this->ptr_ = p.in ();
+    }
+
+  return *this;
+}
+
+// *************************************************************
+// Operations for class TAO_Unbounded_Object_Sequence
+// *************************************************************
+
+// constructor for unbounded seq
+template <typename T, typename T_var>
+TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
+    CORBA::ULong maximum
+  )
+  : TAO_Unbounded_Base_Sequence (
+         maximum,
+         TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
+             maximum
+           )
+       )
+{
+}
+
+template <typename T, typename T_var>
+TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
+    const TAO_Unbounded_Object_Sequence<T,T_var> &rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T ** tmp1 =
+        TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
+            this->maximum_
+          );
+      T ** const tmp2 = reinterpret_cast <T ** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template<typename T, typename T_var>
+TAO_Unbounded_Object_Sequence<T,T_var>::~TAO_Unbounded_Object_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+// Assignment operator.
+template <typename T, typename T_var>
+TAO_Unbounded_Object_Sequence<T,T_var> &
+TAO_Unbounded_Object_Sequence<T,T_var>::operator= (
+    const TAO_Unbounded_Object_Sequence<T,T_var> &rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = reinterpret_cast <T **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          TAO::Objref_Traits<T>::release (tmp[i]);
+          tmp[i] = TAO::Objref_Traits<T>::nil ();
+        }
+
+      if (this->maximum_ < rhs.maximum_)
+        {
+          TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
+          this->buffer_ =
+            TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = reinterpret_cast <T **> (this->buffer_);
+  T ** const tmp2 = reinterpret_cast <T ** ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var>
+T **
+TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
+    CORBA::ULong nelems
+  )
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf,
+                  T * [nelems],
+                  0);
+
+  for (CORBA::ULong i = 0; i < nelems; ++i)
+    {
+      buf[i] = TAO::Objref_Traits<T>::nil ();
+    }
+
+  return buf;
+}
+
+template <typename T, typename T_var>
+void
+TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (T ** buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  // {orbos/97-05-15:16.11} The freebuf function ensures that the
+  // destructor for each element is called before the buffer is
+  // destroyed, except for string elements, which are freed using
+  // string_free(), and object reference elements, which are freed
+  // using release(). The freebuf function will ignore null pointers
+  // passed to it.
+
+  // @@ How are we supposed to implement that! We don't know the
+  // length of the buffer here.
+  // Mark the length in the first four bytes? For the moment we let
+  // that be.
+
+  delete [] buffer;
+}
+
+template<typename T, typename T_var>
+void
+TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  T ** tmp =
+    TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (length);
+
+  if (this->buffer_ != 0)
+    {
+      T ** old = reinterpret_cast <T **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        // Only call duplicate when we did not own the previous
+        // buffer, since after this method we own it we must also own
+        // the objects.  If we already own the objects there is no
+        // need to copy them, if we did we would also have to remove
+        // the old instances.
+        if (!this->release_)
+          {
+            tmp[i] = TAO::Objref_Traits<T>::duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
+
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+template<typename T, typename T_var>
+void
+TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (
+    void
+  )
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = reinterpret_cast <T **> (this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      TAO::Objref_Traits<T>::release (tmp[i]);
+      tmp[i] = TAO::Objref_Traits<T>::nil ();
+    }
+
+  TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
+  this->buffer_  = 0;
+  this->maximum_ = 0;
+  this->length_  = 0;
+  this->release_ = 0;
+}
+
+template<typename T, typename T_var>
+void
+TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
+{
+  T ** tmp = static_cast <T **> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      TAO::Objref_Traits<T>::release (tmp[i]);
+      tmp[i] = TAO::Objref_Traits<T>::nil ();
+    }
+}
+
+// *************************************************************
+// Operations for class TAO_Bounded_Object_Sequence
+// *************************************************************
+
+template <typename T, typename T_var, size_t MAX>
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence (void)
+  : TAO_Bounded_Base_Sequence (
+        MAX,
+        TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (MAX)
+      )
+{
+}
+
+template <typename T, typename T_var, size_t MAX>
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence (
+    const TAO_Bounded_Object_Sequence<T,T_var,MAX> & rhs
+  )
+  : TAO_Bounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T ** tmp1 =
+        TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (MAX);
+
+      T ** const tmp2 = reinterpret_cast <T** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, typename T_var, size_t MAX>
+TAO_Bounded_Object_Sequence<T, T_var,MAX> &
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= (
+    const TAO_Bounded_Object_Sequence<T,T_var,MAX> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = reinterpret_cast<T **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          TAO::Objref_Traits<T>::release (tmp[i]);
+          tmp[i] = TAO::Objref_Traits<T>::nil ();
+        }
+      // No need to reallocate the buffer since it is always of size
+      // MAX
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Bounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
+  T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i=0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]);
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var, size_t MAX>
+T **
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (
+    CORBA::ULong
+  )
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf,
+                  T * [MAX],
+                  0);
+
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      buf[i] = TAO::Objref_Traits<T>::nil ();
+    }
+
+  return buf;
+}
+
+template <typename T, typename T_var,  size_t MAX>
+void
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (T ** buffer)
+{
+  // How much do we deallocate? Easy! allocbuf() always creates MAX
+  // elements and initialize them to T::_nil().  So we can be
+  // complaint and call CORBA::release() on each one.
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      if (buffer[i] != TAO::Objref_Traits<T>::nil ())
+        {
+          TAO::Objref_Traits<T>::release (buffer[i]);
+          buffer[i] = TAO::Objref_Traits<T>::nil ();
+        }
+    }
+
+  delete [] buffer;
+}
+
+template<typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  // For this class memory is never reallocated so the implementation
+  // is *really* simple.
+  this->buffer_ =
+    TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (length);
+}
+
+template<typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::_deallocate_buffer (
+    void
+  )
+{
+  if (this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+  TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (tmp);
+  this->buffer_ = 0;
+  this->length_  = 0;
+  this->release_ = 0;
+}
+
+template<typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
+{
+  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      TAO::Objref_Traits<T>::release (tmp[i]);
+      tmp[i] = TAO::Objref_Traits<T>::nil ();
+    }
+}
+
+// *************************************************************
+// Operations for class TAO_Unbounded_Pseudo_Sequence
+// *************************************************************
+
+template <typename T>
+TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence (
+    CORBA::ULong maximum
+  )
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (maximum)
+      )
+{
+}
+
+template <typename T>
+TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence (
+    const TAO_Unbounded_Pseudo_Sequence<T> & rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T **tmp1 =
+        TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (this->maximum_);
+
+      T ** const tmp2 =
+        reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = T::_duplicate (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T>
+TAO_Unbounded_Pseudo_Sequence<T>::~TAO_Unbounded_Pseudo_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template <typename T>
+TAO_Unbounded_Pseudo_Sequence<T> &
+TAO_Unbounded_Pseudo_Sequence<T>::operator= (
+    const TAO_Unbounded_Pseudo_Sequence<T> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = reinterpret_cast<T **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = T::_nil ();
+        }
+
+      if (this->maximum_ < rhs.maximum_)
+        {
+          TAO_Unbounded_Pseudo_Sequence<T>::freebuf (tmp);
+          this->buffer_ =
+            TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (rhs.maximum_);
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
+  T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = T::_duplicate (tmp2[i]);
+    }
+
+  return *this;
+}
+
+template <typename T>
+T **
+TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (CORBA::ULong nelems)
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf,
+                  T * [nelems],
+                  0);
+
+  for (CORBA::ULong i = 0; i < nelems; ++i)
+    {
+      buf[i] = T::_nil ();
+    }
+
+  return buf;
+}
+
+template <typename T>
+void
+TAO_Unbounded_Pseudo_Sequence<T>::freebuf (T ** buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  // {orbos/97-05-15:16.11} The freebuf function ensures that the
+  // destructor for each element is called before the buffer is
+  // destroyed, except for string elements, which are freed using
+  // string_free(), and object reference elements, which are freed
+  // using release(). The freebuf function will ignore null pointers
+  // passed to it.
+
+  // @@ How are we supposed to implement that! We don't know the
+  // length of the buffer here.
+  // Mark the length in the first four bytes? For the moment we let
+  // that be.
+
+  delete [] buffer;
+}
+
+template <typename T>
+void
+TAO_Unbounded_Pseudo_Sequence<T>::_allocate_buffer (CORBA::ULong length)
+{
+  T ** tmp = TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (length);
+
+  if (this->buffer_ != 0)
+    {
+      T ** old = reinterpret_cast<T **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        // Only call duplicate when we did not own the previous
+        // buffer, since after this method we own it we must also own
+        // the objects.  If we already own the objects there is no
+        // need to copy them, if we did we would also have to remove
+        // the old instances.
+        if (!this->release_)
+          {
+            tmp[i] = T::_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
+
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+template <typename T>
+void
+TAO_Unbounded_Pseudo_Sequence<T>::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = T::_nil ();
+    }
+
+  TAO_Unbounded_Pseudo_Sequence<T>::freebuf (tmp);
+  this->buffer_  = 0;
+  this->length_  = 0;
+  this->release_ = 0;
+  this->maximum_ = 0;
+}
+
+template <typename T>
+void
+TAO_Unbounded_Pseudo_Sequence<T>::_shrink_buffer (CORBA::ULong nl,
+                                                  CORBA::ULong ol)
+{
+  T ** tmp = static_cast<T **> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = T::_nil ();
+    }
+}
+
+// *************************************************************
+// Operations for class TAO_Bounded_Pseudo_Sequence
+// *************************************************************
+
+template <typename T, size_t MAX>
+TAO_Bounded_Pseudo_Sequence<T,MAX>::TAO_Bounded_Pseudo_Sequence (void)
+  : TAO_Bounded_Base_Sequence (
+        MAX,
+        TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (MAX)
+      )
+{
+}
+
+template <typename T, size_t MAX>
+TAO_Bounded_Pseudo_Sequence<T,MAX>::TAO_Bounded_Pseudo_Sequence (
+    const TAO_Bounded_Pseudo_Sequence<T,MAX> & rhs
+  )
+  : TAO_Bounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T ** tmp1 =
+        TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (MAX);
+
+      T ** const tmp2 =
+       reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = T::_duplicate (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, size_t MAX>
+TAO_Bounded_Pseudo_Sequence<T,MAX> &
+TAO_Bounded_Pseudo_Sequence<T,MAX>::operator= (
+    const TAO_Bounded_Pseudo_Sequence<T,MAX> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = reinterpret_cast<T **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::release (tmp[i]);
+          tmp[i] = T::_nil ();
+        }
+      // No need to reallocate the buffer since it is always of size
+      // MAX
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (rhs.maximum_);
+        }
+    }
+
+  TAO_Bounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
+  T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i=0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = T::_duplicate (tmp2[i]);
+    }
+
+  return *this;
+}
+
+template <typename T, size_t MAX>
+T **
+TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (CORBA::ULong)
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf,
+                  T * [MAX],
+                  0);
+
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      buf[i] = T::_nil ();
+    }
+
+  return buf;
+}
+
+template <typename T, size_t MAX>
+void
+TAO_Bounded_Pseudo_Sequence<T,MAX>::freebuf (T ** buffer)
+{
+  // How much do we deallocate? Easy! allocbuf() always creates MAX
+  // elements and initialize them to T::_nil().  So we can be
+  // complaint and call CORBA::release() on each one.
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      if (buffer[i] != T::_nil ())
+        {
+          CORBA::release (buffer[i]);
+          buffer[i] = T::_nil ();
+        }
+    }
+
+  delete [] buffer;
+}
+
+template <typename T, size_t MAX>
+void
+TAO_Bounded_Pseudo_Sequence<T,MAX>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  // For this class memory is never reallocated so the implementation
+  // is *really* simple.
+  this->buffer_ =
+    TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (length);
+}
+
+template <typename T, size_t MAX>
+void
+TAO_Bounded_Pseudo_Sequence<T,MAX>::_deallocate_buffer (void)
+{
+  if (this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+  TAO_Bounded_Pseudo_Sequence<T,MAX>::freebuf (tmp);
+  this->buffer_ = 0;
+  this->length_  = 0;
+  this->release_ = 0;
+}
+
+template <typename T, size_t MAX>
+void
+TAO_Bounded_Pseudo_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)
+    {
+      CORBA::release (tmp[i]);
+      tmp[i] = T::_nil ();
+    }
+}
+
+// *************************************************************
+// Operations for class TAO_Unbounded_Array_Sequence
+// *************************************************************
+
+template <typename T, typename T_slice, typename TAG>
+T *
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (CORBA::ULong nelems)
+{
+  T * buf = 0;
+  ACE_NEW_RETURN (buf,
+                  T [nelems],
+                  0);
+
+  return buf;
+}
+
+template <typename T, typename T_slice, typename TAG>
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::TAO_Unbounded_Array_Sequence (
+    const TAO_Unbounded_Array_Sequence<T,T_slice,TAG> & rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      typedef TAO_Unbounded_Array_Sequence<T,T_slice,TAG> SEQ_TYPE;
+      T * tmp1 =
+        reinterpret_cast<T *> (SEQ_TYPE::allocbuf (this->maximum_)
+          );
+
+      const T * tmp2 = reinterpret_cast<const T *> (rhs.buffer_);
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, typename T_slice, typename TAG>
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::~TAO_Unbounded_Array_Sequence (
+    void
+  )
+{
+  this->_deallocate_buffer ();
+}
+
+template <typename T, typename T_slice, typename TAG>
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG> &
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator= (
+    const TAO_Unbounded_Array_Sequence<T,T_slice,TAG> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      if (this->maximum_ < rhs.maximum_)
+        {
+          // free the old buffer
+          T * tmp = reinterpret_cast<T *> (this->buffer_);
+          TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (tmp);
+
+          if (rhs.maximum_ == 0)
+            {
+              this->buffer_ = 0;
+            }
+          else
+            {
+              this->buffer_ =
+                TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (
+                    rhs.maximum_
+                  );
+            }
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      TAO::Array_Traits<T,T_slice,TAG>::copy (
+          reinterpret_cast<T *> (this->buffer_)[i],
+          reinterpret_cast<const T *> (rhs.buffer_)[i]
+        );
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_slice, typename TAG>
+T *
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::get_buffer (
+    CORBA::Boolean orphan
+  )
+{
+  T * result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+
+      if (this->buffer_ == 0)
+        {
+          if (this->length_ > 0)
+            {
+              result =
+                TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (
+                    this->length_
+                  );
+              this->buffer_ = result;
+                    this->release_ = 1;
+            }
+        }
+      else
+        {
+          result =
+            reinterpret_cast<T *> (this->buffer_);
+        }
+    }
+  else
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish
+          // ownership.
+          result = reinterpret_cast<T *> (this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
+template <typename T, typename T_slice, typename TAG>
+void
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  typedef TAO_Unbounded_Array_Sequence<T,T_slice,TAG> SEQ_TYPE;
+  T * tmp =
+    reinterpret_cast<T *> (SEQ_TYPE::allocbuf (length)
+      );
+
+  if (this->buffer_ != 0)
+    {
+      T* old = (T *) this->buffer_;
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          TAO::Array_Traits<T,T_slice,TAG>::copy (tmp[i], old[i]);
+        }
+
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+template <typename T, typename T_slice, typename TAG>
+void
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+
+  T * tmp = reinterpret_cast<T *> (this->buffer_);
+  TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (tmp);
+
+  this->buffer_ = 0;
+  this->length_  = 0;
+  this->release_ = 0;
+  this->maximum_ = 0;
+}
+
+template <typename T, typename T_slice, typename TAG>
+void
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::replace (CORBA::ULong max,
+                                                      CORBA::ULong length,
+                                                      T * data,
+                                                      CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+
+  if (this->buffer_ && this->release_ == 1)
+    {
+      T * tmp = reinterpret_cast<T *> (this->buffer_);
+      TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (tmp);
+    }
+
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+// *************************************************************
+// Operations for class TAO_Bounded_Array_Sequence
+// *************************************************************
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+T *
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::allocbuf (CORBA::ULong)
+{
+  T * buf = 0;
+  ACE_NEW_RETURN (buf,
+                  T [MAX],
+                  0);
+
+  return buf;
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::TAO_Bounded_Array_Sequence (
+    const TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> &rhs
+  )
+  : TAO_Bounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      typedef TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> SEQ_TYPE;
+      T * tmp1 =
+        reinterpret_cast<T *> (SEQ_TYPE::allocbuf (MAX)
+          );
+
+      const T* tmp2 = (const T *) rhs.buffer_;
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::~TAO_Bounded_Array_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> &
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator= (
+    const TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      // We never need to reallocate the buffer because they are
+      // always of size MAX.
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Bounded_Base_Sequence::operator= (rhs);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      TAO::Array_Traits<T,T_slice,TAG>::copy (
+          ((T *) this->buffer_)[i],
+          ((const T *) rhs.buffer_)[i]
+        );
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+T *
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::get_buffer (CORBA::Boolean orphan)
+{
+  T * result = 0;
+
+  if (orphan == 0)
+    {
+      // We retain ownership.
+
+      if (this->buffer_ == 0)
+        {
+          result =
+                  TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::allocbuf (
+                this->maximum_
+              );
+          this->buffer_ = result;
+                this->release_ = 1;
+        }
+      else
+        {
+          result =
+            reinterpret_cast<T *> (this->buffer_);
+        }
+    }
+  else
+    {
+      if (this->release_ != 0)
+        {
+          // We set the state back to default and relinquish ownership.
+          result = reinterpret_cast<T *> (this->buffer_);
+          this->maximum_ = 0;
+          this->length_ = 0;
+          this->buffer_ = 0;
+          this->release_ = 0;
+        }
+    }
+
+  return result;
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+void
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::freebuf (T * buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+void
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  // For this class memory is never reallocated so the implementation
+  // is *really* simple.
+  this->buffer_ =
+    TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::allocbuf (length);
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+void
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+
+  T * tmp = reinterpret_cast<T *> (this->buffer_);
+
+  TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::freebuf (tmp);
+
+  this->buffer_ = 0;
+  this->length_  = 0;
+  this->release_ = 0;
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+void
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::replace (CORBA::ULong max,
+                                                   CORBA::ULong length,
+                                                   T * data,
+                                                   CORBA::Boolean release)
+{
+  this->maximum_ = max;
+  this->length_ = length;
+
+  if (this->buffer_ && this->release_ == 1)
+    {
+      T * tmp = reinterpret_cast<T *> (this->buffer_);
+      TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::freebuf (tmp);
+    }
+
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+// *************************************************************
+// Operations for class TAO_Bounded_String_Sequence
+// *************************************************************
+
+template<size_t MAX>
+TAO_Bounded_String_Sequence<MAX>::TAO_Bounded_String_Sequence (void)
+  : TAO_Bounded_Base_Sequence (
+        MAX,
+        TAO_Bounded_String_Sequence<MAX>::allocbuf(MAX)
+      )
+{
+}
+
+template<size_t MAX>
+TAO_Bounded_String_Sequence<MAX>::TAO_Bounded_String_Sequence (
+    const TAO_Bounded_String_Sequence<MAX> & rhs
+  )
+  : TAO_Bounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      char ** tmp1 =
+        TAO_Bounded_String_Sequence<MAX>::allocbuf (this->maximum_);
+
+      char ** const tmp2 =
+        reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA::string_dup (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template<size_t MAX>
+TAO_Bounded_String_Sequence<MAX> &
+TAO_Bounded_String_Sequence<MAX>::operator= (
+    const TAO_Bounded_String_Sequence<MAX> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      char ** tmp = reinterpret_cast<char **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::string_free (tmp[i]);
+          tmp[i] = 0;
+        }
+      // No need to reallocate because the buffer is supposed to be of
+      // <MAX> size.
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Bounded_String_Sequence<MAX>::allocbuf (rhs.maximum_);
+        }
+    }
+
+  TAO_Bounded_Base_Sequence::operator= (rhs);
+
+  char ** tmp1 = reinterpret_cast<char **> (this->buffer_);
+  char ** const tmp2 = reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = CORBA::string_dup (tmp2[i]);
+    }
+
+  return *this;
+}
+
+template<size_t MAX>
+TAO_SeqElem_String_Manager
+TAO_Bounded_String_Sequence<MAX>::operator[] (CORBA::ULong slot) const
+{
+  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
+  char ** const tmp = reinterpret_cast<char ** ACE_CAST_CONST> (this->buffer_);
+  return TAO_SeqElem_String_Manager (tmp + slot,
+                                     this->release_);
+}
+
+template<size_t MAX>
+char **
+TAO_Bounded_String_Sequence<MAX>::allocbuf (CORBA::ULong)
+{
+  char **buf = 0;
+  ACE_NEW_RETURN (buf,
+                  char * [MAX],
+                  0);
+
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      buf[i] = 0;
+    }
+
+  return buf;
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_String_Sequence<MAX>::freebuf (char ** buffer)
+{
+  // How much do we deallocate? Easy! <allocbuf> always creates MAX
+  // elements and initialize them to 0 (they say NULL, yuck!).  So we
+  // can be complaint and call CORBA::string_free() on each one.
+
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      if (buffer[i] != 0)
+        {
+          CORBA::string_free (buffer[i]);
+          buffer[i] = 0;
+        }
+    }
+
+  delete [] buffer;
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */)
+{
+  // For this class memory is never reallocated so the implementation
+  // is *really* simple.
+  this->buffer_ =
+    TAO_Bounded_String_Sequence<MAX>::allocbuf (MAX);
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_String_Sequence<MAX>::_deallocate_buffer (void)
+{
+  if (this->release_ == 0)
+    {
+      return;
+    }
+
+  char ** tmp = reinterpret_cast<char **> (this->buffer_);
+  TAO_Bounded_String_Sequence<MAX>::freebuf (tmp);
+  this->buffer_ = 0;
+  this->length_  = 0;
+  this->release_ = 0;
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_String_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
+                                                  CORBA::ULong ol)
+{
+  char ** tmp = reinterpret_cast<char **> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::string_free (tmp[i]);
+      tmp[i] = 0;
+    }
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_String_Sequence<MAX>::replace (CORBA::ULong length,
+                                           char ** data,
+                                           CORBA::Boolean release)
+{
+  TAO_SEQUENCE_ASSERT (length, this->maximum_);
+  this->_deallocate_buffer ();
+  this->length_ = length;
+
+  // If 'release' is 1, caller is responsible for allocating new buffer
+  // with CORBA::string_alloc.
+  this->buffer_ = data;
+  this->release_ = release;
+}
+// *************************************************************
+// Operations for class TAO_Bounded_WString_Sequence
+// *************************************************************
+
+template<size_t MAX>
+TAO_Bounded_WString_Sequence<MAX>::TAO_Bounded_WString_Sequence (void)
+  : TAO_Bounded_Base_Sequence (
+        MAX,
+        TAO_Bounded_WString_Sequence<MAX>::allocbuf(MAX)
+      )
+{
+}
+
+template<size_t MAX>
+TAO_Bounded_WString_Sequence<MAX>::TAO_Bounded_WString_Sequence (
+    const TAO_Bounded_WString_Sequence<MAX> & rhs
+  )
+  : TAO_Bounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      CORBA::WChar ** tmp1 =
+        TAO_Bounded_WString_Sequence<MAX>::allocbuf (this->maximum_);
+
+      CORBA::WChar ** const tmp2 =
+        reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA::wstring_dup (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template<size_t MAX>
+TAO_Bounded_WString_Sequence<MAX> &
+TAO_Bounded_WString_Sequence<MAX>::operator= (
+    const TAO_Bounded_WString_Sequence<MAX> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          CORBA::wstring_free (tmp[i]);
+          tmp[i] = 0;
+        }
+      // No need to reallocate because the buffer is supposed to be of
+      // <MAX> size.
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Bounded_WString_Sequence<MAX>::allocbuf (rhs.maximum_);
+        }
+    }
+
+  TAO_Bounded_Base_Sequence::operator= (rhs);
+
+  CORBA::WChar ** tmp1 = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+  CORBA::WChar ** const tmp2 =
+    reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = CORBA::wstring_dup (tmp2[i]);
+    }
+
+  return *this;
+}
+
+template<size_t MAX>
+TAO_SeqElem_WString_Manager
+TAO_Bounded_WString_Sequence<MAX>::operator[] (CORBA::ULong slot) const
+{
+  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
+  CORBA::WChar ** const tmp =
+    reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (this->buffer_);
+  return TAO_SeqElem_WString_Manager (tmp + slot,
+                                      this->release_);
+}
+
+template<size_t MAX>
+CORBA::WChar **
+TAO_Bounded_WString_Sequence<MAX>::allocbuf (CORBA::ULong)
+{
+  CORBA::WChar ** buf = 0;
+  ACE_NEW_RETURN (buf,
+                  CORBA::WChar * [MAX],
+                  0);
+
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      buf[i] = 0;
+    }
+
+  return buf;
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_WString_Sequence<MAX>::freebuf (CORBA::WChar* *buffer)
+{
+  // How much do we deallocate? Easy! <allocbuf> always creates MAX
+  // elements and initialize them to 0 (they say NULL, yuck!).  So we
+  // can be complaint and call CORBA::wstring_free() on each one.
+
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      if (buffer[i] != 0)
+        {
+          CORBA::wstring_free (buffer[i]);
+          buffer[i] = 0;
+        }
+    }
+
+  delete [] buffer;
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_WString_Sequence<MAX>::_allocate_buffer (
+    CORBA::ULong /* length */
+  )
+{
+  // For this class memory is never reallocated so the implementation
+  // is *really* simple.
+  this->buffer_ =
+    TAO_Bounded_WString_Sequence<MAX>::allocbuf (MAX);
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_WString_Sequence<MAX>::_deallocate_buffer (void)
+{
+  if (this->release_ == 0)
+    {
+      return;
+    }
+
+  CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+  TAO_Bounded_WString_Sequence<MAX>::freebuf (tmp);
+  this->buffer_ = 0;
+  this->length_ = 0;
+  this->release_ = 0;
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_WString_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl,
+                                                   CORBA::ULong ol)
+{
+  CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      CORBA::wstring_free (tmp[i]);
+      tmp[i] = 0;
+    }
+}
+
+template<size_t MAX>
+void
+TAO_Bounded_WString_Sequence<MAX>::replace (CORBA::ULong length,
+                                            CORBA::WChar ** data,
+                                            CORBA::Boolean release)
+{
+  TAO_SEQUENCE_ASSERT (length, this->maximum_);
+
+  this->_deallocate_buffer ();
+  this->length_ = length;
+
+  // If 'release' is 1, caller is responsible for allocating new buffer
+  // with CORBA::wstring_alloc.
+  this->buffer_ = data;
+  this->release_ = release;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* tao/TAO_SEQUENCE_T_CPP */
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
new file mode 100644
index 00000000000..960c9ae687a
--- /dev/null
+++ b/TAO/tao/Sequence_T.i
@@ -0,0 +1,607 @@
+// -*- C++ -*-
+//
+// $Id$
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// ***************************************************
+// Operations on the generic unbounded sequence class.
+// ***************************************************
+
+template <typename T>
+ACE_INLINE
+T *
+TAO_Unbounded_Sequence<T>::allocbuf (CORBA::ULong size)
+{
+  return new T[size];
+}
+
+template <typename T>
+ACE_INLINE
+void
+TAO_Unbounded_Sequence<T>::freebuf (T *buffer)
+{
+  delete [] buffer;
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (void)
+{
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (maximum,
+                                 TAO_Unbounded_Sequence<T>::allocbuf (maximum))
+{
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (CORBA::ULong maximum,
+                                                   CORBA::ULong length,
+                                                   T * data,
+                                                   CORBA::Boolean release)
+  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+{
+}
+
+template <typename T>
+ACE_INLINE
+const T *
+TAO_Unbounded_Sequence<T>::get_buffer (void) const
+{
+  return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
+}
+
+// ***************************************************
+// operations on the generic Bounded sequence class
+// ***************************************************
+
+template <typename T, size_t MAX>
+ACE_INLINE
+T *
+TAO_Bounded_Sequence<T, MAX>::allocbuf (CORBA::ULong)
+{
+  return new T[MAX];
+}
+
+template <typename T, size_t MAX>
+ACE_INLINE
+void
+TAO_Bounded_Sequence<T, MAX>::freebuf (T * buffer)
+{
+  delete [] buffer;
+}
+
+template <typename T, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (void)
+{
+  this->maximum_ = MAX;
+}
+
+template <typename T, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
+                                                    T * data,
+                                                    CORBA::Boolean release)
+  : TAO_Bounded_Base_Sequence (MAX, length, data, release)
+{
+}
+
+template <typename T, size_t MAX>
+ACE_INLINE
+const T *
+TAO_Bounded_Sequence<T, MAX>::get_buffer (void) const
+{
+  return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
+}
+
+template <class T, size_t MAX>
+ACE_INLINE
+T &
+TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i)
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+  T * tmp = reinterpret_cast<T *> (this->buffer_);
+  return tmp[i];
+}
+
+template <class T, size_t MAX>
+ACE_INLINE
+const T &
+TAO_Bounded_Sequence<T, MAX>::operator[] (CORBA::ULong i) const
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+  const T * tmp = reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
+  return tmp[i];
+}
+
+// *************************************************************
+// Inline operations for class TAO_Object_Manager<T>
+// *************************************************************
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Object_Manager<T,T_var>::~TAO_Object_Manager (void)
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Object_Manager<T,T_var>::TAO_Object_Manager (
+    const TAO_Object_Manager<T,T_var> & rhs
+  )
+  : ptr_ (rhs.ptr_),
+    release_ (rhs.release_)
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Object_Manager<T,T_var>::TAO_Object_Manager (
+    T ** buffer,
+    CORBA::Boolean release
+  )
+  : ptr_ (buffer),
+    release_ (release)
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE T *
+TAO_Object_Manager<T,T_var>::operator-> (void) const
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Object_Manager<T,T_var>::operator const T_var () const
+{
+  return TAO::Objref_Traits<T>::duplicate (*this->ptr_);
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Object_Manager<T,T_var>::operator const T *() const
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Object_Manager<T,T_var>::operator T *&()
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+T *
+TAO_Object_Manager<T,T_var>::in (void) const
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+T *&
+TAO_Object_Manager<T,T_var>::inout (void)
+{
+  return *this->ptr_;
+}
+
+// *************************************************************
+// Inline operations for class TAO_Pseudo_Object_Manager<T>
+// *************************************************************
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T>::~TAO_Pseudo_Object_Manager (void)
+{
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T>::TAO_Pseudo_Object_Manager (
+    const TAO_Pseudo_Object_Manager<T> & rhs
+  )
+  : ptr_ (rhs.ptr_),
+    release_ (rhs.release_)
+{
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T>::TAO_Pseudo_Object_Manager(
+    T ** buffer,
+    CORBA::Boolean release
+  )
+  : ptr_ (buffer),
+    release_ (release)
+{
+}
+
+template <typename T>
+ACE_INLINE
+T *
+TAO_Pseudo_Object_Manager<T>::operator-> (void) const
+{
+  return *this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T>::operator const T * () const
+{
+  return *this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T>::operator T *& ()
+{
+  return *this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE
+T *
+TAO_Pseudo_Object_Manager<T>::in (void) const
+{
+  return *this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE
+T *&
+TAO_Pseudo_Object_Manager<T>::inout (void)
+{
+  return *this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE
+T *&
+TAO_Pseudo_Object_Manager<T>::out (void)
+{
+  CORBA::release (*this->ptr_);
+  *this->ptr_ = T::_nil ();
+  return *this->ptr_;
+}
+
+template <typename T>
+ACE_INLINE
+T *
+TAO_Pseudo_Object_Manager<T>::_retn (void)
+{
+  T * temp = *this->ptr_;
+  *this->ptr_ = T::_nil ();
+  return temp;
+}
+
+// *************************************************************
+// class TAO_Unbounded_Object_Sequence
+// *************************************************************
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (void)
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    T* *value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Object_Manager<T,T_var>
+TAO_Unbounded_Object_Sequence<T,T_var>::operator[] (
+    CORBA::ULong slot
+  ) const
+{
+  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
+  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
+  return
+    TAO_Object_Manager<T,T_var> (tmp + slot, this->release_);
+}
+
+// *************************************************************
+// class TAO_Bounded_Object_Sequence
+// *************************************************************
+
+template <typename T, typename T_var, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::~TAO_Bounded_Object_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template <typename T, typename T_var, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence (
+    CORBA::ULong length,
+    T ** value,
+    CORBA::Boolean release
+  )
+  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
+{
+}
+
+template <typename T, typename T_var, size_t MAX>
+ACE_INLINE
+TAO_Object_Manager<T,T_var>
+TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator[] (
+    CORBA::ULong slot
+  ) const
+{
+  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
+  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
+  return
+    TAO_Object_Manager<T,T_var> (tmp + slot, this->release_ );
+}
+
+// *************************************************************
+// class TAO_Unbounded_Pseudo_Sequence
+// *************************************************************
+
+template <typename T>
+ACE_INLINE
+TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence (void)
+{
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    T ** value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+template <typename T>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T>
+TAO_Unbounded_Pseudo_Sequence<T>::operator[] (CORBA::ULong slot) const
+{
+  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
+  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
+  return TAO_Pseudo_Object_Manager<T> (tmp + slot, this->release_);
+}
+
+// *************************************************************
+// class TAO_Bounded_Pseudo_Sequence
+// *************************************************************
+
+template <typename T, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Pseudo_Sequence<T,MAX>::~TAO_Bounded_Pseudo_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template <typename T, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Pseudo_Sequence<T,MAX>::TAO_Bounded_Pseudo_Sequence (
+    CORBA::ULong length,
+    T ** value,
+    CORBA::Boolean release
+  )
+  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
+{
+}
+
+template <typename T, size_t MAX>
+ACE_INLINE
+TAO_Pseudo_Object_Manager<T>
+TAO_Bounded_Pseudo_Sequence<T,MAX>::operator[] (CORBA::ULong slot) const
+{
+  TAO_SEQUENCE_ASSERT (slot, this->maximum_);
+  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
+  return TAO_Pseudo_Object_Manager<T> (tmp + slot,
+                                       this->release_);
+}
+
+// *************************************************************
+// class TAO_Unbounded_Array_Sequence
+// *************************************************************
+
+template <typename T, typename T_slice, typename TAG>
+ACE_INLINE
+void
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (T * buffer)
+{
+  if (buffer == 0)
+    {
+        return;
+    }
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_slice, typename TAG>
+ACE_INLINE
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::TAO_Unbounded_Array_Sequence (
+    void
+  )
+{
+}
+
+template <typename T, typename T_slice, typename TAG>
+ACE_INLINE
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::
+TAO_Unbounded_Array_Sequence (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::allocbuf (maximum)
+      )
+{
+}
+
+template <typename T, typename T_slice, typename TAG>
+ACE_INLINE
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::
+TAO_Unbounded_Array_Sequence (CORBA::ULong maximum,
+                              CORBA::ULong length,
+                              T * value,
+                              CORBA::Boolean release)
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+template <typename T, typename T_slice, typename TAG>
+ACE_INLINE
+T &
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator[] (CORBA::ULong i)
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+
+#if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
+  return ((T *) this->buffer_)[i];
+#else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
+  return (reinterpret_cast<T *> (this->buffer_))[i];
+#endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
+}
+
+template <typename T, typename T_slice, typename TAG>
+ACE_INLINE
+const T &
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator[] (CORBA::ULong i) const
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+
+#if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
+  return ((const T * ACE_CAST_CONST) this->buffer_)[i];
+#else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
+  return (reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_))[i];
+#endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
+}
+
+template <typename T, typename T_slice, typename TAG>
+ACE_INLINE
+const T *
+TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::get_buffer (void) const
+{
+  return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
+}
+
+// *************************************************************
+// class TAO_Bounded_Array_Sequence
+// *************************************************************
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::
+TAO_Bounded_Array_Sequence (void)
+  : TAO_Bounded_Base_Sequence (MAX, 0, allocbuf (MAX), 1)
+{
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::
+TAO_Bounded_Array_Sequence (CORBA::ULong length,
+                            T * data,
+                            CORBA::Boolean release)
+  : TAO_Bounded_Base_Sequence (MAX, length, data, release)
+{
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+ACE_INLINE
+T &
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator[] (CORBA::ULong i)
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+
+#if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
+  return ((T *) this->buffer_)[i];
+#else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
+  return (reinterpret_cast<T *> (this->buffer_))[i];
+#endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+ACE_INLINE
+const T &
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator[] (
+    CORBA::ULong i
+  ) const
+{
+  TAO_SEQUENCE_ASSERT (i, this->maximum_);
+
+#if defined (__SUNPRO_CC) && (__SUNPRO_CC < 0x500)
+  return ((const T * ACE_CAST_CONST) this->buffer_)[i];
+#else /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
+  return (reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_))[i];
+#endif /* (__SUNPRO_CC) && (__SUNPRO_CC < 0x500) */
+}
+
+template <typename T, typename T_slice, typename TAG, size_t MAX>
+ACE_INLINE
+const T *
+TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::get_buffer (void) const
+{
+  return reinterpret_cast<const T * ACE_CAST_CONST> (this->buffer_);
+}
+
+// *************************************************************
+// class TAO_Bounded_String_Sequence
+// *************************************************************
+
+template<size_t MAX>
+ACE_INLINE
+TAO_Bounded_String_Sequence<MAX>::~TAO_Bounded_String_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template<size_t MAX>
+ACE_INLINE
+TAO_Bounded_String_Sequence<MAX>::
+TAO_Bounded_String_Sequence (CORBA::ULong length,
+                             char ** value,
+                             CORBA::Boolean release)
+  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
+{
+}
+
+// *************************************************************
+// class TAO_Bounded_WString_Sequence
+// *************************************************************
+
+template<size_t MAX>
+ACE_INLINE
+TAO_Bounded_WString_Sequence<MAX>::~TAO_Bounded_WString_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template<size_t MAX>
+ACE_INLINE
+TAO_Bounded_WString_Sequence<MAX>::
+TAO_Bounded_WString_Sequence (CORBA::ULong length,
+                              CORBA::WChar ** value,
+                              CORBA::Boolean release)
+  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
+{
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index 2e527cea8ec..5eddfd095cc 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -437,7 +437,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 ()));
         }
     }
@@ -721,7 +721,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,7 +743,7 @@ 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);
         }
     }
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 335567bc4e1..0048e52484c 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -157,7 +157,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 ()));
   }
 
@@ -182,7 +182,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 ()
                ));
   }
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 22de0661c8a..58c02996213 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -122,7 +122,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));
     }
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
index 314ec97354b..c250cd76240 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
@@ -1,13 +1,3 @@
-// =================================================================
-/**
- * @file OC_Endpoint_Selector_Loader.cpp
- *
- * $Id$
- *
- * @author Phil Mesnier <mesnier_p@ociweb.com>
- *
- */
-// =================================================================
 // $Id$
 
 #include "tao/Strategies/OC_Endpoint_Selector_Loader.h"
@@ -19,10 +9,11 @@ ACE_RCSID (tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-int
-TAO_OC_Endpoint_Selector_Loader::init (void)
+TAO_OC_Endpoint_Selector_Loader::TAO_OC_Endpoint_Selector_Loader (void)
 {
-  return  ACE_Service_Config::process_directive (ace_svc_desc_TAO_OC_Endpoint_Selector_Factory);
+#if defined (TAO_AS_STATIC_LIBS)
+  ACE_Service_Config::process_directive (ace_svc_desc_TAO_OC_Endpoint_Selector_Factory);
+#endif /* TAO_AS_STATIC_LIBS */
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
index a19f9cf5b1e..5edc517027d 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
@@ -49,12 +49,11 @@ class TAO_Optimized_Connection_Endpoint_Selector;
 class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Loader
 {
 public:
-  static int init(void);
+  TAO_OC_Endpoint_Selector_Loader (void);
 };
 
-static int
-TAO_Requires_OC_Endpoint_Selector_Loader =
-  TAO_OC_Endpoint_Selector_Loader::init ();
+
+static TAO_OC_Endpoint_Selector_Loader _TAO_oc_endpoint_selector_loader;
 
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index ad864ad1b9f..dae584e8152 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -27,7 +27,7 @@ TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Se
   if (TAO_debug_level)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO(%P|%t) Optimized Connection Enpoint Selector: ")
+                  ACE_TEXT ("TAO(%P|%t) Optimized Connection Enpoint Selector:")
                   ACE_TEXT ("Initializing timeout hook tv = %d sec, %d usec\n"),
               tv.sec(), tv.usec()));
     }
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 393e1204a71..bedde8420cb 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -610,7 +610,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 ()));
         }
     }
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index dd83f2fac6e..981c049ea49 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -317,7 +317,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
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 663bccdb60a..bb196a5d761 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -162,7 +162,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")));
 
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 5de6670b1a1..1d3e6134afb 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -206,7 +206,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 +331,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 +344,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 +478,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,7 +500,7 @@ 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);
         }
     }
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index adba9338dc1..362fe65f8e2 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -146,7 +146,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 +182,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 +196,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 ()));
 
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index dc6c0a5886f..427eda74eaa 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -384,7 +384,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 +447,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 +510,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 +573,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 +606,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 +614,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;
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index bff4141a033..b4a1fa1bfec 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -550,7 +550,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);
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index a55e9cc3b6a..c8954819592 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -225,7 +225,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
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 0839cc1f048..d288fbf7e6c 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -102,7 +102,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;
@@ -193,7 +193,7 @@ 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 ();
         }
@@ -227,7 +227,7 @@ 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();
         }
@@ -237,7 +237,7 @@ 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 ("-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 ();
         }
@@ -423,19 +423,19 @@ 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;
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 7b730df42a9..1d067684b6c 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -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,7 +107,7 @@ 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 ();
 }
@@ -1068,9 +1068,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_));
     }
 }
 
@@ -1224,7 +1224,6 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
 
   if (this->queue_message_i(message_block) == -1)
   {
-    if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
        ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ")
        ACE_TEXT ("cannot queue message for ")
@@ -2336,6 +2335,7 @@ TAO_Transport::post_open (size_t id)
                       ace_mon,
                       *this->handler_lock_,
                       false);
+
     this->is_connected_ = true;
   }
 
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index f7a742a87f4..0d6c1ee6692 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -7,14 +7,11 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/debug.h"
 #include "tao/Connect_Strategy.h"
-#include "tao/LF_Multi_Event.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 "tao/Endpoint.h"
-#include "tao/Base_Transport_Property.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -108,7 +105,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;
@@ -245,81 +242,6 @@ TAO_Connector::make_mprofile (const char *string,
   return 0;  // Success
 }
 
-int
-TAO_Connector::supports_parallel_connects(void) const
-{
-  return 0; // by default, we don't support parallel connection attempts;
-}
-
-TAO_Transport*
-TAO_Connector::make_parallel_connection (TAO::Profile_Transport_Resolver *,
-                                         TAO_Transport_Descriptor_Interface &,
-                                         ACE_Time_Value *)
-{
-  return 0;
-}
-
-
-TAO_Transport*
-TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r,
-                                 TAO_Transport_Descriptor_Interface *desc,
-                                 ACE_Time_Value *timeout
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-{
-  if (this->supports_parallel_connects() == 0)
-    {
-      errno = ENOTSUP;
-      return 0;
-    }
-
-  errno = 0; // need to clear errno to ensure a stale enotsup is not set
-  if (desc == 0)
-    return 0;
-  unsigned int endpoint_count = 0;
-  TAO_Endpoint *root_ep = desc->endpoint();
-  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0);
-       ep != 0;
-       ep = ep->next_filtered(this->orb_core(),root_ep))
-    if (this->set_validate_endpoint (ep) == 0)
-      ++endpoint_count;
-  if (endpoint_count == 0)
-    return 0;
-
-  TAO_Transport *base_transport = 0;
-
-  TAO::Transport_Cache_Manager &tcm =
-    this->orb_core ()->lane_resources ().transport_cache ();
-
-  // Iterate through the endpoints. Since find_transport takes a
-  // Transport Descriptor rather than an endpoint, we must create a
-  // local TDI for each endpoint. The first one found will be used.
-  for (TAO_Endpoint *ep = root_ep->next_filtered (this->orb_core(),0);
-       ep != 0;
-       ep = ep->next_filtered(this->orb_core(),root_ep))
-    {
-      TAO_Base_Transport_Property desc2(ep,0);
-      if (tcm.find_transport (&desc2,
-                              base_transport) == 0)
-        {
-          if (TAO_debug_level)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("(%P|%t) TAO_Connector::parallel_connect: ")
-                        ACE_TEXT ("found a transport [%d]\n"),
-                        base_transport->id()));
-          return base_transport;
-        }
-    }
-
-  // Now we have searched the cache on all endpoints and come up
-  // empty. We need to initiate connections on each of the
-  // endpoints. Presumably only one will have a route and will succeed,
-  // and the rest will fail. This requires the use of asynch
-  // connection establishment. Maybe a custom wait strategy is needed
-  // at this point to register several potential transports so that
-  // when one succeeds the rest are cancelled or closed.
-
-  return this->make_parallel_connection (r,*desc,timeout);
-}
 
 TAO_Transport*
 TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
@@ -358,8 +280,8 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
 
       if (TAO_debug_level > 4)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("(%P|%t) Transport_Connector::connect, ")
-                    ACE_TEXT("opening Transport[%d] in TAO_CLIENT_ROLE\n"),
+                    "TAO (%P|%t) - Transport_Connector::connect, "
+                    "opening Transport[%d] in TAO_CLIENT_ROLE\n",
                     t->id ()));
 
       // Call post connect hook. If the post_connect_hook () returns
@@ -393,13 +315,10 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
                   "TAO_UNSPECIFIED_ROLE" ));
     }
 
-  // If connected return.
+  // If connected return..
   if (base_transport->is_connected ())
     return base_transport;
 
-  // It it possible to get a transport from the cache that is not
-  // connected? If not, then the following code is bogus. We cannot
-  // wait for a connection to complete on a transport in the cache.
   if (!this->wait_for_connection_completion (r,
                                              base_transport,
                                              timeout))
@@ -513,100 +432,10 @@ TAO_Connector::wait_for_connection_completion (
         }
     }
 
-  // Connection not ready yet but we can use this transport, if
-  // we need a connected one we will block later to make sure
-  // it is connected
-  return true;
-}
-
-bool
-TAO_Connector::wait_for_connection_completion (
-    TAO::Profile_Transport_Resolver *r,
-    TAO_Transport *&the_winner,
-    TAO_Transport **transport,
-    unsigned int count,
-    TAO_LF_Multi_Event *mev,
-    ACE_Time_Value *timeout)
-{
-  if (TAO_debug_level > 2)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("(%P|%t) Transport_Connector::")
-                  ACE_TEXT("wait_for_connection_completion, ")
-                  ACE_TEXT("waiting for connection completion on ")
-                  ACE_TEXT("%d transports, ["),
-                  count));
-      for (unsigned int i = 0; i < count; i++)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("%d%s"),transport[i]->id(),
-                    (i < (count -1) ? ", " : "]\n")));
-    }
-
-  // If we don't need to block for a transport just set the timeout to
-  // be zero.
-  ACE_Time_Value tmp_zero (ACE_Time_Value::zero);
-  if (!r->blocked_connect ())
-    {
-      timeout = &tmp_zero;
-    }
-
-  int result = this->active_connect_strategy_->wait (mev,timeout);
-  the_winner = 0;
-
-  if (result != -1)
-    {
-      the_winner = mev->winner()->transport();
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("(%P|%t) Transport_Connector::")
-                    ACE_TEXT("wait_for_connection_completion, ")
-                    ACE_TEXT("transport [%d]\n"),
-                    the_winner->id ()));
-    }
-  else if (errno == ETIME)
-    {
-      // this is the most difficult case. In this situation, there is no
-      // nominated by the Multi_Event. The best we can do is pick one of
-      // the pending connections.
-      // Of course, this shouldn't happen in any case, since the wait
-      // strategy is called with a timeout value of 0.
-      for (unsigned int i = 0; i < count; i++)
-        if (!transport[i]->connection_handler()->is_closed())
-          {
-            the_winner = transport[i];
-            break;
-          }
-    }
-
-  // It is possible that we have more than one connection that happened
-  // to complete, or that none completed. Therefore we need to traverse
-  // the list and ensure that all of the losers are closed.
-  for (unsigned int i = 0; i < count; i++)
-    {
-      if (transport[i] != the_winner)
-        this->check_connection_closure (transport[i]->connection_handler());
-      // since we are doing this on may connections, the result isn't
-      // particularly important.
-    }
-
-  // In case of errors.
-  if (the_winner == 0)
-    {
-      // Report that making the connection failed, don't print errno
-      // because we touched the reactor and errno could be changed
-      if (TAO_debug_level > 2)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Transport_Connector::")
-                    ACE_TEXT ("wait_for_connection_completion, failed\n")
-                    ));
-
-      return false;
-    }
-
   // Fix for a subtle problem. What happens if we are supposed to do
   // blocked connect but the transport is NOT connected? Force close
   // the connections
-  if (r->blocked_connect () && !the_winner->is_connected ())
+  if (r->blocked_connect () && !transport->is_connected ())
     {
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG,
@@ -617,8 +446,8 @@ TAO_Connector::wait_for_connection_completion (
 
       // Forget the return value. We are busted anyway. Try our best
       // here.
-      (void) this->cancel_svc_handler (the_winner->connection_handler ());
-      the_winner = 0;
+      (void) this->cancel_svc_handler (transport->connection_handler ());
+      transport = 0;
       return false;
     }
 
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index f457ee5ec9a..e29d0b251b3 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -41,7 +41,6 @@ class TAO_ORB_Core;
 class TAO_Connect_Strategy;
 class TAO_Transport;
 class TAO_Connection_Handler;
-class TAO_LF_Multi_Event;
 
 namespace TAO
 {
@@ -122,14 +121,6 @@ public:
       ACE_Time_Value *timeout
       ACE_ENV_ARG_DECL);
 
-  /// A variation on connect that will try simultanious connections
-  /// on all endpoints listed in the desc.
-  virtual TAO_Transport* parallel_connect (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface *desc,
-      ACE_Time_Value *timeout
-      ACE_ENV_ARG_DECL);
-
   /// Create a profile for this protocol and initialize it based on the
   /// encapsulation in @a cdr
   virtual TAO_Profile *create_profile (
@@ -146,10 +137,6 @@ public:
   //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_ADD_HOOK
 
 protected:
-  /// A flag indicating the actual connector supports parallel connection
-  /// attempts. The base implementation alwayse returns 0. Override to return
-  /// non-zero if parallel connection attempts may be tried.
-  virtual int supports_parallel_connects (void) const;
 
   /// Create a profile with a given endpoint.
   virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL) = 0;
@@ -164,13 +151,6 @@ protected:
       TAO_Transport_Descriptor_Interface &desc,
       ACE_Time_Value *timeout) = 0;
 
-  /// Make a connection using - not a pure virtual since not all
-  /// protocols support this.
-  virtual TAO_Transport* make_parallel_connection (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface &desc,
-      ACE_Time_Value *timeout);
-
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (
       TAO_Connection_Handler *svc_handler) = 0;
@@ -195,17 +175,6 @@ protected:
       TAO_Transport *&transport,
       ACE_Time_Value *timeout);
 
-  /// In the case of a parallel connection attempt, we take an array of
-  /// transports, and wait on any of them. When the first one completes,
-  /// the rest are closed.
-  virtual bool wait_for_connection_completion(
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport *&the_winner,
-      TAO_Transport **transport,
-      unsigned int count,
-      TAO_LF_Multi_Event *mev,
-      ACE_Time_Value *timeout);
-
   /// Set the ORB Core pointer
   void orb_core (TAO_ORB_Core *orb_core);
 
diff --git a/TAO/tao/Transport_Descriptor_Interface.cpp b/TAO/tao/Transport_Descriptor_Interface.cpp
index 9db80555cf8..a58af5ac064 100644
--- a/TAO/tao/Transport_Descriptor_Interface.cpp
+++ b/TAO/tao/Transport_Descriptor_Interface.cpp
@@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface (void)
 {
-  if (this->release_)
+  if (this->endpoint_from_heap_)
     {
       delete this->endpoint_;
     }
diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h
index 7cc891fecff..0934238d072 100644
--- a/TAO/tao/Transport_Descriptor_Interface.h
+++ b/TAO/tao/Transport_Descriptor_Interface.h
@@ -73,7 +73,7 @@ protected:
 
   /// Constructor
   TAO_Transport_Descriptor_Interface (TAO_Endpoint *endpoint,
-                                      CORBA::Boolean take_ownership = 0);
+                                      CORBA::Boolean flag = 0);
 
   /// The base property of the connection ie. the peer's endpoint
   TAO_Endpoint *endpoint_;
@@ -83,7 +83,7 @@ protected:
 
   /// Is the endpoint allocated on the heap? If so, we will have to
   /// delete it when we destruct ourselves.
-  CORBA::Boolean release_;
+  CORBA::Boolean endpoint_from_heap_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl
index 4e667f946a9..6d1bbcb6d56 100644
--- a/TAO/tao/Transport_Descriptor_Interface.inl
+++ b/TAO/tao/Transport_Descriptor_Interface.inl
@@ -7,10 +7,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE
 TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (
   TAO_Endpoint *endpoint,
-  CORBA::Boolean take_ownership)
+  CORBA::Boolean flag)
   : endpoint_ (endpoint),
     bidir_flag_ (false),
-    release_ (take_ownership)
+    endpoint_from_heap_ (flag)
 {
 }
 
@@ -18,7 +18,7 @@ ACE_INLINE
 TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void)
   : endpoint_ (0),
     bidir_flag_ (false),
-    release_ (false)
+    endpoint_from_heap_ (false)
 {
 }
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index d1e918736c7..66169ee26f6 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -204,7 +204,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 +333,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;
             }
diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h
index d942e07e9f3..5c5d2cc982e 100644
--- a/TAO/tao/Unbounded_Sequence_CDR_T.h
+++ b/TAO/tao/Unbounded_Sequence_CDR_T.h
@@ -12,7 +12,6 @@
  */
 
 #include "tao/orbconf.h"
-#include "tao/SystemException.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -364,8 +363,6 @@ namespace TAO {
 namespace TAO {
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Short> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -375,8 +372,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Long> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -386,8 +381,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::ULong> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -397,8 +390,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::UShort> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -409,8 +400,6 @@ namespace TAO {
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Octet> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -423,8 +412,6 @@ namespace TAO {
 #else
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Octet> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -435,8 +422,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Char> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -447,8 +432,6 @@ namespace TAO {
 # if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::WChar> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -459,8 +442,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Float> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -470,8 +451,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Double> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -481,8 +460,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::ULongLong> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -492,8 +469,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::LongDouble> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -503,8 +478,6 @@ namespace TAO {
 
   template <typename stream>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::Boolean> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -514,8 +487,6 @@ namespace TAO {
 
   template <typename stream, typename value_t>
   bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <value_t> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -530,8 +501,6 @@ namespace TAO {
 
   template <typename stream, typename charT>
   bool marshal_sequence(stream & strm, const TAO::details::unbounded_basic_string_sequence <charT> & source) {
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
@@ -547,8 +516,6 @@ namespace TAO {
   template <typename stream, typename object_t, typename object_t_var>
   bool marshal_sequence(stream & strm, const TAO::unbounded_object_reference_sequence<object_t, object_t_var> & source) {
     typedef typename TAO::unbounded_object_reference_sequence<object_t, object_t_var>::object_type objec_t;
-    if (0 == &source)
-      ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
     if (!(strm << length)) {
       return false;
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index 8fdaae3432a..a28c7ae4ef7 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -400,12 +400,6 @@ CORBA::AbstractBase::_tao_unmarshal_v (TAO_InputCDR &)
   return false;
 }
 
-CORBA::Boolean
-CORBA::AbstractBase::_tao_match_formal_type (ptrdiff_t ) const
-{
-  return 0;
-}
-
 CORBA::ValueBase *
 CORBA::AbstractBase::_tao_to_value (void)
 {
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index 339d2918d8f..cc00f37a969 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -91,7 +91,6 @@ namespace CORBA
     virtual const char* _tao_obv_repository_id (void) const;
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm) const;
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm);
-    virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
 
     /// Memmory management operations
     virtual void _add_ref (void);
diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp
new file mode 100644
index 00000000000..d69116d7704
--- /dev/null
+++ b/TAO/tao/Valuetype/Sequence_T.cpp
@@ -0,0 +1,504 @@
+// $Id$
+
+#ifndef TAO_VALUETYPE_SEQUENCE_T_CPP
+#define TAO_VALUETYPE_SEQUENCE_T_CPP
+
+#include "tao/Valuetype/Sequence_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "tao/Valuetype/Sequence_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (Valuetype,
+           Sequence_T,
+           "$Id$")
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// *************************************************************
+// class TAO_Valuetype_Manager
+// *************************************************************
+
+template <typename T, typename T_var>
+TAO_Valuetype_Manager<T,T_var> &
+TAO_Valuetype_Manager<T,T_var>::operator= (
+    const TAO_Valuetype_Manager<T,T_var> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      TAO::Value_Traits<T>::remove_ref (*this->ptr_);
+      *this->ptr_ = *rhs.ptr_;
+      TAO::Value_Traits<T>::add_ref (*this->ptr_);
+    }
+  else
+    {
+      *this->ptr_ = *rhs.ptr_;
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var>
+TAO_Valuetype_Manager<T,T_var> &
+TAO_Valuetype_Manager<T,T_var>::operator= (T * p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we will not duplicate the
+      // user provided pointer before assigning it to the internal
+      // variable.
+      TAO::Value_Traits<T>::remove_ref (*this->ptr_);
+      *this->ptr_ = p;
+    }
+  else
+    {
+      *this->ptr_ = p;
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var>
+TAO_Valuetype_Manager<T,T_var> &
+TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we duplicate p's
+      // pointer before assigning it to the internal
+      // variable.
+      if (*this->ptr_ != 0)
+        {
+          (*this->ptr_)->_remove_ref ();
+        }
+
+      TAO::Value_Traits<T>::remove_ref (*this->ptr_);
+      *this->ptr_ = p.in ();
+      TAO::Value_Traits<T>::add_ref (*this->ptr_);
+    }
+  else
+    {
+      *this->ptr_ = p.in ();
+    }
+
+  return *this;
+}
+
+// *************************************************************
+// Operations for class TAO_Unbounded_Valuetype_Sequence
+// *************************************************************
+
+template <typename T, typename T_var>
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
+    CORBA::ULong maximum
+  )
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (maximum)
+      )
+{
+}
+
+template <typename T, typename T_var>
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
+    const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T ** tmp1 =
+        TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (
+            this->maximum_
+          );
+      T ** const tmp2 =
+        reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          TAO::Value_Traits<T>::add_ref (tmp2[i]);
+          tmp1[i] = tmp2[i];
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, typename T_var>
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::~TAO_Unbounded_Valuetype_Sequence (
+    void
+  )
+{
+  this->_deallocate_buffer ();
+}
+
+template <typename T, typename T_var>
+TAO_Unbounded_Valuetype_Sequence<T,T_var> &
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= (
+    const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = reinterpret_cast<T **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          TAO::Value_Traits<T>::remove_ref (tmp[i]);
+          tmp[i] = 0;
+        }
+
+      if (this->maximum_ < rhs.maximum_)
+        {
+          TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (tmp);
+          this->buffer_ =
+            TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
+  T ** const tmp2 = reinterpret_cast<T **ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      TAO::Value_Traits<T>::add_ref (tmp2[i]);
+      tmp1[i] = tmp2[i];
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var>
+T **
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf,
+                  T * [nelems],
+                  0);
+
+  for (CORBA::ULong i = 0; i < nelems; ++i)
+    {
+      buf[i] = 0;
+    }
+
+  return buf;
+}
+
+template <typename T, typename T_var>
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (T ** buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  // {orbos/97-05-15:16.11} The freebuf function ensures that the
+  // destructor for each element is called before the buffer is
+  // destroyed, except for string elements, which are freed using
+  // string_free(), and object reference elements, which are freed
+  // using release(). The freebuf function will ignore null pointers
+  // passed to it.
+
+  // @@ How are we supposed to implement that! We don't know the
+  // length of the buffer here.
+  // Mark the length in the first four bytes? For the moment we let
+  // that be.
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_var>
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  T ** tmp =
+    TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (length);
+
+  if (this->buffer_ != 0)
+    {
+      T ** old = reinterpret_cast<T **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        // Only call duplicate when we did not own the previous
+        // buffer, since after this method we own it we must also own
+        // the objects.  If we already own the objects there is no
+        // need to copy them, if we did we would also have to remove
+        // the old instances.
+        if (!this->release_)
+          {
+            TAO::Value_Traits<T>::add_ref (tmp[i]);
+            tmp[i] = old[i];
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
+
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+template <typename T, typename T_var>
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      TAO::Value_Traits<T>::remove_ref (tmp[i]);
+      tmp[i] = 0;
+    }
+
+  TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+template <typename T, typename T_var>
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
+{
+  T ** tmp = static_cast<T **> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      TAO::Value_Traits<T>::remove_ref (tmp[i]);
+      tmp[i] = 0;
+    }
+}
+
+// *************************************************************
+// Operations for class TAO_Bounded_Valuetype_Sequence
+// *************************************************************
+
+template <typename T, typename T_var, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
+    void
+  )
+  : TAO_Bounded_Base_Sequence (
+        MAX,
+        TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (MAX)
+      )
+{
+}
+
+template <typename T, typename T_var, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
+    const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> & rhs
+  )
+  : TAO_Bounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T ** tmp1 =
+        TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (MAX);
+
+      T ** const tmp2 =
+        reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          TAO::Value_Traits<T>::add_ref (tmp2[i]);
+          tmp1[i] = tmp2[i];
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template<typename T, typename T_var, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::~TAO_Bounded_Valuetype_Sequence (
+    void
+  )
+{
+  this->_deallocate_buffer ();
+}
+
+template <typename T, typename T_var, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>&
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator= (
+    const TAO_Bounded_Valuetype_Sequence<T,T_var,MAX> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = reinterpret_cast<T **> (this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          TAO::Value_Traits<T>::remove_ref (tmp[i]);
+          tmp[i] = 0;
+        }
+      // No need to reallocate the buffer since it is always of size
+      // MAX
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Bounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = reinterpret_cast<T **> (this->buffer_);
+  T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      TAO::Value_Traits<T>::add_ref (tmp2[i]);
+      tmp1[i] = tmp2[i];
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var, size_t MAX>
+T **
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (CORBA::ULong)
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf,
+                  T * [MAX],
+                  0);
+
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      buf[i] = 0;
+    }
+
+  return buf;
+}
+
+template <typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (T ** buffer)
+{
+  // How much do we deallocate? Easy! allocbuf() always creates MAX
+  // elements and initialize them to T::_nil().  So we can be
+  // complaint and call CORBA::release() on each one.
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      if (buffer[i] != 0)
+        {
+          TAO::Value_Traits<T>::remove_ref (buffer[i]);
+          buffer[i] = 0;
+        }
+    }
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  // For this class memory is never reallocated so the implementation
+  // is *really* simple.
+  this->buffer_ =
+    TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (length);
+}
+
+template <typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_deallocate_buffer (void)
+{
+  if (this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+  TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+template <typename T, typename T_var, size_t MAX>
+void
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
+{
+  T ** tmp = reinterpret_cast<T **> (this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      TAO::Value_Traits<T>::remove_ref (tmp[i]);
+      tmp[i] = 0;
+    }
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* TAO_VALUETYPE_SEQUENCE_T_CPP */
diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl
new file mode 100644
index 00000000000..503beaa3ad9
--- /dev/null
+++ b/TAO/tao/Valuetype/Sequence_T.inl
@@ -0,0 +1,171 @@
+// -*- C++ -*-
+//
+// $Id$
+
+
+#include "ace/Log_Msg.h" // for ACE_ASSERT
+
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// *************************************************************
+// Inline operations for class TAO_Valuetype_Manager
+// *************************************************************
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var>::~TAO_Valuetype_Manager (void)
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager (
+    const TAO_Valuetype_Manager<T,T_var> & rhs
+  )
+  : ptr_ (rhs.ptr_),
+    release_ (rhs.release_)
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager(
+    T ** buffer,
+    CORBA::Boolean release
+  )
+  : ptr_ (buffer),
+    release_ (release)
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+T *
+TAO_Valuetype_Manager<T,T_var>::operator-> (void) const
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var>::operator const T_var () const
+{
+  TAO::Value_Traits<T>::add_ref (*this->ptr_);
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var>::operator const T * () const
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var>::operator T *& ()
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+T *
+TAO_Valuetype_Manager<T,T_var>::in (void) const
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+T *&
+TAO_Valuetype_Manager<T,T_var>::inout (void)
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+T *&
+TAO_Valuetype_Manager<T,T_var>::out (void)
+{
+  TAO::Value_Traits<T>::remove_ref (*this->ptr_);
+  *this->ptr_ = 0;
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+T *
+TAO_Valuetype_Manager<T,T_var>::_retn (void)
+{
+  T * temp = *this->ptr_;
+  *this->ptr_ = 0;
+  return temp;
+}
+
+// *************************************************************
+// class TAO_Unbounded_Valuetype_Sequence
+// *************************************************************
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
+    void
+  )
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    T ** value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+template <typename T, typename T_var>
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var>
+TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] (
+    CORBA::ULong slot
+  ) const
+{
+  ACE_ASSERT (slot < this->maximum_);
+  T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_);
+  return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_);
+}
+
+// *************************************************************
+// class TAO_Bounded_Valuetype_Sequence
+// *************************************************************
+
+template<typename T, typename T_var, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence (
+    CORBA::ULong length,
+    T **value,
+    CORBA::Boolean release
+  )
+  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
+{
+}
+
+template<typename T, typename T_var, size_t MAX>
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var>
+TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] (
+    CORBA::ULong slot
+  ) const
+{
+  ACE_ASSERT (slot < this->maximum_);
+  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 848cf644b2e..836192bc71a 100644
--- a/TAO/tao/Valuetype/StringValueC.cpp
+++ b/TAO/tao/Valuetype/StringValueC.cpp
@@ -112,12 +112,6 @@ CORBA::StringValue::_tao_obv_repository_id (void) const
   return this->_tao_obv_static_repository_id ();
 }
 
-void
-CORBA::StringValue::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const
-{
-  ids.push_back (this->_tao_obv_static_repository_id ());
-}
-
 CORBA::Boolean
 CORBA::StringValue::_tao_unmarshal (
     TAO_InputCDR &strm,
@@ -201,12 +195,6 @@ CORBA::WStringValue::_tao_obv_repository_id (void) const
   return this->_tao_obv_static_repository_id ();
 }
 
-void
-CORBA::WStringValue::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const
-{
-  ids.push_back (this->_tao_obv_static_repository_id ());
-}
-
 CORBA::Boolean
 CORBA::WStringValue::_tao_unmarshal (
     TAO_InputCDR &strm,
@@ -365,7 +353,7 @@ operator>>= (
 CORBA::Boolean
 operator<< (
     TAO_OutputCDR &strm,
-    CORBA::StringValue *_tao_valuebox
+    const CORBA::StringValue *_tao_valuebox
   )
 {
   return
@@ -393,7 +381,7 @@ operator>> (
 CORBA::Boolean
 operator<< (
     TAO_OutputCDR &strm,
-    CORBA::WStringValue *_tao_valuebox
+    const CORBA::WStringValue *_tao_valuebox
   )
 {
   return
diff --git a/TAO/tao/Valuetype/StringValueC.h b/TAO/tao/Valuetype/StringValueC.h
index fa8d1e68cab..a0b9b69b3a8 100644
--- a/TAO/tao/Valuetype/StringValueC.h
+++ b/TAO/tao/Valuetype/StringValueC.h
@@ -70,50 +70,49 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ch.cpp:52
 
 #if !defined (_CORBA_STRINGVALUE_CH_)
 #define _CORBA_STRINGVALUE_CH_
-
+  
   class StringValue;
-
+  
   typedef
     TAO_Value_Var_T<
         StringValue
       >
     StringValue_var;
-
+  
   typedef
     TAO_Value_Out_T<
         StringValue
       >
     StringValue_out;
-
+  
   class TAO_Valuetype_Export StringValue
     : public virtual CORBA::DefaultValueRefCountBase
   {
   public:
-
+    
     static StringValue* _downcast (CORBA::ValueBase *);
     CORBA::ValueBase * _copy_value (void);
-
+    
     virtual const char* _tao_obv_repository_id (void) const;
-    virtual void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const;
-
+    
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         StringValue *&
       );
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ch.cpp:403
-
+    
     // constructors
     StringValue (void);
     StringValue (CORBA::Char * val);
@@ -122,97 +121,95 @@ namespace CORBA
     StringValue (const StringValue& val);
     // assignment operators
     StringValue& operator= (CORBA::Char * val);
-
+    
     StringValue& operator= (const CORBA::Char * val);
-
+    
     StringValue& operator= (const CORBA::String_var& var);
-
+    
     // accessor
     const CORBA::Char * _value (void) const;
-
+    
     // modifiers
     void _value (CORBA::Char * val);
     void _value (const CORBA::Char * val);
     void _value (const CORBA::String_var& var);
-
+    
     // access to the boxed value for method signatures
     const CORBA::Char * _boxed_in (void) const;
     CORBA::Char *& _boxed_inout (void);
     CORBA::Char *& _boxed_out (void);
     // allows access and modification using a slot.
     char & operator[] (CORBA::ULong slot);
-
+    
     // allows only accessing thru a slot.
     char operator[] (CORBA::ULong slot) const;
-
+    
   private:
     CORBA::String_var _pd_value;
-
-
+    
+    
     // TAO_IDL - Generated from
     // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ch.cpp:115
-
+  
   protected:
     virtual ~StringValue (void);
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-    virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
-
+    
   private:
     void operator= (const StringValue & val);
-
+    
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   extern TAO_Valuetype_Export ::CORBA::TypeCode_ptr const _tc_StringValue;
-
+  
   // TAO_IDL - Generated from
   // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ch.cpp:52
 
 #if !defined (_CORBA_WSTRINGVALUE_CH_)
 #define _CORBA_WSTRINGVALUE_CH_
-
+  
   class WStringValue;
-
+  
   typedef
     TAO_Value_Var_T<
         WStringValue
       >
     WStringValue_var;
-
+  
   typedef
     TAO_Value_Out_T<
         WStringValue
       >
     WStringValue_out;
-
+  
   class TAO_Valuetype_Export WStringValue
     : public virtual CORBA::DefaultValueRefCountBase
   {
   public:
-
+    
     static WStringValue* _downcast (CORBA::ValueBase *);
     CORBA::ValueBase * _copy_value (void);
-
+    
     virtual const char* _tao_obv_repository_id (void) const;
-    virtual void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const;
-
+    
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static CORBA::Boolean _tao_unmarshal (
         TAO_InputCDR &,
         WStringValue *&
       );
-
-
-
+    
+    
+    
     // TAO_IDL - Generated from
     // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ch.cpp:403
-
+    
     // constructors
     WStringValue (void);
     WStringValue (CORBA::WChar * val);
@@ -221,52 +218,51 @@ namespace CORBA
     WStringValue (const WStringValue& val);
     // assignment operators
     WStringValue& operator= (CORBA::WChar * val);
-
+    
     WStringValue& operator= (const CORBA::WChar * val);
-
+    
     WStringValue& operator= (const CORBA::WString_var& var);
-
+    
     // accessor
     const CORBA::WChar * _value (void) const;
-
+    
     // modifiers
     void _value (CORBA::WChar * val);
     void _value (const CORBA::WChar * val);
     void _value (const CORBA::WString_var& var);
-
+    
     // access to the boxed value for method signatures
     const CORBA::WChar * _boxed_in (void) const;
     CORBA::WChar *& _boxed_inout (void);
     CORBA::WChar *& _boxed_out (void);
     // allows access and modification using a slot.
     CORBA::WChar & operator[] (CORBA::ULong slot);
-
+    
     // allows only accessing thru a slot.
     CORBA::WChar operator[] (CORBA::ULong slot) const;
-
+    
   private:
     CORBA::WString_var _pd_value;
-
-
+    
+    
     // TAO_IDL - Generated from
     // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ch.cpp:115
-
+  
   protected:
     virtual ~WStringValue (void);
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const;
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-    virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const;
-
+    
   private:
     void operator= (const WStringValue & val);
-
+    
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   extern TAO_Valuetype_Export ::CORBA::TypeCode_ptr const _tc_WStringValue;
 
 // TAO_IDL - Generated from
@@ -328,3 +324,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/Valuetype/StringValueC.inl b/TAO/tao/Valuetype/StringValueC.inl
index a7b1df82545..04fc7a36098 100644
--- a/TAO/tao/Valuetype/StringValueC.inl
+++ b/TAO/tao/Valuetype/StringValueC.inl
@@ -142,6 +142,8 @@ CORBA::StringValue::_tao_marshal_v (TAO_OutputCDR & strm) const
   return (strm << this->_pd_value);
 }
 
+
+
 // TAO_IDL - Generated from
 // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ci.cpp:60
 ACE_INLINE const char*
@@ -156,12 +158,7 @@ CORBA::StringValue::_tao_unmarshal_v (TAO_InputCDR & )
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean
-CORBA::StringValue::_tao_match_formal_type (ptrdiff_t formal_type_id) const
-{
-  return formal_type_id ==
-    reinterpret_cast<ptrdiff_t> (&CORBA::StringValue::_downcast);
-}
+
 
 // TAO_IDL - Generated from
 // c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_ci.cpp:332
@@ -293,11 +290,5 @@ CORBA::WStringValue::_tao_unmarshal_v (TAO_InputCDR & )
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean
-CORBA::WStringValue::_tao_match_formal_type (ptrdiff_t formal_type_id) const
-{
-  return formal_type_id ==
-    reinterpret_cast<ptrdiff_t> (&CORBA::WStringValue::_downcast);
-}
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index fbcd805a704..d7c325203d8 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -13,7 +13,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_string.h"
-#include "ace/CORBA_macros.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Valuetype/ValueBase.inl"
@@ -49,25 +48,11 @@ CORBA::remove_ref (CORBA::ValueBase *val)
 
 // ***********************************************************************
 
-TAO_ChunkInfo::TAO_ChunkInfo(CORBA::Boolean do_chunking,
-                             CORBA::Long init_level)
-  : chunking_(do_chunking),
-    value_nesting_level_(init_level),
-    chunk_size_pos_ (0),
-    length_to_chunk_octets_pos_ (0),
-    chunk_octets_end_pos_ (0)
-{
-}
-
 CORBA::ValueBase::ValueBase (void)
-  : is_truncatable_(0),
-    chunking_(0)
 {
 }
 
-CORBA::ValueBase::ValueBase (const ValueBase& val)
-  :  is_truncatable_(val.is_truncatable_),
-     chunking_(val.chunking_)
+CORBA::ValueBase::ValueBase (const ValueBase&)
 {
 }
 
@@ -104,17 +89,29 @@ CORBA::ValueBase::_tao_any_destructor (void *x)
 
 // (see CORBA 2.3 GIOP 15.3.4)
 
-// %! yet much to do ... look for +++ !
-
+CORBA::Boolean
+CORBA::ValueBase::_tao_marshal (TAO_OutputCDR &strm,
+                                const CORBA::ValueBase *this_,
+                                ptrdiff_t /* formal_type_id */)
+{
+  CORBA::Boolean retval = true;
+  // %! yet much to do ... look for +++ !
 
   // 1. Is 'this' yet marshalled ? (->1a)
   //    If not then mark 'this' as marshalled. (->2) +++
   //    Or is it null ? (write null_ref and return ok)
   // 1a. Put indirection and return successfull.
 
+  if (this_ == 0)
+    {
+      retval = strm.write_ulong (0);
+      // write TAO_OBV_GIOP_Flags::Null_ref
+      return retval;
+    }
+
   // 2. if (chunking) and we are in a chunk (look in strm),
   //    end the chunk by writing its length at its start.
-  //    This is the responsibility of the CDR stream.
+  //    This is the responsibility of the CDR stream. +++
   //    But if nothing is writtern in this chunk yet,
   //    we want to overwrite the place of the dummy blocksize-tag
   //    with our <value-tag>.
@@ -123,33 +120,41 @@ CORBA::ValueBase::_tao_any_destructor (void *x)
   // 3. Build <value-tag>, which states if chunking is used
   //    and if type information ((list of) repository id(s))
   //    is provided. The latter is necessary if the formal_type_id
-  //    is unequal the 'true derived' type of this object.
+  //    is unequal the 'true derived' type of this object. +++
+
+  CORBA::ULong value_tag = TAO_OBV_GIOP_Flags::Value_tag_base
+                           | TAO_OBV_GIOP_Flags::Type_info_single;
+
+  retval = strm.write_ulong (value_tag);
+
+  if (! retval)
+    {
+      return retval;
+    }
 
   // 4. Marshal type information.
 
-  // 5. if (chunking) let room for a blocksize-tag. (i.e. write Long)
+  retval = strm.write_string (this_->_tao_obv_repository_id ());
+
+  if (! retval)
+    {
+      return retval;
+    }
+
+  // 5. if (chunking) let room for a blocksize-tag. (i.e. write ULong)
 
   // 6. Now marshal state members. (%! Problem when state is empty
   //    and chunked encoding is used.)
 
-  // 7. if (chunking) let strm overwrite the last blocksize tag
-  //    with its concrete value.
+  retval = this_->_tao_marshal_v (strm);
 
+  // 7. if (chunking) let strm overwrite the last blocksize tag
+  //    with its concrete value.                                 +++
   // 8. if (chunking) write an end tag, or (optimization) let the CDR
   //    care for collecting all end tags of nested values (e.g. linked
-  //    list), so that only one end tag at all must be written.
-
-CORBA::Boolean
-CORBA::ValueBase::_tao_marshal (TAO_OutputCDR &strm,
-                                const CORBA::ValueBase *this_,
-                                ptrdiff_t formal_type_id)
-{
-  if ( ! write_special_value (strm, this_))
-  {
-    return write_value (strm, this_, formal_type_id);
-  }
+  //    list), so that only one end tag at all must be written.  +++
 
-  return true;
+  return retval;
 }
 
 
@@ -170,8 +175,10 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
   //  new_object->_tao_unmarshal_v ()
   //  new_object->_tao_unmarshal_post ()
 
+  CORBA::ValueFactory_var factory;
   CORBA::Boolean retval =
     CORBA::ValueBase::_tao_unmarshal_pre (strm,
+                                          factory.out (),
                                           new_object,
                                           0);
 
@@ -180,11 +187,22 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
       return false;
     }
 
-  if (new_object != 0)
+  if (factory.in () != 0)
+    {
+      new_object = factory->create_for_unmarshal ();
+
+      if (new_object == 0)
+        {
+          return false;  // %! except.?
+        }
+
+      retval = new_object->_tao_unmarshal_v (strm);
+
+      if (retval == 0)
         {
-      if (! new_object->_tao_unmarshal_v (strm))
           return false;
         }
+    }
 
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
@@ -195,11 +213,13 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
 
 CORBA::Boolean
 CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
+                                      CORBA::ValueFactory &factory,
                                       CORBA::ValueBase *&valuetype,
                                       const char * const repo_id)
-{
-  CORBA::ValueFactory factory = 0;
-
+{ // %! dont leak on error case !
+  // %! postconditions
+  CORBA::Boolean retval = true;
+  factory = 0;
   // %! yet much to do ... look for +++ !
 
   // 1. Get the <value-tag> (else it may be <indirection-tag> or <null-ref>).
@@ -210,11 +230,32 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
   //     type mismatch gets by undetected, if the CDR stream fakes.
   //     So the type should be checked ... +++
 
+  CORBA::ULong value_tag;
+
+  if (!strm.read_ulong (value_tag))
+    {
+      return false;
+    }
+
+  if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
+    {
+      valuetype = 0;
+      return true;
+      // ok, null reference unmarshaled
+    }
   // 2. Now at this point it must be a <value-tag> (error else).
   //    if (chunking) check that any last chunk ends with matching
   //    size. If not raise marshal exception.
   //    Increase the nesting level of valuetypes.
 
+  if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag))
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("!CORBA::ValueBase::_tao_unmarshal_pre ")
+                  ACE_TEXT ("not value_tag\n")));
+      return false;
+    }
+
   // 3. if (chunking) read and record the blocksize-tag.
 
   // 4. Unmarshal type information and lookup factory.
@@ -222,110 +263,102 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
   //    from the <value-tag>, then use the repository id parameter
   //    (it _must_ be right).
 
-  CORBA::Long valuetag;
-  Repository_Id_List ids;
+  TAO_ORB_Core *orb_core = strm.orb_core ();
 
-  if (! strm.read_long(valuetag))
-    return false;
+  if (orb_core == 0)
+    {
+      orb_core = TAO_ORB_Core_instance ();
 
-  if (TAO_OBV_GIOP_Flags::is_indirection_tag (valuetag))
-        {
-    //@@TODO: read indirection value.
       if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO does not currently support valuetype indirecton\n")));
-    return false;
-    }
-  else if (TAO_OBV_GIOP_Flags::is_null_ref (valuetag))
-    {
-    // null reference is unmarshalled.
-    valuetype = 0;
-    return true;
-    }
-  else if (TAO_OBV_GIOP_Flags::has_single_type_info (valuetag))
-    {
-      ACE_CString id;
-      if (! strm.read_string(id))
-        return false;
-      ids.push_back (id);
-    }
-  else if (TAO_OBV_GIOP_Flags::has_list_type_info (valuetag))
-    {
-      if (! read_repository_ids(strm, ids))
-        return false;
+        {
+          ACE_DEBUG ((LM_WARNING,
+                      "TAO (%P|%t) WARNING: extracting valuetype using "
+                      "default ORB_Core\n"));
+        }
     }
-  else if (TAO_OBV_GIOP_Flags::has_no_type_info (valuetag))
+
+  if (TAO_OBV_GIOP_Flags::has_no_type_info (value_tag))
     {
-      ids.push_back (repo_id);
+      factory = orb_core->orb ()->lookup_value_factory (repo_id);
     }
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) unknown value tag: %x\n"), valuetag));
-      return false;
-    }
+      CORBA::String_var repo_id_stream;
 
-  TAO_ORB_Core *orb_core = strm.orb_core ();
+      CORBA::ULong length = 0;
 
-  if (orb_core == 0)
-    {
-      orb_core = TAO_ORB_Core_instance ();
+      if (!strm.read_ulong (length))
+        {
+          return false;
+        }
 
-      if (TAO_debug_level > 0)
+      // 'length' may not be the repo id length - it could be the
+      // FFFFFFF indirection marker instead
+      if (TAO_OBV_GIOP_Flags::is_indirection_tag (length))
+        {
+          CORBA::Long offset;
+
+          // Read the negative byte offset
+          if (!strm.read_long (offset) || offset >= 0)
             {
-          ACE_DEBUG ((LM_WARNING,
-                      "TAO (%P|%t) WARNING: extracting valuetype using "
-                      "default ORB_Core\n"));
+              return false;
             }
-        }
 
-  CORBA::Boolean require_truncation = false;
-  CORBA::Boolean chunking = TAO_OBV_GIOP_Flags::is_chunked (valuetag);
+          // Cribbed from tc_demarshal_indirection in Typecode_CDR_Extraction.cpp
+          TAO_InputCDR indir_stream (strm.rd_ptr () + offset - sizeof (CORBA::Long),
+                                    (-offset) + sizeof (CORBA::Long),
+                                    strm.byte_order ());
 
-  CORBA::ULong num_ids = ids.size ();
-  // Find the registered factory for this unmarshalling valuetype. If any
-  // factory for the valuetype in its truncatable derivation hierarchy
-  // is registered, the factory is used to create value for unmarshalling.
-  for (CORBA::ULong i = 0; i < num_ids; ++i)
-    {
-      factory = orb_core->orb ()->lookup_value_factory (ids[i].c_str ());
-      if (factory != 0)
+          if (!indir_stream.good_bit ())
+            {
+              return false;
+            }
+
+          indir_stream.read_string(repo_id_stream.inout ());
+        }
+      else
         {
-          if (i != 0 && chunking)
+          if (length > 0 && length <= strm.length ())
             {
-              require_truncation = true;
+              ACE_NEW_RETURN (repo_id_stream.inout (),
+                              ACE_CDR::Char[length],
+                              0);
+              if (!strm.read_char_array (repo_id_stream.inout (), length))
+                {
+                  return false;
+                }
+            }
+          else if (length == 0)
+            {
+              ACE_NEW_RETURN (repo_id_stream.inout (),
+                              ACE_CDR::Char[1],
+                              0);
+              ACE_OS::strcpy (const_cast <char *&> (repo_id_stream.inout ()), "");
+            }
+          else
+            {
+              return false;
             }
-          break;
         }
+
+      factory =
+        orb_core->orb ()->lookup_value_factory (repo_id_stream.in ());
     }
 
   if (factory == 0)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) OBV factory is null, id = %s\n"), repo_id));
+          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);
-     }
-
-
-  valuetype = factory->create_for_unmarshal ();
-
-  if (require_truncation)
-    valuetype->truncation_hook ();
-
-  if (valuetype == 0)
-    {
-      return false;  // %! except.?
     }
 
-  valuetype->chunking_ = chunking;
-
-  return true;
+  return retval;
 }
 
 CORBA::Boolean
@@ -355,11 +388,11 @@ CORBA::ValueBase::_tao_validate_box_type (TAO_InputCDR &strm,
                                           const char * const repo_id_expected,
                                           CORBA::Boolean & null_object)
 {
-  CORBA::Long value_tag;
+  CORBA::ULong value_tag;
 
   // todo: no handling for indirection yet
 
-  if (!strm.read_long (value_tag))
+  if (!strm.read_ulong (value_tag))
     {
       return false;
     }
@@ -409,6 +442,10 @@ CORBA::ValueBase::_tao_validate_box_type (TAO_InputCDR &strm,
        {  // Repository ids matched as expected
         return true;
        }
+     else
+       { // Unequal repository ids
+         return false;
+       }
     }
 
   if (TAO_OBV_GIOP_Flags::has_list_type_info (value_tag))
@@ -421,354 +458,6 @@ CORBA::ValueBase::_tao_validate_box_type (TAO_InputCDR &strm,
 }
 
 
-// =================== methods for chunking ====================
-
-
-CORBA::Boolean
-CORBA::ValueBase::write_special_value(TAO_OutputCDR &strm,
-                                      const CORBA::ValueBase *value)
-{
-  // If the 'value' is null then write the null value to the stream.
-  if (value == 0)
-  {
-    return strm.write_long (TAO_OBV_GIOP_Flags::Null_tag);
-  }
-  //@@TODO: Check if the value is already written to stream. If it is then
-  //        put indirection and return successful, otherwise does nothing
-  //        and returns false.
-  else
-  {
-    // value not handled by this method - other code will write the value.
-    return false;
-  }
-}
-
-
-CORBA::Boolean
-CORBA::ValueBase::write_value(TAO_OutputCDR &strm,
-                              const CORBA::ValueBase * value,
-                              ptrdiff_t formal_type_id)
-{
-  if (! value->write_value_header (strm, formal_type_id))
-    return false;
-
-  if (! value->_tao_marshal_v (strm))
-    return false;
-
-  return true;
-}
-
-
-CORBA::Boolean
-CORBA::ValueBase::write_value_header(TAO_OutputCDR &strm,
-                                     ptrdiff_t formal_type_id) const
-{
-#if defined (TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING)
-  // this case allows TAO to avoid marshaling the typeID for values
-  // where the actual type matches the formal type (ie not a derived
-  // type).
-  //
-  // I would much prefer that there be a way to have a -ORB option to
-  // control this behavior, but for now there is no reference to the
-  // ORB Core available during marshaling (there is during unmarshaling)
-  // and no other way to communicate such configuration values.
-
-  CORBA::Boolean is_formal_type =
-    this->_tao_match_formal_type (formal_type_id);
-#else
-  // Unfortunately, all versions of tao prior to TAO 1.5.2 did not
-  // support unmarshaling of valuetypes that did not explicitly
-  // marshal the type id. At least it is benign to always encode the
-  // typecode value, even if it can be a little verbose.
-  CORBA::Boolean is_formal_type =
-    false;
-  ACE_UNUSED_ARG (formal_type_id);
-#endif /* TAO_HAS_OPTIMIMIZED_VALUETYPE_MARSHALING */
-
-  // Get the list of repository ids for this valuetype.
-  Repository_Id_List repository_ids;
-  this->_tao_obv_truncatable_repo_ids (repository_ids);
-  CORBA::Long num_ids = static_cast <CORBA::Long> (repository_ids.size ());
-
-  // Build <value-tag>, which states if chunking is used
-  // and if type information ((list of) repository id(s))
-  // is provided. The latter is necessary if the formal_type_id
-  // is unequal the 'true derived' type of this object.
-  CORBA::Long valuetag = TAO_OBV_GIOP_Flags::Value_tag_base;
-
-  // Truncatable value type, must use chunking and list all repository
-  // ids in its "truncatable" derivation hierarchy.
-  if (this->is_truncatable_ || this->chunking_)
-    valuetag |= TAO_OBV_GIOP_Flags::Chunking_tag_sigbits;
-
-  if (!is_formal_type || this->is_truncatable_)
-    valuetag |= TAO_OBV_GIOP_Flags::Type_info_single;
-
-  if (num_ids > 1)
-      valuetag |= TAO_OBV_GIOP_Flags::Type_info_list;
-
-    // Write <value-tag>.
-    if (! strm.write_long (valuetag))
-    {
-      return false;
-    }
-
-  if (num_ids > 1 && !strm.write_long (num_ids))
-      return false;
-
-  if (this->is_truncatable_ ||
-      !is_formal_type ||
-      num_ids > 1)
-    {
-  // Marshal type information.
-  for( CORBA::Long i = 0; i < num_ids; ++i )
-    {
-      if (! strm.write_string (repository_ids[i]))
-        return false;
-        }
-    }
-
-  return true;
-}
-
-// this method is called by the IDL generated _tao_marshal_state() method.
-CORBA::Boolean
-TAO_ChunkInfo::start_chunk(TAO_OutputCDR &strm)
-{
-  // If chunking, reserve the space for the chunk size of next chunk
-  // and increase the nesting level.
-  if (this->chunking_)
-    {
-      if (! reserve_chunk_size(strm))
-        return false;
-      this->value_nesting_level_ ++;
-    }
-  return true;
-}
-
-// this method is called by the IDL generated _tao_marshal_state() method.
-CORBA::Boolean
-TAO_ChunkInfo::end_chunk(TAO_OutputCDR &strm)
-{
-  if (this->chunking_)
-    {
-      // Write actual chunk size at the reserved chunk size place.
-      if (! this->write_previous_chunk_size(strm))
-        return false;
-
-      // Write an end tag which is negation of value_nesting_level_.
-      if (! strm.write_long(- this->value_nesting_level_))
-        return false;
-
-      //      -- this->value_nesting_level_;
-      if ( -- this->value_nesting_level_ == 0 )
-        {
-          // ending chunk for outermost value
-          this->chunking_ = false;
-        }
-    }
-  return true;
-}
-
-
-CORBA::Boolean
-TAO_ChunkInfo::write_previous_chunk_size(TAO_OutputCDR &strm)
-{
-  if (this->chunk_size_pos_ != 0)
-  {
-    // Calculate the chunk size.
-    CORBA::Long chunk_size = strm.total_length () - this->length_to_chunk_octets_pos_;
-
-    // This should not happen since this is called in end_chunk() and
-    // the idl generated code always have the matched start_chunk() and
-    // end_chunk() pair. There is always data written to the stream between
-    // the start_chunk() and end_chunk() calls.
-    if (chunk_size == 0)
-      return false;
-
-    // Write the actual chunk size to the reserved chunk size position
-    // in the stream.
-    if (! strm.replace (chunk_size, this->chunk_size_pos_))
-      return false;
-
-    // We finish writing the actual chunk size, now we need reset the state.
-    this->chunk_size_pos_ = 0;
-    this->length_to_chunk_octets_pos_ = 0;
-  }
-
-  return true;
-}
-
-
-CORBA::Boolean
-TAO_ChunkInfo::reserve_chunk_size(TAO_OutputCDR &strm)
-{
-  // This is called in the start_chunk().
-  // Reserve the chunk size the first time the start_chunk () is called
-  // if there are several start_chunk () called continuously without
-  // calling end_chunk (). This could happen in the _tao_marshal_state()
-  // in the most derived valuetype.
-
-  if (this->chunk_size_pos_ == 0)
-    {
-      // Align the wr_ptr before we reserve the space for chunk size.
-      strm.align_write_ptr (ACE_CDR::LONG_SIZE);
-      // Remember begin of the chunk (at chunk size position) that is needed
-      // when we write back actual chunk size to the stream.
-      this->chunk_size_pos_ = strm.current ()->wr_ptr ();
-
-      // Insert four bytes here as a place-holder, we need to go back
-      // later and write the actual size.
-      if (! strm.write_long (0))
-        return false;
-
-      // Remember length before writing chunk data. This is used to calculate
-      // the actual size of the chunk.
-      this->length_to_chunk_octets_pos_ = strm.total_length ();
-    }
-
-  return true;
-}
-
-CORBA::Boolean
-TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm)
-{
-  if (!this->chunking_)
-    return true;
-  char* the_rd_ptr = strm.start()->rd_ptr ();
-
-  //This case could happen if a handle_chunking() reads a chunk size
-  //and then calls the handle_chunking() again without reading the chunk data.
-  //The handle_chunking() called continuously without reading the chunk data
-  //only happens at the beginning of _tao_unmarshal_state() in a valuetype
-  //that has parents.
-  if (the_rd_ptr < this->chunk_octets_end_pos_)
-  {
-    this->value_nesting_level_ ++;
-    return true;
-  }
-
-  //Safty check if reading is out of range of current chunk.
-  if (this->chunk_octets_end_pos_ != 0 && the_rd_ptr > this->chunk_octets_end_pos_)
-    return false;
-
-  // Read a long value that might be an endtag, the chunk size or the value tag
-  // of the nested valuetype.
-  CORBA::Long tag;
-  if (! strm.read_long(tag))
-    return false;
-
-  if (tag < 0)
-  {
-    // tag is an end tag
-    if (-tag > this->value_nesting_level_)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-        ACE_TEXT ("%P|%t) received end tag %d > value_nesting_level %d\n"),
-        -tag, this->value_nesting_level_),
-        false);
-    }
-    this->value_nesting_level_ = - tag;
-    this->value_nesting_level_--;
-
-
-    this->chunk_octets_end_pos_ = 0;
-
-    // Continue reading so that we can read the outmost endtag. This would
-    // simplify the implementation in the derived valuetype.
-    if (this->value_nesting_level_ > 0)
-    {
-      this->handle_chunking(strm);
-    }
-  }
-  else if (tag < TAO_OBV_GIOP_Flags::Value_tag_base)
-  {
-    // Read the chunk size of another chunk.
-    this->chunk_octets_end_pos_ = strm.rd_ptr () + tag;
-    this->value_nesting_level_ ++;
-  }
-  else // (tag >= 0x7fffff00)
-  {
-    // This should not happen since the valuetag of the nested values are always
-    // unmarshalled in the ValueBase::_tao_unmarshal_pre().
-    return false;
-  }
-
-  return true;
-}
-
-
-CORBA::Boolean
-TAO_ChunkInfo::skip_chunks (TAO_InputCDR &strm)
-{
-  if (!this->chunking_)
-    return true;
-
-  // This function is called after reading data of the truncated parent and
-  // skips the remaining chunks until the outmost endtag (-1).
-  // The tag read here is suppoused to be an endtag.
-  CORBA::Long tag;
-  if (! strm.read_long(tag))
-    return false;
-
-  // end of the whole valuetype.
-  if (tag == -1)
-    return true;
-  else if (tag < 0)
-  {
-    // continue skip the chunk.
-    return this->skip_chunks (strm);
-  }
-  else if (tag < TAO_OBV_GIOP_Flags::Value_tag_base)
-  {
-    // Read the chunk size and move forward to skip the data.
-    ACE_Message_Block* current = const_cast<ACE_Message_Block*>(strm.start ());
-    current->rd_ptr (tag);
-    return this->skip_chunks (strm);
-  }
-  else
-    return false;
-}
-
-CORBA::Boolean
-CORBA::ValueBase::read_repository_ids(ACE_InputCDR& strm, Repository_Id_List& ids)
-{
-  CORBA::Long num_ids;
-  if (! strm.read_long(num_ids))
-    return false;
-
-  if (num_ids == TAO_OBV_GIOP_Flags::Indirection_tag)
-  {
-    //@@TODO: read indirection repository ids and return true.
-    return false;
-  }
-  else
-  {
-    //@@TODO: map repository id for indirection
-    for (CORBA::Long i = 0; i < num_ids; i ++)
-    {
-      ACE_CString id;
-      if (! strm.read_string(id))
-        return false;
-      ids.push_back (id);
-    }
-  }
-
-  return true;
-}
-
-
-void
-CORBA::ValueBase::truncation_hook ()
-{
-#if defined (ACE_HAS_EXCEPTIONS)
-      ACE_THROW (CORBA::INTERNAL ());
-#else
-      ACE_OS::abort ();
-#endif /* ACE_HAS_EXCEPTIONS */
-}
-
-
 // ================== Typecode initializations ==================
 
 namespace TAO
@@ -886,11 +575,11 @@ CORBA::DefaultValueRefCountBase::_tao_refcount_value (void)
 
 CORBA::Boolean
 operator<< (TAO_OutputCDR &strm,
-            CORBA::ValueBase *_tao_valuetype)
+            const CORBA::ValueBase *_tao_valuetype)
 {
   return CORBA::ValueBase::_tao_marshal (
              strm,
-             _tao_valuetype,
+             const_cast<CORBA::ValueBase *> (_tao_valuetype),
              reinterpret_cast<ptrdiff_t> (&CORBA::ValueBase::_downcast)
            );
 }
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index 1b1880cadc9..55360627f05 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -35,7 +35,6 @@
 #include "ace/Thread_Mutex.h"
 #include "ace/Atomic_Op.h"
 #include "ace/Null_Mutex.h"
-#include "ace/Vector_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -44,66 +43,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class TAO_Valuetype_Export TAO_ChunkInfo
-{
-public:
-  TAO_ChunkInfo(CORBA::Boolean do_chunking = 0, CORBA::Long init_level = 0);
-
-  /// Methods to support chunking.
-  /// Note: These methods are called for both chunking and non-chunking
-  ///       valuetype. These methods checks the chunking_ flag. If it's
-  ///       set to be false the methods return true rightaway.
-
-  /// Methods for marshalling a valuetype.
-
-  /// This is called in the _tao_marshal_state (). This method reserves
-  /// space for the chunk size of the next chunk and also increments the
-  /// nesting level. The reservasion actually occurs the first time that
-  /// the start_chunk is called if there are multiple continuous start_chunk()
-  /// calls without the close_chunk() called in between.
-  CORBA::Boolean start_chunk(TAO_OutputCDR &strm);
-
-  /// This is called in the _tao_marshal_state (). This method writes the
-  /// actual chunk size to the reserved chunk size space and writes an end
-  /// tag with the negation value of current nesting level. A start_chunk()
-  /// needs an end_chunk() to close the current chunk. It's also needed for
-  /// writing the outmost endtag to the stream.
-  CORBA::Boolean end_chunk(TAO_OutputCDR &strm);
-
-  /// Methods for unmarshalling a valuetype.
-
-  /// This is called in the _tao_unmarshal_state () to read the chunk
-  /// size or an end tag.
-  CORBA::Boolean handle_chunking (TAO_InputCDR &strm);
-  /// This is called in the _tao_unmarshal_state () to skip the rest
-  /// chunks until the outmost endtag (-1) if the value is truncated
-  /// to its truncatable parent.
-  CORBA::Boolean skip_chunks (TAO_InputCDR &strm);
-  /// This is called in end_chunk(). It writes the actual chunk size to the
-  /// reserved chunk size space.
-  CORBA::Boolean write_previous_chunk_size(TAO_OutputCDR &strm);
-  /// Reserve space for chunk size. The memory in the stream will be
-  /// overwritten after all the chunk data is written. This method
-  /// only allows the reservasion being made once if the reserved
-  /// space has not been overwritten.
-  CORBA::Boolean reserve_chunk_size(TAO_OutputCDR &strm);
-
-  /// A flag to indicate that this instance is actually involved in a chunked
-  /// or truncatable valuetype.
-  CORBA::Boolean chunking_;
-
-  /// The level of nesting valuetypes.
-  CORBA::Long value_nesting_level_;
-  /// The starting position of the size of current chunk.
-  char* chunk_size_pos_;
-  /// The length of CDR stream from the begining to the current
-  /// chunk data starting position.  Used to calculate the chunk size
-  /// across multiple chained ACE_Message_Blocks.
-  size_t length_to_chunk_octets_pos_;
-  /// The end position of current chunk.
-  char* chunk_octets_end_pos_;
-};
-
 namespace CORBA
 {
   class ValueFactoryBase;
@@ -124,12 +63,8 @@ namespace CORBA
   class TAO_Valuetype_Export ValueBase
   {
   public:
-    friend class TAO_ChunkInfo;
-
     typedef ValueBase* _ptr_type;
     typedef ValueBase_var _var_type;
-    typedef ACE_Vector < ACE_CString > Repository_Id_List;
-
 
     // reference counting
     /// %! virtual CORBA::ValueBase* _copy_value (void) = 0;
@@ -144,16 +79,7 @@ namespace CORBA
     static void _tao_any_destructor (void *);
 
     /// TAO extension
-
-    /// Return the repository id of this valuetype.
-    virtual const char * _tao_obv_repository_id (void) const = 0;
-
-    /// Give the list of the RepositoryIds in the valuetype "truncatable"
-    /// inheritance hierarchy. List the id of this valuetype as first
-    /// RepositoryID and go up the "truncatable" derivation hierarchy.
-    /// Note the truncatable repo ids only list the truncatable base types
-    /// to which this type is safe to truncate, not all its parents.
-    virtual void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const = 0;
+    virtual const char* _tao_obv_repository_id (void) const = 0;
 
     // TAO internal --------------------------
 
@@ -175,9 +101,9 @@ namespace CORBA
 
     /// Both used internally and are called from T::_tao_unmarshal ()
     static CORBA::Boolean _tao_unmarshal_pre (TAO_InputCDR &strm,
+                                              ValueFactory &,
                                               ValueBase *&,
                                               const char * const repo_id);
-
     CORBA::Boolean _tao_unmarshal_post (TAO_InputCDR &strm);
 
     /// Check repository id for value box type against what is
@@ -195,49 +121,11 @@ namespace CORBA
     /// called after obtaining the fresh object from create_for_unmarshal ()
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) = 0;
 
-    /// Notify the truncated parent valuetype to skip the rest of the chunks
-    /// when unmarshalling a value from its derived valuetype.
-    /// This is called when the factory for the most derived valuetype (in
-    /// the repository id list) does not exist and a truncated parent factory
-    /// is registered.
-    virtual void truncation_hook ();
-
   protected:
     ValueBase (void);
     ValueBase (const ValueBase&);
     virtual ~ValueBase (void);
 
-    /// This flag is set to be true when the valuetype defined
-    /// in the idl has the truncatable parent.
-    CORBA::Boolean         is_truncatable_;
-
-    /// This flag is set to be true when marshalling uses chunking.
-    /// According to spec, the truncatable valuetype should use chunking
-    /// and it can be used for marshalling large valuetype. In current
-    /// implementation, we just use chunking for the truncatable valuetype.
-    CORBA::Boolean chunking_;
-
-    /// Compare the supplied formal type identifier with our actual type.
-    /// This is used during marshaling of valuetypes to detect when it is
-    /// appropriate to not explicitly marshal the typecode for the value.
-    virtual CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const = 0;
-
-  private:
-    /// Write some special values such as null value or indirection value.
-    static CORBA::Boolean write_special_value(TAO_OutputCDR &strm, const CORBA::ValueBase * value);
-    /// Write whole value.
-    static CORBA::Boolean write_value(TAO_OutputCDR &strm,
-                                      const CORBA::ValueBase * value,
-                                      ptrdiff_t formal_type_id);
-
-    /// Write the header of the value which includes the valuetag, number of
-    /// repository ids and list of repository ids.
-    CORBA::Boolean write_value_header(TAO_OutputCDR &strm,
-                                      ptrdiff_t formal_type_id) const;
-
-    /// Read the repository ids from the CDR input stream.
-    static CORBA::Boolean read_repository_ids(ACE_InputCDR& strm, Repository_Id_List& ids);
-
   private:
     ValueBase & operator= (const ValueBase &);
 
@@ -304,28 +192,25 @@ namespace CORBA
  */
 namespace TAO_OBV_GIOP_Flags
 {
-  const CORBA::Long Value_tag_base    = 0x7fffff00L;
-  const CORBA::Long Value_tag_sigbits = 0xffffff00L;
-  const CORBA::Long Codebase_url      = 1;
-  const CORBA::Long Type_info_sigbits = 0x00000006L;
-  const CORBA::Long Type_info_none    = 0;
-  const CORBA::Long Type_info_single  = 2;
-  const CORBA::Long Type_info_list    = 6;
-  const CORBA::Long Chunking_tag_sigbits = 0x00000008L;
-  const CORBA::Long Indirection_tag   = 0x7fffffffL;
-  const CORBA::Long Null_tag          = 0x00000000L;
-
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_null_ref          (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_value_tag         (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_codebase_url     (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_no_type_info     (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_single_type_info (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_list_type_info   (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_chunked           (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_indirection_tag   (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_indirection       (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_block_size        (CORBA::Long);
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_end_tag           (CORBA::Long);
+  const CORBA::ULong Value_tag_base    = 0x7fffff00L;
+  const CORBA::ULong Value_tag_sigbits = 0xffffff00L;
+  const CORBA::ULong Codebase_url      = 1;
+  const CORBA::ULong Type_info_sigbits = 0x00000006L;
+  const CORBA::ULong Type_info_none    = 0;
+  const CORBA::ULong Type_info_single  = 2;
+  const CORBA::ULong Type_info_list    = 6;
+
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_null_ref          (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_value_tag         (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_codebase_url     (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_no_type_info     (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_single_type_info (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean has_list_type_info   (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_chunked           (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_indirection_tag   (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_indirection       (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_block_size        (CORBA::ULong);
+  TAO_NAMESPACE_INLINE_FUNCTION CORBA::Boolean is_end_tag           (CORBA::ULong);
 }
 
 TAO_Valuetype_Export CORBA::Boolean
diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl
index d51a47bab83..2d15b4a0d19 100644
--- a/TAO/tao/Valuetype/ValueBase.inl
+++ b/TAO/tao/Valuetype/ValueBase.inl
@@ -7,71 +7,69 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_null_ref (CORBA::Long tag)
+TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag)
 {
-  return (tag == Null_tag);
+  return (tag == 0);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_value_tag (CORBA::Long tag)
+TAO_OBV_GIOP_Flags::is_value_tag (CORBA::ULong tag)
 {
   return ((tag & Value_tag_sigbits) == 0x7FFFFF00L);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags:: has_codebase_url (CORBA::Long tag)
+TAO_OBV_GIOP_Flags:: has_codebase_url (CORBA::ULong tag)
 {
   return (CORBA::Boolean) (tag & Codebase_url);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_no_type_info (CORBA::Long tag)
+TAO_OBV_GIOP_Flags::has_no_type_info (CORBA::ULong tag)
 {
   return ((tag & Type_info_sigbits) == Type_info_none);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_single_type_info (CORBA::Long tag)
+TAO_OBV_GIOP_Flags::has_single_type_info (CORBA::ULong tag)
 {
   return ((tag & Type_info_sigbits) == Type_info_single);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_list_type_info (CORBA::Long tag)
+TAO_OBV_GIOP_Flags::has_list_type_info (CORBA::ULong tag)
 {
   return ((tag & Type_info_sigbits) == Type_info_list);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags:: is_chunked (CORBA::Long tag)
+TAO_OBV_GIOP_Flags:: is_chunked (CORBA::ULong tag)
 {
   return (CORBA::Boolean) (tag & 8);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection_tag (CORBA::Long tag)
+TAO_OBV_GIOP_Flags::is_indirection_tag (CORBA::ULong tag)
 {
-  return (static_cast<unsigned>(tag) == 0xFFFFFFFFL);
+  return (tag == 0xFFFFFFFFL);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection (CORBA::Long value)
+TAO_OBV_GIOP_Flags::is_indirection (CORBA::ULong value)
 {
-  return (0x80000000L < static_cast<unsigned>(value) &&
-          static_cast<unsigned>(value) <= (0xFFFFFFFFL - 4));
+  return (0x80000000L < value && value <= (0xFFFFFFFFL - 4));
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_block_size (CORBA::Long value)
+TAO_OBV_GIOP_Flags::is_block_size (CORBA::ULong value)
 {
-  return (0 < static_cast<unsigned>(value) &&
-          static_cast<unsigned>(value) < 0x7FFFFF00L);
+  return (0 < value && value < 0x7FFFFF00L);
 }
 
 ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_end_tag (CORBA::Long tag)
+TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
 {
-  return (0x80000000L < (unsigned)tag);
+  return (0x80000000L < tag);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/Value_CORBA_methods.h b/TAO/tao/Valuetype/Value_CORBA_methods.h
index dde1c2837b7..352c981ac76 100644
--- a/TAO/tao/Valuetype/Value_CORBA_methods.h
+++ b/TAO/tao/Valuetype/Value_CORBA_methods.h
@@ -32,7 +32,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-
 namespace CORBA
 {
   class ValueBase;
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 6076024c440..bc6d38cf6ab 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -331,12 +331,6 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp
   return ws;
 }
 
-TAO_Client_Strategy_Factory::Connect_Strategy
-TAO_Default_Client_Strategy_Factory::connect_strategy (void) const
-{
-  return this->connect_strategy_;
-}
-
 TAO_Connect_Strategy *
 TAO_Default_Client_Strategy_Factory::create_connect_strategy (TAO_ORB_Core *orb_core)
 {
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index e1660fb2041..db6544d166d 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -62,7 +62,6 @@ public:
   virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *);
   virtual ACE_Lock *create_ft_service_retention_id_lock (void);
   virtual bool use_cleanup_options (void) const;
-  virtual Connect_Strategy connect_strategy (void) const;
 
 protected:
   void report_option_value_error (const ACE_TCHAR* option_name,
@@ -98,6 +97,13 @@ private:
   /// The wait-for-reply strategy.
   Wait_Strategy wait_strategy_;
 
+  enum Connect_Strategy
+  {
+    TAO_BLOCKED_CONNECT,
+    TAO_REACTIVE_CONNECT,
+    TAO_LEADER_FOLLOWER_CONNECT
+  };
+
   /// The connection initiation strategy.
   Connect_Strategy connect_strategy_;
 
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index b52665b7023..59447bdb234 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -167,7 +167,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,
@@ -321,7 +321,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]));
           }
       }
 
@@ -635,7 +635,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;
 
@@ -678,7 +678,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);
         }
@@ -687,7 +687,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 ())));
         }
     }
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index b6e8ed7613b..61cf7bfb65b 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -735,9 +735,7 @@ enum TAO_Cached_Policy_Type
 
   TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP,
 
-  TAO_CACHED_POLICY_MAX_CACHED,
-
-  TAO_CACHED_POLICY_ENDPOINT
+  TAO_CACHED_POLICY_MAX_CACHED
 };
 
 // This enum provides a mask that represent the scope at which a given
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 0632cf5abc5..a06608bedb2 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -14,6 +14,7 @@ ACE_RCSID (tao,
            params,
            "$Id$")
 
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ORB_Parameters::TAO_ORB_Parameters (void)
@@ -24,7 +25,6 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
   , sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ)
   , nodelay_ (1)
   , sock_keepalive_ (0)
-  , sock_dontroute_ (0)
   , cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF)
   , max_message_size_ (0) // Disable outgoing GIOP fragments by default
   , use_lite_protocol_ (0)
@@ -36,9 +36,7 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
   , sched_policy_ (THR_SCHED_DEFAULT)
   , scope_policy_ (THR_SCOPE_PROCESS)
   , single_read_optimization_ (1)
-  , shared_profile_ (1)
-  , use_parallel_connects_ (false)
-  , parallel_connect_delay_ (0)
+  , shared_profile_ (0)
   , pref_network_ ()
   , disable_rt_collocation_resolver_ (false)
   , enforce_preferred_interfaces_ (false)
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index efefb62845f..c65f9177e91 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -89,10 +89,6 @@ public:
   int sock_keepalive (void);
   void sock_keepalive (int);
 
-  /// Set/Get whether we should set SO_DONTROUTE on the socket or not.
-  int sock_dontroute (void);
-  void sock_dontroute (int);
-
   /**
    * Octet sequences are marshalled without doing any copies, we
    * simply append a block to the CDR message block chain. When the
@@ -179,16 +175,6 @@ public:
   int shared_profile (void) const;
   void shared_profile (int x);
 
-  /// Want to use parallel connection attempts when profiles have multiple
-  /// endpoints.
-  bool  use_parallel_connects(void) const;
-  void use_parallel_connects (bool x);
-
-  /// The milliseconds delay used to stagger individual connection starts
-  /// when using parallel connects.
-  unsigned long parallel_connect_delay (void) const;
-  void parallel_connect_delay (unsigned long x);
-
   /// Mutators and accessors for rt_collocation_resolver
   bool disable_rt_collocation_resolver (void) const;
   void disable_rt_collocation_resolver (bool);
@@ -254,12 +240,9 @@ private:
   /// 1 if we're using TCP_NODELAY and 0 otherwise.
   int nodelay_;
 
-  /// 1 if we're using SO_KEEPALIVE and 0 otherwise (default 0).
+  /// 1 if we're using SO_KEEPALIV and 0 otherwise (default 0).
   int sock_keepalive_;
 
-  /// 1 if we're using SO_DONTROUTE and 0 otherwise (default 0).
-  int sock_dontroute_;
-
   /// Control the strategy for copying vs. appeding octet sequences in
   /// CDR streams.
   int cdr_memcpy_tradeoff_;
@@ -321,16 +304,6 @@ private:
   /// Shared Profile - Use the same profile for multiple endpoints
   int shared_profile_;
 
-  /// Use Parallel Connects - Try to connect to all endpoints in a
-  /// shared profile at once, use the first to complete.
-  int use_parallel_connects_;
-
-  /// When using parallel connects, this delay is used to stagger connection
-  /// attempts. This gives a trade-off between opening more potential
-  /// connections than necessary vs increasing the potential time before
-  /// a good connection is discovered. Time is expressed in milliseconds.
-  unsigned long parallel_connect_delay_;
-
   /// Preferred network interfaces as a string
   ACE_CString pref_network_;
 
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 04e3f7575ec..d900d18a967 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -163,18 +163,6 @@ TAO_ORB_Parameters::sock_keepalive (int x)
 }
 
 ACE_INLINE int
-TAO_ORB_Parameters::sock_dontroute (void)
-{
-  return this->sock_dontroute_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::sock_dontroute (int x)
-{
-  this->sock_dontroute_ = x;
-}
-
-ACE_INLINE int
 TAO_ORB_Parameters::ace_sched_policy (void) const
 {
   return this->ace_sched_policy_;
@@ -230,30 +218,6 @@ TAO_ORB_Parameters::single_read_optimization (int x)
   this->single_read_optimization_ = x;
 }
 
-ACE_INLINE bool
-TAO_ORB_Parameters::use_parallel_connects (void) const
-{
-  return this->use_parallel_connects_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::use_parallel_connects (bool x)
-{
-  this->use_parallel_connects_ = x;
-}
-
-ACE_INLINE unsigned long
-TAO_ORB_Parameters::parallel_connect_delay (void) const
-{
-  return this->parallel_connect_delay_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::parallel_connect_delay (unsigned long x)
-{
-  this->parallel_connect_delay_ = x;
-}
-
 ACE_INLINE int
 TAO_ORB_Parameters::shared_profile (void) const
 {
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index c514e95d123..8d9939c6a09 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -113,7 +113,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     LF_Follower_Auto_Adder.cpp
     LF_Follower_Auto_Ptr.cpp
     LF_Invocation_Event.cpp
-    LF_Multi_Event.cpp
     LF_Strategy.cpp
     LF_Strategy_Complete.cpp
     LocalObject.cpp
@@ -236,7 +235,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
   }
 
   Header_Files {
-    Array_Traits_T.h
     Abstract_Servant_Base.h
     Acceptor_Filter.h
     Acceptor_Impl.h
@@ -264,16 +262,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Block_Flushing_Strategy.h
     BooleanSeqC.h
     BooleanSeqS.h
-    Bounded_Array_Allocation_Traits.h
-    Bounded_Array_Sequence_T.h
-    Bounded_Basic_String_Sequence_T.h
-    Bounded_Object_Reference_Sequence_T.h
-    Bounded_Reference_Allocation_Traits.h
-    Bounded_Sequence_CDR_T.h
-    Bounded_String_Sequence_T.h
-    Bounded_Value_Allocation_Traits_T.h
-    Bounded_Value_Sequence_T.h
-    Bounded_Wstring_Sequence_T.h
     Buffer_Allocator_T.h
     Buffering_Constraint_Policy.h
     Cache_Entries.h
@@ -338,7 +326,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     FloatSeqC.h
     FloatSeqS.h
     Flushing_Strategy.h
-    Generic_Sequence_T.h
     GIOPC.h
     GIOP_Message_Base.h
     GIOP_Message_Generator_Parser_10.h
@@ -415,10 +402,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Object_Proxy_Broker.h
     Object_Ref_Table.h
     Object_T.h
-    Object_Reference_Sequence_Element_T.h
     Objref_VarOut_T.h
-    Object_Reference_Traits_Base_T.h
-    Object_Reference_Traits_T.h
     OctetSeqC.h
     OctetSeqS.h
     operation_details.h
@@ -460,7 +444,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Protocols_Hooks.h
     Pseudo_VarOut_T.h
     Queued_Message.h
-    Range_Checking_T.h
     Reactive_Connect_Strategy.h
     Reactive_Flushing_Strategy.h
     Refcounted_ObjectKey.h
@@ -472,7 +455,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Resume_Handle.h
     Seq_Out_T.h
     Seq_Var_T.h
-    Sequence_T.h
     Server_Strategy_Factory.h
     Service_Callbacks.h
     Service_Context.h
@@ -486,10 +468,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     StringSeqC.h
     StringSeqS.h
     String_Alloc.h
-    String_Manager_T.h
-    String_Sequence_Element_T.h
-    String_Traits_Base_T.h
-    String_Traits_T.h
     Stub_Factory.h
     Stub.h
     Synch_Invocation.h
@@ -530,22 +508,9 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ULongLongSeqS.h
     ULongSeqC.h
     ULongSeqS.h
-    Unbounded_Array_Allocation_Traits_T.h
-    Unbounded_Array_Sequence_T.h
-    Unbounded_Basic_String_Sequence_T.h
-    Unbounded_Object_Reference_Sequence_T.h
-    Unbounded_Octet_Sequence_T.h
-    Unbounded_Octet_Sequence_T.h
-    Unbounded_Reference_Allocation_Traits_T.h
-    Unbounded_Sequence_CDR_T.h
-    Unbounded_String_Sequence_T.h
-    Unbounded_Value_Allocation_Traits_T.h
-    Unbounded_Value_Sequence_T.h
-    Unbounded_Wstring_Sequence_T.h
     UserException.h
     UShortSeqC.h
     UShortSeqS.h
-    Value_Traits_T.h
     Valuetype_Adapter.h
     Valuetype_Adapter_Factory.h
     Var_Array_Argument_T.h
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/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/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/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_test.idl b/TAO/tests/AMI/ami_test.idl
index ffdc66d63d5..82256ab3c10 100644
--- a/TAO/tests/AMI/ami_test.idl
+++ b/TAO/tests/AMI/ami_test.idl
@@ -15,7 +15,7 @@
 
 
 
-module A
+module A 
   {
     exception DidTheRightThing {
       long id;
@@ -24,15 +24,15 @@ module A
 
     interface AMI_Test
       {
-        long foo (out long out_l,
+        long foo (out long out_l, 
                   in long in_l,
                   in string in_str)
           raises (DidTheRightThing);
-
+  
         attribute long yadda;
-
+        
         oneway void shutdown ();
-
+        
         void inout_arg_test (inout string str);
       };
 
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index dfebe21b163..4440087c003 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)
@@ -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/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..8ef9d036c8e 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)
@@ -166,15 +168,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 +195,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/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/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/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index 6bb78f5ed62..8cdcb55c56b 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)
@@ -411,15 +413,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/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/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_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/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 184e7ebda37..a0ca3000ed9 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 =
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/client.cpp b/TAO/tests/Big_AMI/client.cpp
index 23391b5b797..1c27642a634 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)
@@ -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/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/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/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..8a9c4f89ea9 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",
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/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/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/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/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/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/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/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/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_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/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_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/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_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/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_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/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_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index 9687e3ec488..2e2ec401a29 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -33,8 +33,6 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-void get_stringList2(Test::Hello_var hello);
-
 int
 main (int argc, char *argv[])
 {
@@ -65,7 +63,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList\n"));
 
-      Test::StringList_var seq =
+	  Test::StringList_var seq =
         hello->get_stringList (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -73,7 +71,7 @@ main (int argc, char *argv[])
         CORBA::String_var the_string = CORBA::string_dup ((*seq)[i]);
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
-      }
+	  }
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList2 with initialization\n"));
 
@@ -85,11 +83,18 @@ main (int argc, char *argv[])
         CORBA::String_var the_string = seq2.in()[i];
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
-      }
+	  }
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList2 without initialization\n"));
 
-      get_stringList2(hello);
+      hello->get_stringList2(false, seq2.out());
+      ACE_TRY_CHECK;
+
+      for (CORBA::ULong i = 0; i<seq2->length(); i++) {
+        CORBA::String_var the_string = seq2.in()[i];
+        ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+                  the_string.in ()));
+	  }
 
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - mod_stringList\n"));
 
@@ -118,34 +123,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
-void get_stringList2(Test::Hello_var hello)
-{
-    Test::StringList_var seq2;
-
-  ACE_TRY_NEW_ENV
-    {
-      // Shutdown the ORB and block until the shutdown is complete.
-      hello->get_stringList2(false, seq2.out());
-      ACE_TRY_CHECK;
-
-      for (CORBA::ULong i = 0; i<seq2->length(); i++) {
-        CORBA::String_var the_string = seq2.in()[i];
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
-                  the_string.in ()));
-	  }
-    }
-  ACE_CATCH(CORBA::BAD_PARAM, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - catched expected exception BAD_PARAM\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "get_stringList2");
-    }
-  ACE_ENDTRY;
-
-
-    return;
-}
diff --git a/TAO/tests/Bug_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_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_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/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/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/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/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_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/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp
index 52180b29d5a..6540444e194 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") );
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/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..bf7965fff35 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -24,6 +24,7 @@
 #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/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/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/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/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/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index edf6a3ab091..5042f8ce86f 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)
@@ -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
@@ -118,8 +121,9 @@ 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));
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index d8a23526773..c2a5b4409f1 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
@@ -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/client.cpp b/TAO/tests/Codec/client.cpp
index a5d874386e6..cd11d6f6d01 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -4,6 +4,7 @@
 #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,8 +65,8 @@ 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;
@@ -182,15 +183,19 @@ test_codec (IOP::Codec_ptr codec)
 }
 
 int
-main (int argc, char *argv[])
+//main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int retval = 0;
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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/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_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_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_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/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/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/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/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..1f5668c42ff 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",
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/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/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/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 ce68f01c925..afd281c6225 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 (static_cast<const char *>((*ts_out)[0U]), 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/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/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/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/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/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/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/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index 066461f895a..fa225b32d6a 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -5,6 +5,7 @@
 #include "ace/OS.h"
 #include "ace/Task.h"
 #include "ace/Profile_Timer.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
@@ -12,29 +13,29 @@ namespace Test
 {
   const char *ior = "file://server.ior";
 
-  ACE_Profile_Timer profile_timer;
-  bool blocked = false;
+    ACE_Profile_Timer profile_timer;
+    bool blocked = false;
 
-  bool
-  parse_args (int argc, char *argv[])
-  {
-    ACE_Get_Opt get_opts (argc, argv, "b:k:");
-    int c;
+    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)
-        {
-        case 'b':
+      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;
-          }
-          break;
+              if (tmp)
+                blocked = true;
+              else
+                blocked = false;
+            }
+            break;
         case 'k':
           {
             ior = get_opts.opt_arg ();
@@ -261,7 +262,9 @@ namespace Test
 }
 
 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 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..3861c135ba1 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/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"
 
 namespace Test
 {
@@ -39,8 +40,7 @@ namespace Test
                             1);
 
         PortableServer::POAManager_var poa_manager =
-          root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->the_POAManager ();
 
         test_i *test_impl;
         ACE_NEW_RETURN (test_impl,
@@ -49,8 +49,7 @@ namespace Test
         PortableServer::ServantBase_var owner_transfer (test_impl);
 
         Hang_var test =
-          test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          test_impl->_this ();
 
         CORBA::String_var ior =
           orb->object_to_string (test.in ()
@@ -58,7 +57,7 @@ namespace Test
         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",
@@ -98,7 +97,9 @@ namespace Test
 }
 
 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 Test::try_main (convert.get_argc(), convert.get_ASCII_argv());
 }
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/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/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/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/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/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 374ab158593..d22fb76e4a1 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/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/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_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/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/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/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/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/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/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/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..a584d9dc134 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",
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/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/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/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/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/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..588d3ba157f 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -30,6 +30,7 @@
 #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;
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/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/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/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/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/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/client.cpp b/TAO/tests/OBV/Any/client.cpp
index 9f03f474b9e..35e8b528ad6 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.
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/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/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 2b6a232470a..6e512583d7d 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)
@@ -68,15 +69,17 @@ no_factory (OBV_FactoryTest::Test_ptr test)
 }
 
 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;
 
       // Obtain reference to the object
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/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index b61d1544147..6bc42eb9311 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
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/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp
deleted file mode 100644
index c3548daf462..00000000000
--- a/TAO/tests/OBV/Simple/Client_i.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//$Id$
-
-#include "Client_i.h"
-#include "OBV_impl.h"
-
-#include "tao/ORB_Core.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_sys_time.h"
-
-int
-Checkpoint_Client_i::run (const char *name,
-                          int argc,
-                          char *argv[])
-{
-  // Initialize the client (read ior...).
-  if (checkpoint.init (name,argc, argv) == -1)
-    return -1;
-
-  // Set random seed
-  ACE_Time_Value now (ACE_OS::gettimeofday ());
-  ACE_OS::srand ((unsigned int) now.sec () );
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      ACE_DEBUG ((LM_DEBUG, "Send some random events:\n"));
-
-      CORBA::Long value = 64;
-      Event_var t_e (static_cast<Event*> (new Event_impl (value)));
-      t_e->do_print ();
-      checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      value = 34;
-      t_e = new Event_impl (value);
-      t_e->do_print ();
-      checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (checkpoint.shutdown () == 1)
-        checkpoint->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-// Constructor.
-Checkpoint_Client_i::Checkpoint_Client_i (void)
-{
-  //no-op
-}
-
-//Destructor.
-Checkpoint_Client_i::~Checkpoint_Client_i (void)
-{
-  //no-op
-}
-
diff --git a/TAO/tests/OBV/Simple/Client_i.h b/TAO/tests/OBV/Simple/Client_i.h
deleted file mode 100644
index 5c705839530..00000000000
--- a/TAO/tests/OBV/Simple/Client_i.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/OBV/Typed_Events
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    This class is a template for a CORBA client.
-//    run () sends some valuetypes to a server and
-//    gets back a list of valuetypes.
-//
-// = AUTHOR
-//
-//   Torsten Kuepper
-//   based on the echo example
-//   from code from Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ECHO_CLIENT_I_H
-#define ECHO_CLIENT_I_H
-
-#include "OBVC.h"
-#include "Simple_util.h"
-
-class Checkpoint_Client_i
-{
-  // = TITLE
-  //   Checkpoint_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
-public:
-  // = Initialization and termination methods.
-  Checkpoint_Client_i (void);
-  // Constructor
-
-  virtual  ~Checkpoint_Client_i (void);
-  // Destructor
-
-  virtual int run (const char *,int, char** );
-  // Execute the methods
-
-private:
-  Client<Checkpoint, Checkpoint_var> checkpoint;
-  // Instantiate the checkpoint object.
-};
-
-
-#endif /* TIME_CLIENT_I_H */
diff --git a/TAO/tests/OBV/Simple/OBV.idl b/TAO/tests/OBV/Simple/OBV.idl
deleted file mode 100644
index f909dc25975..00000000000
--- a/TAO/tests/OBV/Simple/OBV.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-valuetype Event
-{
-  void do_print ();
-  public long value_;
-};
-
-interface Checkpoint
-{
-  void  put_event (in Event e);
-  // This operation will shutdown the server.
-  oneway void shutdown ();
-};
-
-
diff --git a/TAO/tests/OBV/Simple/OBV_Simple.mpc b/TAO/tests/OBV/Simple/OBV_Simple.mpc
deleted file mode 100644
index 0e4105cb9e1..00000000000
--- a/TAO/tests/OBV/Simple/OBV_Simple.mpc
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*IDL): taoidldefaults {
-  IDL_Files {
-    OBV.idl
-  }
-  custom_only = 1
-}
-
-project(*server): taoserver, utils, valuetype, minimum_corba {
-  exename = server
-  after += *IDL
-  Source_Files {
-    Server_i.cpp
-    OBV_impl.cpp
-    server.cpp
-    OBVS.cpp
-    OBVC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*client): taoserver, utils, valuetype, minimum_corba {
-  exename = client
-  after += *IDL
-  Source_Files {
-    Client_i.cpp
-    OBV_impl.cpp
-    client.cpp
-    OBVS.cpp
-    OBVC.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp
deleted file mode 100644
index f55cee0af44..00000000000
--- a/TAO/tests/OBV/Simple/OBV_impl.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-#include "OBV_impl.h"
-#include "ace/OS_NS_sys_time.h"
-
-// Implementation of the valuetype member functions.
-
-Event_impl::Event_impl ()
-{
-}
-
-Event_impl::Event_impl (CORBA::Long value)
-{
-  this->value_ (value);
-}
-
-Event_impl::~Event_impl ()
-{
-}
-
-CORBA::ValueBase*
-Event_impl::_copy_value (void)
-{
-  return new Event_impl (this->value_ ());
-}
-
-
-void
-Event_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  ACE_DEBUG((LM_DEBUG, "(value %d)  \n",
-             (CORBA::ULong) this->value_()));
-}
-
-Event_factory::~Event_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Event)
-Event_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return new Event_impl;
-}
-
diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h
deleted file mode 100644
index 1b619553402..00000000000
--- a/TAO/tests/OBV/Simple/OBV_impl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#if !defined (OBV_IMPL_H)
-#define OBV_IMPL_H
-
-#include "OBVC.h"
-
-#include "tao/Valuetype/ValueFactory.h"
-
-class Event_impl : public virtual OBV_Event,
-                   public virtual CORBA::DefaultValueRefCountBase
-{
- public:
-  Event_impl ();
-  Event_impl (CORBA::Long value);
-  virtual ~Event_impl ();
-  virtual CORBA::ValueBase* _copy_value (void);
-
-
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
-};
-
-class Event_factory : public CORBA::ValueFactoryBase
-{
-public:
-
-  // create (...) would go here
-
-protected:
-
-  virtual ~Event_factory ();
-
-private:
-
-  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-};
-
-#endif /* OBV_IMPL_H */
diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp
deleted file mode 100644
index a429ce1bc3a..00000000000
--- a/TAO/tests/OBV/Simple/Server_i.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// $Id$
-
-#include "Server_i.h"
-#include "OBV_impl.h"
-#include "tao/ORB_Core.h"
-
-// Set the ORB pointer, register OBV factories and init the
-// lists declared above.
-
-void
-Checkpoint_i::orb (CORBA::ORB_ptr o)
-{
-  this->orb_ = CORBA::ORB::_duplicate (o);
-
-  TAO_OBV_REGISTER_FACTORY (Event_factory, Event);
-}
-
-
-// Sidebar on assignment from pointer to _var type.
-//
-//   Event_var e_var (event);
-// This is fatal because the reference counter in *event is not increased
-// when a pointer is assigned to a _var. (This happens only
-// in assignments from another Event_var;
-// But Assignment from new is fine, the referencecount is yet one.)
-//
-// ok is
-//   CORBA::add_ref (event);
-//   Event_var e_var (event);
-//
-// but possibly easier to read it a macro
-#define DUP_REF(vt_ptr) (CORBA::add_ref (vt_ptr), vt_ptr)
-//   then it reads: Event_var e_var (DUP_REF (event));
-// (But it may cause desaster if vt_ptr is a function call.)
-//
-// Be careful with assignments from T1_var to T2_var, if T1 and T2 are
-// related through inheritance. Because there are many implicit casts
-// between pointer and _var types possible, the reference counter of
-// the duplicated reference is not increased.
-//
-// Is there any general solution with faulty reference counting ?
-
-
-void
-Checkpoint_i::put_event (Event *event
-                        ACE_ENV_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Let us see what event has arrived
-  event->do_print ();
-
-  return;
-}
-
-// Shutdown the server application.
-
-void
-Checkpoint_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\n%s\n",
-              "The Checkpoint server is shutting down"));
-
-  // Instruct the ORB to shutdown.
-  this->orb_->shutdown ();
-}
-
-
-// Constructor.
-
-Checkpoint_i::Checkpoint_i (void)
-{
-}
-
-// Destructor.
-
-Checkpoint_i::~Checkpoint_i (void)
-{
-}
diff --git a/TAO/tests/OBV/Simple/Server_i.h b/TAO/tests/OBV/Simple/Server_i.h
deleted file mode 100644
index c1a026c25e2..00000000000
--- a/TAO/tests/OBV/Simple/Server_i.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/OBV/Typed_Events
-//
-// = FILENAME
-//    Server_i.h
-//
-// = DESCRIPTION
-//    This class implements the Event_Types IDL interface.
-//
-// = AUTHOR
-//    Torsten Kuepper
-//    derived from the Echo example TAO/example/Simple/echo
-//    of Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ECHO_I_H
-#define ECHO_I_H
-
-#include "OBVS.h"
-
-
-class Checkpoint_i : public POA_Checkpoint
-{
-public:
-  // = Initialization and termination methods.
-  Checkpoint_i (void);
-  // Constructor.
-
-  ~Checkpoint_i (void);
-  // Destructor.
-
-  virtual void put_event (
-        Event * e
-        ACE_ENV_ARG_DECL
-  )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
-
-  void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
-
-private:
-  CORBA::ORB_var orb_;
-  // ORB pointer.
-};
-
-#endif /* ECHO_I_H */
-
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
deleted file mode 100644
index 979bc54cc79..00000000000
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-// $Id$
-
-// This version of Simple_Util doesn't need to link against orbsvcs
-// On the other hand it has no naming service.
-
-#ifndef SIMPLE_UTIL_C
-#define SIMPLE_UTIL_C
-# include "Simple_util.h"
-# include "tao/debug.h"
-# include "ace/OS_NS_stdio.h"
-# include "ace/OS_NS_fcntl.h"
-# include "ace/OS_NS_unistd.h"
-# include "ace/OS_NS_string.h"
-
-// Constructor.
-
-template <class Servant>
-Server<Servant>::Server (void)
-    : ior_output_file_ (0)
-{
-  // no-op.
-}
-
-// Destructor.
-
-template <class Servant>
-Server<Servant>::~Server (void)
-{
-}
-
-// Parse the command-line arguments and set options.
-
-template <class Servant> int
-Server<Servant>::parse_args (void)
-{
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:");
-  int c = 0;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
-        if (this->ior_output_file_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.opt_arg ()), -1);
-        break;
-
-      case '?':  // display help for use of the server.
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-o] <ior_output_file>"
-                           "\n",
-                           argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Initialize the server.
-template <class Servant> int
-Server<Servant>::init (const char *servant_name,
-                       int argc,
-                       char *argv[]
-                       ACE_ENV_ARG_DECL)
-{
-  // Call the init of <TAO_ORB_Manager> to initialize the ORB and
-  // create a child POA under the root POA.
-  if (this->orb_manager_.init_child_poa (argc,
-                                         argv,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init_child_poa"),
-                      -1);
-
-  ACE_CHECK_RETURN (-1);
-
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  int retval = this->parse_args ();
-
-  if (retval != 0)
-    return retval;
-
-  CORBA::ORB_var orb = this->orb_manager_.orb ();
-
-  // Stash our ORB pointer for later reference.
-  this->servant_.orb (orb.in ());
-
-  // Activate the servant in its own child POA.
-
-  // Make sure that you check for failures here via the ACE_TRY
-  // macros?!
-  ACE_TRY
-    {
-      CORBA::String_var str  =
-        this->orb_manager_.activate_under_child_poa (servant_name,
-                                                     &this->servant_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The IOR is: <%s>\n",
-                  str.in ()));
-
-      if (this->ior_output_file_)
-        {
-          ACE_OS::fprintf (this->ior_output_file_,
-                           "%s",
-                           str.in ());
-          ACE_OS::fclose (this->ior_output_file_);
-        }
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in activation of POA");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template <class Servant>int
-Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
-{
-    // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Server_i::run"),
-                      -1);
-
-  return 0;
-}
-
-template <class Servant> int
-Server<Servant>::register_name (void)
-{
-  return -1;
-}
-
-// Constructor.
-
-template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::Client (void)
-  : ior_ (0)
-{
-  //no-op
-}
-
-// Reads the Server ior from a file
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::read_ior (char *filename)
-{
-  // Open the file for reading.
-  ACE_HANDLE f_handle = ACE_OS::open (filename, 0);
-
-  if (f_handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for writing: %p\n",
-                       filename),
-                      -1);
-
-  ACE_Read_Buffer ior_buffer (f_handle);
-  char *data = ior_buffer.read ();
-
-  if (data == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to read ior: %p\n"),
-                      -1);
-
-  this->ior_ = ACE_OS::strdup (data);
-  ior_buffer.alloc ()->free (data);
-
-  ACE_OS::close (f_handle);
-
-  return 0;
-}
-
-// Parses the command line arguments and returns an error status.
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x");
-  int c = 0;
-  int result = 0;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'k':  // ior provide on command line
-        this->ior_ = ACE_OS::strdup (get_opts.opt_arg ());
-        break;
-      case 'f': // read the IOR from the file.
-        result = this->read_ior (get_opts.opt_arg ());
-        if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read ior from %s : %p\n",
-                             get_opts.opt_arg ()),
-                            -1);
-        break;
-      case 'x': // read the flag for shutting down
-        this->shutdown_ = 1;
-        break;
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::~Client (void)
-{
-  ACE_OS::free (this->ior_);
-}
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::init (const char *name,
-                                 int argc,
-                                 char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    name
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-
-
-
-      if(this->ior_ != 0)
-        {
-          CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-
-          if (CORBA::is_nil (server_object.in ()))
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "invalid ior <%s>\n",
-                               this->ior_),
-                              -1);
-          this->server_ = InterfaceObj::_narrow (server_object.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "no ior or naming options  specified\n"),
-                          -1);
-
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-
-  return 0;
-}
-
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-
-  return 0;
-}
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::shutdown (void )
-{
-  // Returns the shutdwon flag
-  return shutdown_;
-}
-
-template <class InterfaceObj, class Var> void
-Client<InterfaceObj, Var>::shutdown (int flag)
-{
-  // Fills the flag
-  shutdown_ = flag;
-}
-
-#endif
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
deleted file mode 100644
index 380dc749dc6..00000000000
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ /dev/null
@@ -1,170 +0,0 @@
-//$Id$
-
-// This version of Simple_Util doesn't need to link against orbsvcs
-// On the other hand it has no naming service.
-
-// ============================================================================
-//
-// = LIBRARY
-//
-//    taken from TAO/tests/Simple
-//
-// = FILENAME
-//    Simple_Util.h
-//
-// = DESCRIPTION
-//    The classe define the templates for the client and server.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UTIL_H
-#define TAO_UTIL_H
-
-#include "tao/Utils/ORB_Manager.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-template <class Servant>
-class Server
-{
-  // = TITLE
-  //   A set of useful class Templates for using the TAO CORBA
-  //   implementation.
-  //
-  // = DESCRIPTION
-  //   A template server definition. This template can be used by
-  //   single server/client projects for defintion of their
-  //   server/clients.  See the directories time, bank, echo for
-  //   further details of implemenatation.
-public:
-  // = Initialization and termination methods.
-
-  Server (void);
-  // Constructor.
-
-  ~Server (void);
-  // Destructor.
-
-  int init (const char *servant_name,
-            int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
-  // Initialize the Server state - parsing arguments and waiting.
-  // interface_name is the name used to register the Servant.
-
-  int register_name (void);
-  // After calling <init>, this method will register the server with
-  // the TAO Naming Service using the servant_name passed to <init>.
-
-  int run (ACE_ENV_SINGLE_ARG_DECL);
-  // Run the orb.
-
-protected:
-  Servant servant_;
-  // Servant class
-
-  const char *name;
-  // name of the servant to be used for TAO Naming Service
-
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager - a helper class for accessing the POA and
-  // registering objects.
-
-  // TAO_Naming_Server namingServer;
-  // helper class for getting access to Naming Service.
-
-  FILE *ior_output_file_;
-  // File where the IOR of the server object is stored.
-
-  int argc_;
-  // Number of command line arguments.
-
-  char **argv_;
-  // The command line arguments.
-};
-
-template <class InterfaceObj, class Var>
-class Client
-{
-  // = TITLE
-  //   Template Client class
-  //
-  // = DESCRIPTION
-  //   A template client implementation for a single server/client
-  //   model. The example usage of these usage can be found in the
-  //   sub-directories below
-public:
-
-  // = Initialization and termination methods.
-  Client (void);
-  // Constructor.
-
-  ~Client (void);
-  // Destructor.
-
-  int init (const char *name,int argc, char *argv[]);
-  // Initialize the client communication endpoint with server.
-
-  InterfaceObj *operator-> () { return server_.in ();};
-  // Return the interface object pointer.
-
-  int shutdown (void );
-  // Returns the shutdown flag.
-
-  void shutdown (int);
-  // Fills in the shutdwon flag.
-
-  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL);
-  // Initialize naming service
-
-protected:
-  int read_ior (char *filename);
-  // Function to read the server IOR from a file.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-//  TAO_Naming_Client namingClient;
-  // helper class for getting access to Naming Service.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  char *ior_;
-  // IOR of the obj ref of the server.
-
-  char *name_;
-  // Name to be usred for the naming service
-
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
-  Var server_;
-  // Server object
-
-  int naming_;
-  // Flag to use the naming service
-
-  int shutdown_;
-  // Flag for shutting down the server
-
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Simple_util.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Simple_util.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_UTIL_H */
diff --git a/TAO/tests/OBV/Simple/client.cpp b/TAO/tests/OBV/Simple/client.cpp
deleted file mode 100644
index d4e502a26bd..00000000000
--- a/TAO/tests/OBV/Simple/client.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//$Id$
-
-# include "Client_i.h"
-
-// The client program for the application.
-
-int
-main (int argc, char **argv)
-{
-  Checkpoint_Client_i client;
-
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\nEvent_Types client\n\n"));
-
-  if (client.run ("Event_Types_Checkpoint",
-                  argc,
-                  argv) == -1)
-    return -1;
-  else
-    return 0;
-
-}
diff --git a/TAO/tests/OBV/Simple/run_test.pl b/TAO/tests/OBV/Simple/run_test.pl
deleted file mode 100755
index 3a125c5703c..00000000000
--- a/TAO/tests/OBV/Simple/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;
-
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("obv.ior");
-
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-f $iorfile");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: timed out waiting for file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: the client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->TerminateWaitKill (5); 
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/OBV/Simple/server.cpp b/TAO/tests/OBV/Simple/server.cpp
deleted file mode 100644
index c5f5140f307..00000000000
--- a/TAO/tests/OBV/Simple/server.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-#include "Simple_util.h"
-#include "Server_i.h"
-
-// This is the main driver program for the time and date server.
-
-int
-main (int argc, char *argv[])
-{
-  Server<Checkpoint_i> server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\tCheckpoint Event_Types server\n\n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      if (server.init ("Event_Types_Checkpoint",
-                       argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
-        return 1;
-      else
-        {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
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/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/Truncatable/OBV_Truncatable.mpc b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
deleted file mode 100644
index 629bd43296d..00000000000
--- a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoexe, portableserver, valuetype {
-  Source_Files {
-    TruncatableS_impl.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoexe, valuetype {
-  after += *Server
-  Source_Files {
-    TruncatableC.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/OBV/Truncatable/README b/TAO/tests/OBV/Truncatable/README
deleted file mode 100644
index 74473f9019e..00000000000
--- a/TAO/tests/OBV/Truncatable/README
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
-
-@page OBV/Any Test README File
-
-        This test shows and verifies truncatable inheritence functionality.
-
-	To run the test either use the run_test.pl script:
-
-$ ./run_test.pl
-
-        or start the client and the server manually:
-
-$ server -o ior&
-$ client -k file://ior
-
-To get a detailed test report, run the server manually and then run the client as:
-$ client -v -k file://ior
-
-
-*/
diff --git a/TAO/tests/OBV/Truncatable/Truncatable.idl b/TAO/tests/OBV/Truncatable/Truncatable.idl
deleted file mode 100644
index 46c894f4619..00000000000
--- a/TAO/tests/OBV/Truncatable/Truncatable.idl
+++ /dev/null
@@ -1,100 +0,0 @@
-// $Id$
-
-//
-// This file contains few valuetypes to show and test truncatable feature of
-// valuetype.
-//
-
-module OBV_TruncatableTest
-{
-  //
-  // Base valuetype.
-  //
-  valuetype BaseValue
-  {
-    public unsigned long basic_data;
-  };
-  
-  //
-  // Valuetype with one-level truncatable inheritence.
-  //
-  valuetype TValue1 : truncatable BaseValue
-  {
-    public unsigned long data1;
-  };
-
-  //
-  // Valuetype with multi-level truncatable inheritence.
-  //
-  valuetype TValue2 : truncatable TValue1
-  {
-    public unsigned long data2;
-  };
-
-  //
-  // Valuetype with multi-level inheritence, but not all truncatable. 
-  //
-  valuetype TValue3 : TValue1
-  {
-    public unsigned long data3;
-  };
-
-  //
-  // An valuetype nested in a valuetype.
-  // 
-  valuetype NestedValue
-  {
-    public long data;
-  };
-
-  //
-  // Truncatable valuetype with nested valuetype.
-  //
-  valuetype TValue4 : truncatable BaseValue
-  {
-    public NestedValue nv4;
-    public unsigned long data4;
-  };
-
-  //
-  // More complex truncatable valuetype.
-  //
-  valuetype TValue5 : truncatable TValue4
-  {
-    public string str1;
-    public unsigned long data5;
-    public NestedValue nv5;
-    public string str2;
-  };
-
-  //
-  // No data valuetype with truncatable parent.
-  valuetype TValue6 : truncatable BaseValue
-  {
-  };
-
-  //
-  // Interface to pass valuetypes.
-  //
-  interface Test
-  {
-
-    //NOTE: the "desc" parameter helps verify that truncated values are skipped properly.
-    //      the output is "<id>: <input desc>"
-    void op1 (in string id, in BaseValue iv, out BaseValue ov, inout string desc);
-    void op2 (in TValue1 iv, in string id, out TValue1 ov, inout string desc);
-    void op3 (in string id, in TValue4 iv, out TValue4 ov, inout string desc);
-    BaseValue op4  (in string id, 
-                    in TValue1 iv1,
-                    in short x,
-                    in TValue4 iv2,
-                    in TValue4 iv3,
-                    in TValue1 iv4,
-                    inout string desc);
-    
-    // Shutdown the romote ORB
-    oneway void shutdown ();
-
-  };
-
-};
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
deleted file mode 100644
index 2316be3f75f..00000000000
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-#include "TruncatableS_impl.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_RCSID(Truncatable, TruncatableS_impl, "$Id$")
-
-Test_impl::Test_impl (CORBA::ORB_ptr orb)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void
-Test_impl::op1 (
-    const char * id,
-    ::OBV_TruncatableTest::BaseValue * iv,
-    ::OBV_TruncatableTest::BaseValue_out ov,
-    char *& desc
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG((LM_DEBUG, "(%P|%t)Test_impl::op1 id=%s basic_data=%u desc=%s \n",
-      id, iv->basic_data (), desc));
-
-   char *tmp = CORBA::string_alloc (ACE_OS::strlen (id) + ACE_OS::strlen (desc) + 2);
-   ACE_OS::sprintf (tmp, "%s: %s", id, desc);
-   CORBA::string_free (desc);
-   desc = tmp;
-
-   ov = new ::OBV_OBV_TruncatableTest::BaseValue();
-   ov->basic_data (iv->basic_data());
- }
-
-
-void
-Test_impl::op2 (
-    ::OBV_TruncatableTest::TValue1 * iv,
-    const char * id,
-    ::OBV_TruncatableTest::TValue1_out ov,
-    char *& desc
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    ::CORBA::SystemException
-  ))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG((LM_DEBUG, "(%P|%t)Test_impl::op2 id=%s basic_data=%u data1=%u desc=%s \n",
-      id, iv->basic_data (), iv->data1 (), desc));
-  char *tmp = CORBA::string_alloc (ACE_OS::strlen (id) + ACE_OS::strlen (desc) + 2);
-  ACE_OS::sprintf (tmp, "%s: %s", id, desc);
-  CORBA::string_free (desc);
-  desc = tmp;
-
-  ov = new ::OBV_OBV_TruncatableTest::TValue1();
-  ov->basic_data (iv->basic_data());
-  ov->data1 (iv->data1());
-}
-
-
-void
-Test_impl::op3 (
-  const char * id,
-  ::OBV_TruncatableTest::TValue4 * iv,
-  ::OBV_TruncatableTest::TValue4_out ov,
-  char *& desc
-  ACE_ENV_ARG_DECL
-)
-ACE_THROW_SPEC ((
-  ::CORBA::SystemException
-))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG((LM_DEBUG, "(%P|%t)Test_impl::op3 id=%s basic_data=%u data=%u data4=%u desc=%s \n",
-      id, iv->basic_data (), iv->nv4()->data (), iv->data4 (), desc));
-
-  char *tmp = CORBA::string_alloc (ACE_OS::strlen (id) + ACE_OS::strlen (desc) + 2);
-  ACE_OS::sprintf (tmp, "%s: %s", id, desc);
-  CORBA::string_free (desc);
-  desc = tmp;
-
-  ov = new ::OBV_OBV_TruncatableTest::TValue4();
-  ::OBV_OBV_TruncatableTest::NestedValue* nv = new ::OBV_OBV_TruncatableTest::NestedValue();
-  nv->data (iv->nv4()->data ());
-  ov->basic_data (iv->basic_data());
-  ov->nv4 (nv);
-  ov->data4 (iv->data4());
-}
-
-
-::OBV_TruncatableTest::BaseValue *
-Test_impl::op4 (
-  const char * id,
-  ::OBV_TruncatableTest::TValue1 * iv1,
-  ::CORBA::Short x,
-  ::OBV_TruncatableTest::TValue4 * iv2,
-  ::OBV_TruncatableTest::TValue4 * iv3,
-  ::OBV_TruncatableTest::TValue1 * iv4,
-  char *& desc
-  ACE_ENV_ARG_DECL
-  )
-ACE_THROW_SPEC ((
-  ::CORBA::SystemException
-  ))
-{
-  if (TAO_debug_level > 0)
-  {
-    ACE_DEBUG((LM_DEBUG, "(%P|%t)Test_impl::op4 id=%s basic_data=%u data1=%u desc=%s \n",
-      id, iv1->basic_data (), iv1->data1 (), desc));
-    ACE_DEBUG((LM_DEBUG, "(%P|%t)Test_impl::op4 id=%s basic_data=%u data=%u data4=%u desc=%s \n",
-      id, iv2->basic_data (), iv2->nv4()->data (), iv2->data4 (), desc));
-    ACE_DEBUG((LM_DEBUG, "(%P|%t)Test_impl::op4 id=%s basic_data=%u data=%u data4=%u desc=%s \n",
-      id, iv3->basic_data (), iv3->nv4()->data (), iv3->data4 (), desc));
-    ACE_DEBUG((LM_DEBUG, "(%P|%t)Test_impl::op4 id=%s basic_data=%u data1=%u desc=%s \n",
-      id, iv4->basic_data (), iv4->data1 (), desc));
-  }
-
-  char *tmp = CORBA::string_alloc (ACE_OS::strlen (id) + ACE_OS::strlen (desc) + 2);
-  ACE_OS::sprintf (tmp, "%s: %s", id, desc);
-  CORBA::string_free (desc);
-  desc = tmp;
-
-  ::OBV_TruncatableTest::BaseValue * ov = new ::OBV_OBV_TruncatableTest::BaseValue();
-  CORBA::ULong total = x * (iv1->basic_data () + iv2->basic_data () + iv3->basic_data () + iv4->basic_data ());
-  ov->basic_data (total);
-
-  return ov;
-}
-
-
-void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
deleted file mode 100644
index de45a9717e3..00000000000
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OBV/Truncatable
-//
-// = FILENAME
-//   TruncatableS_impl.h
-//
-// = AUTHOR
-//   Boris Kolpackov <bosk@ipmce.ru>
-//
-// ============================================================================
-
-#ifndef TAO_TRUNCATABLE_S_IMPL_H
-#define TAO_TRUNCATABLE_S_IMPL_H
-
-#include "TruncatableS.h"
-
-class Test_impl : public POA_OBV_TruncatableTest::Test
-{
-  // = TITLE
-  //   Implementation of Test interface
-  //
-  // = DESCRIPTION
-  //   This interface is provided to produce valuetypes and test
-  //   marshaling
-  //
-public:
-  Test_impl (CORBA::ORB_ptr orb);
-  // ctor
-
-  virtual void op1 (
-        const char * id,
-        ::OBV_TruncatableTest::BaseValue * iv,
-        ::OBV_TruncatableTest::BaseValue_out ov,
-        char *& desc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
-
-  virtual void op2 (
-        ::OBV_TruncatableTest::TValue1 * iv,
-        const char * id,
-        ::OBV_TruncatableTest::TValue1_out ov,
-        char *& desc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
-
-  virtual void op3 (
-        const char * id,
-        ::OBV_TruncatableTest::TValue4 * iv,
-        ::OBV_TruncatableTest::TValue4_out ov,
-        char *& desc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
-
-  virtual ::OBV_TruncatableTest::BaseValue * op4 (
-      const char * id,
-      ::OBV_TruncatableTest::TValue1 * iv1,
-      ::CORBA::Short x,
-      ::OBV_TruncatableTest::TValue4 * iv2,
-      ::OBV_TruncatableTest::TValue4 * iv3,
-      ::OBV_TruncatableTest::TValue1 * iv4,
-      char *& desc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB
-};
-
-#endif /* TAO_TRUNCATABLE_S_IMPL_H */
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
deleted file mode 100644
index 4f037efa3ed..00000000000
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-// $Id$
-
-#include "TruncatableC.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Truncatable, client, "$Id$")
-
-  const char *ior = "file://test.ior";
-
-int fail = 0;
-int pretest = 0;
-int verbose = 0;
-
-#define VERIFY(Condition) \
-{ \
-    if ((Condition)==0) \
-    { \
-        fail++; \
-        if (!verbose) \
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) - Failure at line %l\n"))); \
-    } \
-}
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:v");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-      case 'v':
-        verbose = 1;
-        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;
-
-      // Create factories.
-
-      OBV_TruncatableTest::BaseValue_init *base_factory = 0;
-      ACE_NEW_RETURN (base_factory,
-                      OBV_TruncatableTest::BaseValue_init,
-                      1);
-
-      orb->register_value_factory (base_factory->tao_repository_id (),
-                                   base_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      base_factory->_remove_ref (); // release ownership
-
-
-
-      OBV_TruncatableTest::TValue1_init *value1_factory = 0;
-      ACE_NEW_RETURN (value1_factory,
-                      OBV_TruncatableTest::TValue1_init,
-                      1);
-
-      orb->register_value_factory (value1_factory->tao_repository_id (),
-                                   value1_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      value1_factory->_remove_ref ();
-
-
-
-      OBV_TruncatableTest::TValue2_init *value2_factory = 0;
-      ACE_NEW_RETURN (value2_factory,
-                      OBV_TruncatableTest::TValue2_init,
-                      1);
-
-      orb->register_value_factory (value2_factory->tao_repository_id (),
-                                   value2_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      value2_factory->_remove_ref ();
-
-
-      OBV_TruncatableTest::TValue3_init *value3_factory = 0;
-      ACE_NEW_RETURN (value3_factory,
-                      OBV_TruncatableTest::TValue3_init,
-                      1);
-
-      orb->register_value_factory (value3_factory->tao_repository_id (),
-                                   value3_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      value3_factory->_remove_ref ();
-
-      OBV_TruncatableTest::TValue4_init *value4_factory = 0;
-      ACE_NEW_RETURN (value4_factory,
-                      OBV_TruncatableTest::TValue4_init,
-                      1);
-
-      orb->register_value_factory (value4_factory->tao_repository_id (),
-                                   value4_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      value4_factory->_remove_ref ();
-
-      OBV_TruncatableTest::TValue5_init *value5_factory = 0;
-      ACE_NEW_RETURN (value5_factory,
-                      OBV_TruncatableTest::TValue5_init,
-                      1);
-
-      orb->register_value_factory (value5_factory->tao_repository_id (),
-                                   value5_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      value5_factory->_remove_ref ();
-
-      OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0;
-      ACE_NEW_RETURN (nested_value_factory,
-                      OBV_TruncatableTest::NestedValue_init,
-                      1);
-
-      orb->register_value_factory (nested_value_factory->tao_repository_id (),
-                                   nested_value_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      nested_value_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_TruncatableTest::Test_var test =
-        OBV_TruncatableTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (test.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil OBV_TruncatableTest::Test reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      CORBA::String_var desc;;
-      { //issolate the scope of objects to avoid using wrong values
-        OBV_TruncatableTest::TValue1_var v1;
-        ACE_NEW_RETURN (v1,
-                        OBV_OBV_TruncatableTest::TValue1,
-                        1);
-        v1->basic_data (9);
-        v1->data1 (99);
-
-        OBV_TruncatableTest::BaseValue_var ov1;
-
-        desc = CORBA::string_dup ("A<-tB, truncate B to A");
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 1: %s: "),
-                      ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-        pretest = fail;
-
-        test->op1 ("case1", v1.in (), ov1.out (), desc.inout () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (! ACE_OS::strcmp (desc.in (), "case1: A<-tB, truncate B to A"));
-        VERIFY (v1->basic_data () == ov1->basic_data ());
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-      }
-
-      { //issolate the scope of objects to avoid using wrong values
-        OBV_TruncatableTest::TValue2_var v2;
-        ACE_NEW_RETURN (v2,
-                        OBV_OBV_TruncatableTest::TValue2,
-                        1);
-        v2->basic_data (9);
-        v2->data1 (99);
-        v2->data2 (99 * 2);
-
-        OBV_TruncatableTest::BaseValue_var ov2;
-        desc = CORBA::string_dup ("A<-tB<-tC, truncate C to A");
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 2: %s: "),
-                      ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-        pretest = fail;
-
-        test->op1 ("case2", v2.in (), ov2.out (), desc.inout () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (! ACE_OS::strcmp (desc.in (), "case2: A<-tB<-tC, truncate C to A"));
-        VERIFY (v2->basic_data () == ov2->basic_data ());
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-
-        OBV_TruncatableTest::TValue1_var otv1;
-        desc = CORBA::string_dup ("A<-tB<-tC, truncate C to B");
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 3: %s: "),
-                      ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-        pretest = fail;
-
-        test->op2 (v2.in (), "case3", otv1.out (), desc.inout () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (! ACE_OS::strcmp (desc.in (), "case3: A<-tB<-tC, truncate C to B"));
-        VERIFY (v2->basic_data () == otv1->basic_data ());
-        VERIFY (v2->data1 () == otv1->data1 ());
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-      }
-
-      { //issolate the scope of objects to avoid using wrong values
-        OBV_TruncatableTest::TValue1_var itv1b;
-        ACE_NEW_RETURN (itv1b,
-                        OBV_OBV_TruncatableTest::TValue1,
-                        1);
-        itv1b->basic_data(7);
-        itv1b->data1(8);
-        OBV_TruncatableTest::TValue1_var otv1b;
-        desc = CORBA::string_dup ("A<-tB, truncatable but no truncation");
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 3b: %s: "),
-                      ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-        pretest = fail;
-
-        test->op2 (itv1b, "case3b", otv1b.out (), desc.inout () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (! ACE_OS::strcmp (desc.in (), "case3b: A<-tB, truncatable but no truncation"));
-        VERIFY (itv1b->basic_data () == otv1b->basic_data ());
-        VERIFY (itv1b->data1 () == otv1b->data1 ());
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-      }
-
-      { //issolate the scope of objects to avoid using wrong values
-        OBV_TruncatableTest::TValue3_var v3;
-        ACE_NEW_RETURN (v3,
-                        OBV_OBV_TruncatableTest::TValue3,
-                        1);
-        v3->basic_data (9);
-        v3->data1 (99);
-        v3->data3 (99 * 3);
-
-        bool caught_expected_exception = false;
-        ACE_TRY_EX (value3)
-          {
-            OBV_TruncatableTest::BaseValue_var ov3;
-            desc = CORBA::string_dup ("A<-tB<-C, try truncate C to A, MARSHAL exception");
-            if (verbose)
-              ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 4: %s: "),
-                          ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-            test->op1 ("case4", v3.in (), ov3.out (), desc.inout () ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX (value3);
-          }
-        ACE_CATCH (CORBA::MARSHAL, ex)
-          {
-            if (verbose)
-              ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("passed\n")));
-            caught_expected_exception = true;
-          }
-        ACE_ENDTRY;
-
-        if ( ! caught_expected_exception)
-          {
-            fail++;
-            if (verbose)
-              ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("faileded\n")));
-          }
-      } //end marshaling exception test.
-
-      { //issolate the scope of objects to avoid using wrong values
-        OBV_TruncatableTest::NestedValue_var nv;
-        ACE_NEW_RETURN (nv,
-                        OBV_OBV_TruncatableTest::NestedValue,
-                        1);
-        nv->data (2);
-
-        OBV_TruncatableTest::TValue5_var v5;
-        ACE_NEW_RETURN (v5,
-                        OBV_OBV_TruncatableTest::TValue5,
-                        1);
-        v5->basic_data (9);
-        v5->nv4 (nv.in ());
-        v5->data4 (99 * 4);
-        v5->str1 ("str1");
-        v5->data5 (99 * 5);
-        v5->nv5 (nv.in ());
-        v5->str2 ("str2");
-
-        OBV_TruncatableTest::BaseValue_var ov5;
-        desc = CORBA::string_dup ("A<-tB<-tC, B & C have nested value type, truncate C to A");
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 5: %s: "),
-                      ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-        pretest = fail;
-        test->op1 ("case5", v5.in (), ov5.out (), desc.inout () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (! ACE_OS::strcmp (desc.in (), "case5: A<-tB<-tC, B & C have nested value type, truncate C to A"));
-        VERIFY (v5->basic_data () == ov5->basic_data ());
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-
-        OBV_TruncatableTest::TValue4_var otv4;
-        desc = CORBA::string_dup ("A<-tB<-tC, B & C have nested value type, truncate C to B");
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 6: %s: "),
-                      ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-        pretest = fail;
-        test->op3 ("case6", v5.in (), otv4.out (), desc.inout () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (! ACE_OS::strcmp (desc.in (), "case6: A<-tB<-tC, B & C have nested value type, truncate C to B"));
-        VERIFY (v5->basic_data () == otv4->basic_data ());
-        VERIFY (v5->nv4 ()->data () == otv4->nv4 ()->data ());
-        VERIFY (v5->data4 () == otv4->data4 ());
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-      }
-
-      { //issolate the scope of objects to avoid using wrong values
-        OBV_TruncatableTest::TValue6_var iv;
-        ACE_NEW_RETURN (iv,
-                        OBV_OBV_TruncatableTest::TValue6,
-                        1);
-        iv->basic_data (9);
-
-        OBV_TruncatableTest::BaseValue_var ov;
-
-        desc = CORBA::string_dup ("A<-tB, B has no data, truncate B to A");
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 7: %s: "),
-                      ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-        pretest = fail;
-        test->op1 ("case7", iv.in (), ov.out (), desc.inout () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (! ACE_OS::strcmp (desc.in (), "case7: A<-tB, B has no data, truncate B to A"));
-        VERIFY (iv->basic_data () == ov->basic_data ());
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-      }
-
-      { //issolate the scope of objects to avoid using wrong values
-        OBV_TruncatableTest::TValue1_var v1;
-        ACE_NEW_RETURN (v1,
-                        OBV_OBV_TruncatableTest::TValue1,
-                        1);
-        v1->basic_data (8);
-        v1->data1 (88);
-
-
-        OBV_TruncatableTest::TValue1_var v4;
-        ACE_NEW_RETURN (v4,
-                        OBV_OBV_TruncatableTest::TValue1,
-                        1);
-        v4->basic_data (9);
-        v4->data1 (99);
-
-        OBV_TruncatableTest::NestedValue_var nv;
-        ACE_NEW_RETURN (nv,
-                        OBV_OBV_TruncatableTest::NestedValue,
-                        1);
-        nv->data (2);
-
-        OBV_TruncatableTest::TValue4_var v2;
-        ACE_NEW_RETURN (v2,
-                        OBV_OBV_TruncatableTest::TValue4,
-                        1);
-        v2->basic_data (7);
-        v2->nv4 (nv.in ());
-        v2->data4 (77);
-
-        OBV_TruncatableTest::TValue4_var v3;
-        ACE_NEW_RETURN (v3,
-                        OBV_OBV_TruncatableTest::TValue4,
-                        1);
-        v3->basic_data (6);
-        v3->nv4 (nv.in ());
-        v3->data4 (66);
-
-        desc = CORBA::string_dup ("multiple IN truncatable valuetype parameters and return truncatable valuetype");
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 8: %s: "),
-                      ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-        pretest = fail;
-        OBV_TruncatableTest::BaseValue_var ov
-          = test->op4 ("case8", v1.in (), 5, v2.in (), v3.in (), v4.in (), desc.inout () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (! ACE_OS::strcmp (desc.in (), "case8: multiple IN truncatable valuetype parameters and return truncatable valuetype"));
-        CORBA::ULong total = 5 * (v1->basic_data () + v2->basic_data () + v3->basic_data () + v4->basic_data ());
-        VERIFY (ov->basic_data () == total);
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-      }
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - shutdown orb \n"));
-
-
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (fail)
-        {
-          ACE_ERROR ((LM_ERROR, "(%P|%t) client: test failed \n"));
-          return 1;
-        }
-      else
-        ACE_DEBUG((LM_DEBUG, "(%P|%t) client: test passed \n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/OBV/Truncatable/run_test.pl b/TAO/tests/OBV/Truncatable/run_test.pl
deleted file mode 100755
index 5a0f4d990f9..00000000000
--- a/TAO/tests/OBV/Truncatable/run_test.pl
+++ /dev/null
@@ -1,58 +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';
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-# This is a Perl script that runs all Naming Service tests.  It starts
-# all the servers and clients as necessary.
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$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/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp
deleted file mode 100644
index c097af17c86..00000000000
--- a/TAO/tests/OBV/Truncatable/server.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// $Id$
-
-#include "TruncatableS_impl.h"
-#include "TruncatableC.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_RCSID(Truncatable, 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.optarg;
-        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;
-
-      Test_impl *test_impl;
-      ACE_NEW_RETURN (test_impl,
-                      Test_impl (orb.in ()),
-                      1);
-
-      PortableServer::ServantBase_var owner_transfer(test_impl);
-
-      OBV_TruncatableTest::Test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // 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;
-
-      OBV_TruncatableTest::BaseValue_init *base_factory = 0;
-      ACE_NEW_RETURN (base_factory,
-                      OBV_TruncatableTest::BaseValue_init,
-                      1);
-
-      orb->register_value_factory (base_factory->tao_repository_id (),
-                                   base_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      base_factory->_remove_ref (); // release ownership
-
-      OBV_TruncatableTest::TValue1_init *value1_factory = 0;
-      ACE_NEW_RETURN (value1_factory,
-                      OBV_TruncatableTest::TValue1_init,
-                      1);
-
-      orb->register_value_factory (value1_factory->tao_repository_id (),
-                                   value1_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      value1_factory->_remove_ref ();
-
-      OBV_TruncatableTest::TValue4_init *value4_factory = 0;
-      ACE_NEW_RETURN (value4_factory,
-                      OBV_TruncatableTest::TValue4_init,
-                      1);
-
-      orb->register_value_factory (value4_factory->tao_repository_id (),
-                                   value4_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      value4_factory->_remove_ref ();
-
-      OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0;
-      ACE_NEW_RETURN (nested_value_factory,
-                      OBV_TruncatableTest::NestedValue_init,
-                      1);
-
-      orb->register_value_factory (nested_value_factory->tao_repository_id (),
-                                   nested_value_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      nested_value_factory->_remove_ref ();
-
-      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/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index 27e63f25ec2..647da046fa1 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)
@@ -1440,19 +1441,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/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.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index 7a7a3a2943e..33ecd4d3399 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -82,7 +82,7 @@ ORT_test_IORInterceptor::components_established (
 
 void
 ORT_test_IORInterceptor::adapter_manager_state_changed (
-    const char * id,
+    PortableInterceptor::AdapterManagerId,
     PortableInterceptor::AdapterState
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index 14e17c49529..65ef1bf0f4e 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -66,7 +66,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
-      const char * id,
+      PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 904b4bda66f..41d68f18ff0 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", static_cast<const char*>(name[(CORBA::ULong) 0])) == 0);
 
   CORBA::String_var orb_id = ri->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/tests/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/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/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/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/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/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/Bug_2511_Regression/Bug_2511_Regression.mpc b/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
deleted file mode 100644
index 8bd676130d6..00000000000
--- a/TAO/tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(POA*): taoserver, minimum_corba {
-}
diff --git a/TAO/tests/POA/Bug_2511_Regression/run_test.pl b/TAO/tests/POA/Bug_2511_Regression/run_test.pl
deleted file mode 100755
index 2fa2e079325..00000000000
--- a/TAO/tests/POA/Bug_2511_Regression/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 ("server");
-}
-else {
-    $T = new PerlACE::Process ("server");
-}
-
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
-}
-
-exit 0;
diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp
deleted file mode 100644
index a12ae327ee7..00000000000
--- a/TAO/tests/POA/Bug_2511_Regression/server.cpp
+++ /dev/null
@@ -1,286 +0,0 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/MT_Servant_Locator
-//
-// = FILENAME
-//     server.cpp
-//
-// = DESCRIPTION
-//     This program tests that multiple calls to the Servant Locator
-//     can take place simultaneously.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=========================================================================
-
-#include "testS.h"
-#include "ace/OS.h"
-#include "tao/PortableServer/ServantLocatorC.h"
-#include "tao/CDR.h"
-
-int postCount = 0;
-int errorCount = 0;
-
-class test_i :
-  public virtual POA_test
-{
-public:
-
-  test_i (PortableServer::POA_ptr poa);
-
-  void normal (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void exceptional (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void notexisting (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  PortableServer::POA_var poa_;
-};
-
-test_i::test_i (PortableServer::POA_ptr poa)
-  : poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-void
-test_i::normal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-    ACE_DEBUG ((LM_DEBUG, "executing normal\n"));
-}
-
-void
-test_i::exceptional (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-    ACE_DEBUG ((LM_DEBUG, "executing exceptional\n"));
-}
-
-void
-test_i::notexisting (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-    ACE_DEBUG ((LM_DEBUG, "executing notexisting\n"));
-}
-
-class Servant_Locator :
-  public PortableServer::ServantLocator
-{
-public:
-
-  Servant_Locator (PortableServer::POA_ptr poa);
-
-  ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &,
-                                       PortableServer::POA_ptr,
-                                       const char *,
-                                       PortableServer::ServantLocator::Cookie &
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
-
-  void postinvoke (const PortableServer::ObjectId &,
-                   PortableServer::POA_ptr,
-                   const char *,
-                   PortableServer::ServantLocator::Cookie,
-                   PortableServer::Servant
-                   ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  test_i servant_;
-};
-
-Servant_Locator::Servant_Locator (PortableServer::POA_ptr poa)
-  : servant_ (poa)
-{
-}
-
-::PortableServer::Servant
-Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
-                            PortableServer::POA_ptr,
-                            const char *op,
-                            PortableServer::ServantLocator::Cookie &
-                            ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
-{
-  CORBA::String_var name =
-    PortableServer::ObjectId_to_string (oid);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Servant_Locator::preinvoke for %s.%s ",
-              name.in (), op ));
-
-  if (ACE_OS::strcmp (op, "normal") == 0)
-  {
-    ACE_DEBUG ((LM_DEBUG, "returning servant\n"));
-    return &this->servant_;
-  }
-  else if (ACE_OS::strcmp (op, "exceptional") == 0)
-  {
-    ACE_DEBUG ((LM_DEBUG, "throwing exception\n"));
-      throw CORBA::INTERNAL();
-  }
-  else
-  {
-    ACE_DEBUG ((LM_DEBUG, "returning NULL\n"));
-    return 0;
-  }
-}
-
-void
-Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
-                             PortableServer::POA_ptr,
-                             const char *op,
-                             PortableServer::ServantLocator::Cookie,
-                             PortableServer::Servant
-                             ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ++postCount;
-  CORBA::String_var name =
-    PortableServer::ObjectId_to_string (oid);
-
-  if (!op)
-  {
-    op = "NULL";
-    ++errorCount;
-  }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Servant_Locator::postinvoke for %s.%s\n",
-              name.in (), op ));
-
-}
-
-int
-main (int argc, char **argv)
-{
-  int retval = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      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;
-
-      CORBA::PolicyList policies;
-      CORBA::ULong current_length = 0;
-
-      policies.length (current_length + 1);
-      policies[current_length++] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      policies.length (current_length + 1);
-      policies[current_length++] =
-        root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      policies.length (current_length + 1);
-      policies[current_length++] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var child_poa =
-        root_poa->create_POA ("child",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Servant_Locator* servant_locator = new Servant_Locator(child_poa.in ()) ;
-      child_poa->set_servant_manager (servant_locator
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::ObjectId_var objectID =
-        PortableServer::string_to_ObjectId ("object");
-
-      CORBA::Object_var objectREF =
-        child_poa->create_reference_with_id (objectID.in (),
-                                             "IDL:test:1.0"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      test_var testObject =
-        test::_narrow (objectREF.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      testObject->normal();
-
-      bool caught = false;
-      ACE_TRY
-      {
-        testObject->exceptional();
-      }
-      ACE_CATCHANY
-      {
-        ACE_DEBUG ((LM_DEBUG, "exceptional() yielded exception\n"));
-        caught = true;
-      }
-      ACE_ENDTRY;
-      if (!caught) ++errorCount;
-
-      caught = false;
-      ACE_TRY
-      {
-        testObject->notexisting();
-      }
-      ACE_CATCHANY
-      {
-        ACE_DEBUG ((LM_DEBUG, "notexisting() yielded exception\n"));
-        caught = true;
-      }
-      ACE_ENDTRY;
-      if (!caught) ++errorCount;
-
-      if (!errorCount)
-      {
-      ACE_DEBUG ((LM_DEBUG,"test successful\n"));
-      }
-      else
-      {
-      ACE_DEBUG ((LM_DEBUG,"unsuccessfull: %d errors\n", errorCount ));
-      }
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      retval = -1;
-    }
-  ACE_ENDTRY;
-
-  return retval;
-}
diff --git a/TAO/tests/POA/Bug_2511_Regression/test.idl b/TAO/tests/POA/Bug_2511_Regression/test.idl
deleted file mode 100644
index 373c4ef82f0..00000000000
--- a/TAO/tests/POA/Bug_2511_Regression/test.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-interface test
-{
-  void normal ();
-  void exceptional ();
-  void notexisting ();
-};
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/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
deleted file mode 100644
index 24b3507198f..00000000000
--- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, endpointpolicy, pi_server {
-  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/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp
deleted file mode 100644
index 70af3ea8a11..00000000000
--- a/TAO/tests/POA/EndpointPolicy/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/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h
deleted file mode 100644
index 1a404058944..00000000000
--- a/TAO/tests/POA/EndpointPolicy/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/POA/EndpointPolicy/README b/TAO/tests/POA/EndpointPolicy/README
deleted file mode 100644
index 611858f1666..00000000000
--- a/TAO/tests/POA/EndpointPolicy/README
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
-
-@page EndpointPolicy Test README File
-
-	This test bases on the simplest TAO test - Hello test and adds the 
-	endpoint policy test in the server application. The server application 
-	explicitly creates the POAManager with a valid endpoint policy, uses 
-	the POAManager to create a poa and uses the poa to activate a servant. 
-	This is to test the endpoint policy in the POAManager influences the 
-	selection of endpoints to be used when collecting Profiles for use 
-	in Object References. 
-	
-	In addition, the server application also tests some error conditions
-	such as an inappropriate policy is supplied to a new POAManager.
-
-
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-  or start the client and the server manually:
-
-$ server -o $iorfile -p $port -ORBEndpoint iiop://localhost:$port &
-$ client -k file://$iorfile
-
-*/
diff --git a/TAO/tests/POA/EndpointPolicy/Test.idl b/TAO/tests/POA/EndpointPolicy/Test.idl
deleted file mode 100644
index 3c0976e106d..00000000000
--- a/TAO/tests/POA/EndpointPolicy/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/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp
deleted file mode 100644
index 61d7e6af070..00000000000
--- a/TAO/tests/POA/EndpointPolicy/client.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int bad_ior = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:b");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'b':
-        bad_ior = 1;
-        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::ORB_var orb;
-  CORBA::Object_var tmp;
-
-  ACE_TRY_NEW_ENV
-    {
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  ACE_TRY_NEW_ENV
-    {
-      ACE_DEBUG ((LM_DEBUG,"client: Invocation expecting to %s\n",
-                  (bad_ior ? "fail" : "work")));
-      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;
-
-      if (bad_ior)
-        {
-          ACE_DEBUG ((LM_DEBUG,"client: Error: was expecting an exception.\n"));
-          return 1;
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "client: success!\n"));
-
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      if (!bad_ior)
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "client: Exception caught:");
-          return 1;
-        }
-      ACE_DEBUG ((LM_DEBUG, "client: success!\n"));
-    }
-  ACE_ENDTRY;
-
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  return 0;
-}
diff --git a/TAO/tests/POA/EndpointPolicy/run_test.pl b/TAO/tests/POA/EndpointPolicy/run_test.pl
deleted file mode 100755
index 67303c96926..00000000000
--- a/TAO/tests/POA/EndpointPolicy/run_test.pl
+++ /dev/null
@@ -1,107 +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;
-
-$goodiorfile = PerlACE::LocalFile ("good.ior");
-$badiorfile =  PerlACE::LocalFile ("bad.ior");
-unlink $goodiorfile;
-unlink $badiorfile;
-
-$port = 12345;
-
-if (PerlACE::is_vxworks_test()) {
-    $sharedSV = new PerlACE::ProcessVX ("server", "-ORBUseSharedProfile 1 -g $goodiorfile -b $badiorfile -p $port");
-}
-else {
-    $sharedSV = new PerlACE::Process ("server", "-ORBUseSharedProfile 1 -g $goodiorfile -b $badiorfile -p $port");
-}
-
-if (PerlACE::is_vxworks_test()) {
-    $multiSV = new PerlACE::ProcessVX ("server", "-ORBUseSharedProfile 0 -g $goodiorfile -b $badiorfile -p $port");
-}
-else {
-    $multiSV = new PerlACE::Process ("server", "-ORBUseSharedProfile 0 -g $goodiorfile -b $badiorfile -p $port");
-}
-
-$goodCL = new PerlACE::Process ("client", " -k file://$goodiorfile");
-$badCL = new PerlACE::Process ("client", " -b -k file://$badiorfile");
-
-print "Starting server using shared profiles\n";
-
-$sharedSV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($goodiorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$goodiorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-$client = $badCL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$client = $goodCL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $sharedSV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server [single profile per IOR] returned $server\n";
-    $status = 1;
-}
-
-unlink $goodiorfile;
-unlink $badiorfile;
-
-print "Starting server using multiple profiles\n";
-
-$multiSV->Spawn();
-
-if (PerlACE::waitforfile_timed ($goodiorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$goodiorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-$client = $badCL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$client = $goodCL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $multiSV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server [multiple profiles per IOR] returned $server\n";
-    $status = 1;
-}
-
-unlink $goodiorfile;
-unlink $badiorfile;
-
-exit $status;
diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp
deleted file mode 100644
index b9a84c24704..00000000000
--- a/TAO/tests/POA/EndpointPolicy/server.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-// $Id$
-
-#include "Hello.h"
-#include "tao/EndpointPolicy/EndpointPolicy.h"
-#include "tao/EndpointPolicy/IIOPEndpointValue_i.h"
-#include "tao/PI_Server/PI_Server.h"
-#include "tao/ORB_Constants.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
-const char *good_ior_file = "good.ior";
-const char *bad_ior_file = "bad.ior";
-const char *root_ior_file = "root.ior";
-
-CORBA::Short endpoint_port = 12345;
-int verbose = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  for (int c = 1; c < argc; c++) {
-    if (ACE_OS::strcasecmp(argv[c],"-g") == 0)
-      {
-        good_ior_file = argv[++c];
-      }
-    else if (ACE_OS::strcasecmp(argv[c],"-b") == 0)
-      {
-        bad_ior_file = argv[++c];
-      }
-    else if (ACE_OS::strcasecmp(argv[c],"-p") == 0)
-      {
-        endpoint_port = ACE_OS::atoi (argv[++c]);
-      }
-    else if (ACE_OS::strcasecmp(argv[c],"-v") == 0)
-      {
-        verbose = 1;
-      }
-    else if (strstr(argv[c],"-ORB") == argv[c])
-      {
-        c++;
-        continue;
-      }
-    else
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "usage:  %s "
-                         "-g <goodiorfile> "
-                         "-b <badiorfile> "
-                         "-p <port> "
-                         "-v "
-                         "\n",
-                         argv [0]),
-                        -1);
-  }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-void
-add_endpoint_args(int &argc, char**argv, char** &largv)
-{
-  largv = new char*[argc+4];
-  for (int i = 0; i < argc; i++)
-    largv[i] = argv[i];
-  largv[argc++] = "-ORBEndpoint";
-  largv[argc] = new char[100];
-  ACE_OS::sprintf (largv[argc++],"iiop://localhost:%d",endpoint_port);
-  largv[argc++] = "-ORBEndpoint";
-  largv[argc] = new char[100];
-  ACE_OS::sprintf (largv[argc++],"iiop://localhost:%d/hostname_in_ior=unreachable",endpoint_port+1);
-}
-
-int
-main (int argc, char *argv[])
-{
-
-  CORBA::ORB_var orb;
-  CORBA::Object_var obj;
-  PortableServer::POA_var root_poa;
-  PortableServer::POAManagerFactory_var poa_manager_factory;
-
-  try
-    {
-      if (parse_args (argc, argv) != 0)
-        return 1;
-      char **largv;
-      add_endpoint_args(argc,argv, largv);
-      orb =
-        CORBA::ORB_init (argc, largv, "EndpointPolicy");
-
-      obj =
-        orb->resolve_initial_references("RootPOA");
-
-      root_poa =
-        PortableServer::POA::_narrow (obj.in ());
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      poa_manager_factory
-        = root_poa->the_POAManagerFactory ();
-    }
-  catch (CORBA::Exception &ex)
-    {
-      ex._tao_print_exception("initialization error ");
-      return 1;
-    }
-
-  // Currently, only single ENDPOINT_POLICY_TYPE policy is supported in
-  // the POAManager. A PolicyError exception with BAD_POLICY reason is
-  // raised if the POAManager has multiple policies.
-  bool policy_error_test = false;
-  CORBA::PolicyList policies;
-
-  try
-    {
-      policies.length (2);
-      PortableServer::POAManager_var poa_manager
-        = poa_manager_factory->create_POAManager ("wrongPOAManager",
-                                                  policies);
-    }
-  catch (CORBA::PolicyError &ex)
-    {
-      if (ex.reason == CORBA::BAD_POLICY)
-        policy_error_test = true;
-    }
-
-  if (! policy_error_test)
-    return 1;
-
-  policy_error_test = false;
-
-  // A PolicyError exception with BAD_POLICY reason is raised if
-  // the POAManager has other policies.
-  try
-    {
-      policies.length (1);
-
-      CORBA::Any policy_value;
-      policy_value <<= PortableServer::ORB_CTRL_MODEL;
-
-      policies[0] = orb->create_policy (PortableServer::THREAD_POLICY_ID,
-                                        policy_value);
-
-      PortableServer::POAManager_var poa_manager
-        = poa_manager_factory->create_POAManager ("wrongPOAManager",
-                                                  policies);
-    }
-  catch (CORBA::PolicyError &ex)
-    {
-      if (ex.reason == CORBA::BAD_POLICY)
-        policy_error_test = true;
-    }
-
-  if (! policy_error_test)
-    return 1;
-
-  policy_error_test = false;
-
-#if 0
-  // @@@ mesnier_p@ociweb.com
-  // This test is currently blocked out due to the vagueries of hostname
-  // creation at intermediate stages of endpoint production. See my note
-  // in tao/EndpointPolicy/IIOPEndpointValue_i.cpp (validate_acceptor())
-  // for more information about this situation.
-
-  // A PolicyError exception with UNSUPPORTED_POLICY_VALUE reason
-  // is raised if the Endpoint policy does not contain an endpoint
-  // that match any endpoint the ORB is listening on.
-  try
-    {
-      policies.length (1);
-
-      CORBA::ULong port = 0xdead;
-      EndpointPolicy::EndpointValueBase_var iiop_endpoint
-        = new IIOPEndpointValue_i("localhost", port);
-
-      EndpointPolicy::EndpointList list;
-      list.length (1);
-
-      list[0] = iiop_endpoint;
-
-      CORBA::Any policy_value;
-      policy_value <<= list;
-
-      policies[0] = orb->create_policy (EndpointPolicy::ENDPOINT_POLICY_TYPE,
-                                        policy_value);
-
-      PortableServer::POAManager_var poa_manager
-        = poa_manager_factory->create_POAManager ("wrongPOAManager",
-                                                  policies);
-    }
-  catch (CORBA::PolicyError &ex)
-    {
-      if (ex.reason == CORBA::UNSUPPORTED_POLICY_VALUE)
-        policy_error_test = true;
-    }
-
-  if (! policy_error_test)
-    return 1;
-#endif
-  //-----------------------------------------------------------------------
-
-
-  // Create two valid endpoint policies. One to match each of the generated
-  // endpoint arguments supplied to ORB_init().
-  PortableServer::POAManager_var good_pm;
-  PortableServer::POAManager_var bad_pm;
-
-  policies.length (1);
-
-  EndpointPolicy::EndpointValueBase_var iiop_endpoint =
-    new IIOPEndpointValue_i("localhost", endpoint_port);
-
-  EndpointPolicy::EndpointList list;
-  list.length (1);
-  list[0] = iiop_endpoint;
-
-  try
-    {
-      CORBA::Any policy_value;
-      policy_value <<= list;
-      policies[0] = orb->create_policy (EndpointPolicy::ENDPOINT_POLICY_TYPE,
-                                        policy_value);
-      good_pm = poa_manager_factory->create_POAManager ("goodPOAManager",
-                                                        policies);
-    }
-  catch (CORBA::Exception &ex)
-    {
-      ex._tao_print_exception ("Failed to create reachable POA manager");
-      return 1;
-    }
-
-  list[0] = new IIOPEndpointValue_i("unreachable", endpoint_port+1);
-  try
-    {
-      CORBA::Any policy_value;
-      policy_value <<= list;
-      policies[0] = orb->create_policy (EndpointPolicy::ENDPOINT_POLICY_TYPE,
-                                        policy_value);
-      bad_pm = poa_manager_factory->create_POAManager ("badPOAManager",
-                                                        policies);
-    }
-  catch (CORBA::Exception &ex)
-    {
-      ex._tao_print_exception ("Failed to create unreachable POA manager");
-      return 1;
-    }
-
-  try
-    {
-      PortableServer::ObjectId_var oid;
-      CORBA::Object_var o = CORBA::Object::_nil();
-      FILE *output_file= 0;
-      // Create poas assiciated with the each the good poa manager and the
-      // bad poa manager.
-      policies.length(0);
-      PortableServer::POA_var good_poa =
-        root_poa->create_POA ("goodPOA",
-                              good_pm.in (),
-                              policies);
-
-      PortableServer::POA_var bad_poa =
-        root_poa->create_POA ("badPOA",
-                              bad_pm.in (),
-                              policies);
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(hello_impl);
-
-      ACE_DEBUG ((LM_DEBUG, "Creating IOR from root poa\n"));
-
-      oid = root_poa->activate_object (hello_impl);
-      o = root_poa->id_to_reference (oid.in ());
-
-      CORBA::String_var root_ior =
-        orb->object_to_string (o.in ());
-
-      output_file= ACE_OS::fopen (root_ior_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           root_ior_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", root_ior.in ());
-      ACE_OS::fclose (output_file);
-
-      ACE_DEBUG ((LM_DEBUG, "Creating IOR from bad poa\n"));
-
-      oid = bad_poa->activate_object (hello_impl);
-      o = bad_poa->id_to_reference (oid.in());
-
-      CORBA::String_var bad_ior =
-        orb->object_to_string (o.in ());
-
-      ACE_DEBUG ((LM_DEBUG, "Creating IOR from good poa\n"));
-
-      oid = good_poa->activate_object (hello_impl);
-      o = good_poa->id_to_reference (oid.in ());
-
-      CORBA::String_var good_ior =
-        orb->object_to_string (o.in ());
-
-      output_file= ACE_OS::fopen (good_ior_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           good_ior_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", good_ior.in ());
-      ACE_OS::fclose (output_file);
-
-      output_file= ACE_OS::fopen (bad_ior_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           bad_ior_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", bad_ior.in ());
-      ACE_OS::fclose (output_file);
-
-      good_pm->activate ();
-      bad_pm->activate ();
-
-      orb->run ();
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-    }
-  catch (CORBA::Exception &ex)
-    {
-      ex._tao_print_exception ("cannot run server");
-    }
-  root_poa->destroy (1, 1);
-
-  orb->destroy ();
-
-  return 0;
-}
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/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
deleted file mode 100644
index 184d3a7eaa5..00000000000
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-// $Id$
-
-//========================================================================
-//
-// = LIBRARY
-//     TAO/tests/POA/POAManagerFactory
-//
-// = FILENAME
-//     POAManagerFactory.cpp
-//
-// = DESCRIPTION
-//     This program tests Root_POA::the_POAManagerFactory and
-//     the POAManagerFactory interfaces such as create_POAManager(),
-//     list () and find ().
-//
-// = AUTHOR
-//     Yan Dai
-//
-//=========================================================================
-
-#include "tao/ORB.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PI_Server/PI_Server.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "ace/Get_Opt.h"
-
-int fail = 0;
-int pretest = 0;
-int verbose = 0;
-
-#define VERIFY(Condition) \
-{ \
-    if (!(Condition)) \
-    { \
-        fail++; \
-        if (!verbose) \
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) - Failure at line %l\n"))); \
-    } \
-}
-
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "v");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'v':
-        verbose = 1;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-v "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Initialize the ORB first.
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         "POAManagerFactoryTest"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Narrow to POA.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (verbose)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("Obtain PoaManagerFactory reference: ")));
-      pretest = fail;
-
-      // Obtain the POAManagerFactory.
-      PortableServer::POAManagerFactory_var poa_manager_factory
-        = root_poa->the_POAManagerFactory ();
-
-      VERIFY (!CORBA::is_nil(poa_manager_factory.in()));
-      if (verbose)
-        ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                    (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-      if (CORBA::is_nil(poa_manager_factory.in()))
-        return 1;
-
-      CORBA::PolicyList policies (0);
-      policies.length (0);
-
-      if (verbose)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("Create a POAManager: ")));
-      pretest = fail;
-
-      // Explicitly create a POAManager - "POAManager1" .
-      PortableServer::POAManager_var poa_manager_1
-        = poa_manager_factory->create_POAManager ("POAManager1",
-                                                  policies
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      VERIFY (!CORBA::is_nil(poa_manager_1.in()));
-      if (verbose)
-        ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                    (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-      if (CORBA::is_nil(poa_manager_1.in()))
-        return 1;
-
-      // Creating a POAManager with an exiting POAManager name raises exception.
-      if (verbose)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("Prevent duplicated POAManagers: ")));
-      pretest = fail;
-      CORBA::Boolean got_expected_exception = false;
-      ACE_TRY_EX (create)
-      {
-        PortableServer::POAManager_var poa_manager
-         = poa_manager_factory->create_POAManager ("POAManager1",
-                                                   policies
-                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (create);
-      }
-      ACE_CATCH (PortableServer::POAManagerFactory::ManagerAlreadyExists, ex)
-      {
-        got_expected_exception = true;
-      }
-      ACE_ENDTRY;
-
-      VERIFY (got_expected_exception);
-      if (verbose)
-        ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                    (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-
-      if (! got_expected_exception)
-        return 1;
-
-      {
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("Implicitly create a POAManagers: ")));
-        pretest = fail;
-        // Implicitly create a POAManager instance which has an automatically
-        // assigned name.
-        PortableServer::POA_var child_poa =
-        root_poa->create_POA ("childPOA2",
-                              PortableServer::POAManager::_nil (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-
-        PortableServer::POAManager_var poa_manager_2
-          = child_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (!CORBA::is_nil(poa_manager_2.in()));
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-
-        if (CORBA::is_nil(poa_manager_2.in()))
-          return 1;
-
-        CORBA::String_var poa_manager_2_name
-          = poa_manager_2->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("Implicitly created POAManager's ID: [%s]\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(poa_manager_2_name.in())));
-
-        if (ACE_OS::strlen(poa_manager_2_name.in()) == 0)
-          return 1;
-
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT("List POAManagers: ")));
-        pretest = fail;
-
-        PortableServer::POAManagerFactory::POAManagerSeq_var managers
-          = poa_manager_factory->list (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY (managers->length () == 3);
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-
-        PortableServer::POAManager_var root_poa_manager
-          = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        for (CORBA::ULong i = 0; i < managers->length(); ++i)
-        {
-          CORBA::String_var name = managers[i]->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          if (verbose)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT("Validate listed POAManager [%s]: "),
-                        ACE_TEXT_CHAR_TO_TCHAR(name.in())));
-          pretest = fail;
-
-          if ((ACE_OS::strcmp (name.in (), "RootPOAManager") == 0
-            && managers[i] == root_poa_manager.in ())
-            || (ACE_OS::strcmp (name.in (), "POAManager1") == 0
-            && managers[i] == poa_manager_1.in ())
-            || (ACE_OS::strcmp (name.in (), poa_manager_2_name.in ()) == 0
-            && managers[i] == poa_manager_2.in ()))
-            {
-              if (verbose)
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT("passed\n")));
-              continue;
-            }
-          else
-            {
-              if (verbose)
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT("failed\n")));
-              fail++;
-            }
-        }
-      }
-
-      {
-        // Find a specific POAManager.
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("Find a POAManager: ")));
-        pretest = fail;
-
-        PortableServer::POAManager_var manager
-          = poa_manager_factory->find ("POAManager1" ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        CORBA::String_var name = manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        VERIFY ((ACE_OS::strcmp (name.in (), "POAManager1") == 0
-                 && manager.in () == poa_manager_1.in ()));
-
-        if (verbose)
-          ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("%s\n"),
-                      (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
-      }
-
-      // Create a child poa that associates with the explicitly
-      // created POAManager.
-      if (verbose)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT("Create A POA with explicit  POAManager: ")));
-      pretest = fail;
-      PortableServer::POA_var child_poa =
-        root_poa->create_POA ("childPOA",
-                              poa_manager_1.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager_1->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1);
-
-      if (verbose)
-        ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("passed\n")));
-    }
-  ACE_CATCHANY
-    {
-      fail++;
-      if (verbose)
-        ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("failed\n")));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT("POAManagerFactory %s\n"),
-              (pretest == fail) ? ACE_TEXT ("succeeded") : ACE_TEXT ("failed")));
-
-  return 0;
-}
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
deleted file mode 100644
index 49fcc0fc6a3..00000000000
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
+++ /dev/null
@@ -1,5 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(POA*): taoexe, portableserver, pi_server {
-}
diff --git a/TAO/tests/POA/POAManagerFactory/run_test.pl b/TAO/tests/POA/POAManagerFactory/run_test.pl
deleted file mode 100755
index 39be0d05e74..00000000000
--- a/TAO/tests/POA/POAManagerFactory/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 ("POAManagerFactory");
-}
-else {
-    $T = new PerlACE::Process ("POAManagerFactory");
-}
-
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
-}
-
-exit 0;
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/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..dffcbf892da 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$")
 
@@ -181,7 +182,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 +209,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 +234,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/README b/TAO/tests/POA/README
index 9d4a03425d2..a62f8269c50 100644
--- a/TAO/tests/POA/README
+++ b/TAO/tests/POA/README
@@ -81,17 +81,3 @@ Object Adapter (POA) interfaces and their usage scenarios.
                 This program tests that nested non-servant upcalls are
                 handled correctly.
 
-        . POAManagerFactory
-   
-                The program tests the POAManagerFactory interface. Test may
-                be run by hand using "POAManagerFactory -v" to get a verbose 
-                report of individual tests being run.
-
-        . EndpointPolicy 
-
-                Tests for the endpoint policy, the server listens on two
-                endpoints, one with an alias rendering it unreachable. The 
-                server uses the endpoint policy to create two IORs, one with
-                the only the good endpoint and another with only the bad. The
-                client expects to reach the good ior and expects to fail with
-                the bad ior.
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/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
deleted file mode 100644
index 29d26448590..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, iortable {
-  idlflags += -Sa -St
-  Source_Files {
-    Test_i.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoclient {
-  after += *Server
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Parallel_Connect_Strategy/README b/TAO/tests/Parallel_Connect_Strategy/README
deleted file mode 100644
index 75dac13ce01..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/README
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
-
-@page Parallel Connect Strategy Test README File
-
-This test is intended to demonstrate that the Parallel Connect
-strategy improves performance of connection establishment regardless
-of the wait strategy involved.
-
-The measurements are timed invocations based on the ACE_High_Res_Timer.
-
-Sample run_test.pl output:
-LF wait strategy test
-Starting invocation 1 - call completed in 6347 usec
-Starting invocation 2 - call completed in 406 usec
-
-LF wait strategy, corbaloc test
-Narrowing IOR - call completed in 5172 usec
-Starting invocation 1 - call completed in 193 usec
-Starting invocation 2 - call completed in 170 usec
-
-Reactive wait strategy test
-Starting invocation 1 - call completed in 4469 usec
-Starting invocation 2 - call completed in 361 usec
-
-Blocked wait strategy test
-Starting invocation 1 - call completed in 189015027 usec
-Starting invocation 2 - call completed in 408 usec
-
-No parallel connect test
-Starting invocation 1 - call completed in 189014806 usec
-Starting invocation 2 - call completed in 189012352 usec
-
-*/
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test.idl b/TAO/tests/Parallel_Connect_Strategy/Test.idl
deleted file mode 100644
index 3c0976e106d..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/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/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
deleted file mode 100644
index bdf487d4a54..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// $Id$
-//
-#include "Test_i.h"
-
-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/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
deleted file mode 100644
index 0fbcc7a4ab6..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-
-//
-// $Id$
-//
-
-#ifndef TEST_I_H
-#define TEST_I_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 /* TEST_I_H */
diff --git a/TAO/tests/Parallel_Connect_Strategy/blocked.conf b/TAO/tests/Parallel_Connect_Strategy/blocked.conf
deleted file mode 100644
index 2feddbe2302..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/blocked.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# test for using the blocked connect strategy
-
-static Client_Strategy_Factory "-ORBConnectStrategy Blocked"
diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp
deleted file mode 100644
index ee7747bb1ca..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/client.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int kill_server = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-      case 'x':
-        kill_server = 1;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-x "
-                           "\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;
-
-      ACE_High_Res_Timer hrt;
-      ACE_hrtime_t elapsed;
-
-      ACE_DEBUG ((LM_DEBUG,"Narrowing IOR - "));
-      hrt.start();
-
-      Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      hrt.stop();
-      hrt.elapsed_microseconds (elapsed);
-      hrt.reset();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("call completed in %d usec\n"),
-                  elapsed ));
-
-      if (CORBA::is_nil (hello.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Test::Hello reference <%s>\n",
-                             ior),
-                            1);
-        }
-      if (kill_server)
-        {
-          hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,"Starting invocation 1 - "));
-          hrt.start();
-          CORBA::String_var the_string =
-            hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          hrt.stop();
-          hrt.elapsed_microseconds (elapsed);
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("call completed in %d usec\n"),
-                      elapsed ));
-          ACE_DEBUG ((LM_DEBUG,"Starting invocation 2 - "));
-          hrt.reset();
-          hrt.start();
-          the_string = hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          hrt.stop();
-          hrt.elapsed_microseconds (elapsed);
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT("call completed in %d usec\n"),
-                      elapsed ));
-        }
-      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/Parallel_Connect_Strategy/reactive.conf b/TAO/tests/Parallel_Connect_Strategy/reactive.conf
deleted file mode 100644
index 0317f1c624c..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/reactive.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# test for using the blocked connect strategy
-
-static Client_Strategy_Factory "-ORBConnectStrategy Reactive"
diff --git a/TAO/tests/Parallel_Connect_Strategy/run_test.pl b/TAO/tests/Parallel_Connect_Strategy/run_test.pl
deleted file mode 100755
index e663d69e42d..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/run_test.pl
+++ /dev/null
@@ -1,97 +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 ("altiiop.ior");
-unlink $iorfile;
-$status = 0;
-@bogus_eps = ("-orbendpoint iiop://localhost:10200/hostname_in_ior=126.0.0.123",
-              "-orbendpoint iiop://localhost:10202/hostname_in_ior=126.0.0.124");
-$valid_ep = "-orbendpoint iiop://localhost:10201";
-
-$corbaloc = "corbaloc::126.0.0.123:10200,:localhost:10201,:126.0.0.124:10202/pcs_test";
-
-$SV_ALT_IIOP = new PerlACE::Process ("server", "-ORBUseSharedProfile 1 -o $iorfile $bogus_eps[0] $valid_ep $bogus_eps[1]");
-
-$CL_LF = new PerlACE::Process ("client", "-ORBuseParallelConnects 1 -k file://$iorfile");
-$CL_CORBALOC = new PerlACE::Process ("client", "-ORBuseParallelConnects 1 -k $corbaloc");
-$CL_Reactive = new PerlACE::Process ("client", "-ORBSvcConf reactive.conf -ORBuseParallelConnects 1 -k file://$iorfile");
-$CL_Blocked = new PerlACE::Process ("client", "-ORBSvcConf blocked.conf -ORBuseParallelConnects 1 -k file://$iorfile");
-$CL_None = new PerlACE::Process ("client", "-ORBuseParallelConnects 0 -k file://$iorfile");
-$CL_Shutdown =  new PerlACE::Process ("client", "-ORBuseParallelConnects 1 -k file://$iorfile -x");
-
-$SV_ALT_IIOP->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;
-}
-
-print "LF wait strategy test\n";
-
-$client = $CL_LF->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-print "\nLF wait strategy, corbaloc test\n";
-
-$client = $CL_CORBALOC->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-print "\nReactive wait strategy test\n";
-
-$client = $CL_Reactive->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-print "\nBlocked wait strategy test\n";
-
-$client = $CL_Blocked->SpawnWaitKill (600);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-print "\nNo parallel connect test\n";
-
-$client = $CL_None->SpawnWaitKill (900);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$client = $CL_Shutdown->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV_ALT_IIOP->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp
deleted file mode 100644
index 153aba883ff..00000000000
--- a/TAO/tests/Parallel_Connect_Strategy/server.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "Test_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "tao/IORTable/IORTable.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);
-
-      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 ("pcs_test", ior.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      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/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..bdca2f02cdc 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "bd_str_seq.h"
 
-ACE_RCSID (Param_Test, 
-           bd_str_seq, 
+ACE_RCSID (Param_Test,
+           bd_str_seq,
            "$Id$")
 
 // ************************************************************************
@@ -150,9 +150,9 @@ Test_Bounded_String_Sequence::check_validity (void)
       // lengths are same. Now compare the contents
       for (CORBA::ULong i=0; i < this->in_->length () && flag; i++)
         {
-          if (ACE_OS::strcmp(this->in_[i], 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(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->inout_[i])) ||
+              ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->out_[i])) ||
+              ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->ret_[i])))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Param_Test/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..bcf91d9bf5a 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -20,7 +20,7 @@
 #include "nested_struct.h"
 
 ACE_RCSID (Param_Test,
-           nested_struct, 
+           nested_struct,
            "$Id$")
 
 // ************************************************************************
@@ -168,9 +168,9 @@ Test_Nested_Struct::check_validity (void)
       // lengths are same. Now compare the contents
       for (CORBA::ULong i=0; i < this->in_.vs.seq.length () && flag; i++)
         {
-          if (ACE_OS::strcmp (this->in_.vs.seq[i], 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 (static_cast<const char*>(this->in_.vs.seq[i]), static_cast<const char*>(this->inout_->vs.seq[i])) ||
+              ACE_OS::strcmp (static_cast<const char*>(this->in_.vs.seq[i]), static_cast<const char*>(this->out_->vs.seq[i])) ||
+              ACE_OS::strcmp (static_cast<const char*>(this->in_.vs.seq[i]), static_cast<const char*>(this->ret_->vs.seq[i])))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Param_Test/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/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/svc.conf b/TAO/tests/Param_Test/svc.conf
index d63ac264118..f2f882ba2f4 100644
--- a/TAO/tests/Param_Test/svc.conf
+++ b/TAO/tests/Param_Test/svc.conf
@@ -3,5 +3,5 @@
 # Please read $TAO_ROOT/docs/Options.html for details.
 #
 
-#static Resource_Factory "-ORBNativeWCharCodeset 0x00010109"
+static Resource_Factory "-ORBNativeWCharCodeset 0x00010109"
 static Server_Strategy_Factory "-ORBtablesize 128"
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 730701506f0..80a73eba261 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -20,7 +20,7 @@
 #include "ub_str_seq.h"
 
 ACE_RCSID (Param_Test,
-           ub_str_seq, 
+           ub_str_seq,
            "$Id$")
 
 // ************************************************************************
@@ -152,9 +152,9 @@ Test_String_Sequence::check_validity (void)
       // lengths are same. Now compare the contents
       for (CORBA::ULong i=0; i < this->in_->length () && flag; i++)
         {
-          if (ACE_OS::strcmp(this->in_[i], 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(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->inout_[i])) ||
+              ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->out_[i])) ||
+              ACE_OS::strcmp(static_cast<const char*>(this->in_[i]), static_cast<const char*>(this->ret_[i])))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 679ed7b3db3..1b32ef97c56 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -20,7 +20,7 @@
 #include "var_struct.h"
 
 ACE_RCSID (Param_Test,
-           var_struct, 
+           var_struct,
            "$Id$")
 
 // ************************************************************************
@@ -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 (static_cast<const char*>(this->in_.seq[i]), static_cast<const char*>(this->inout_->seq[i])) ||
+              ACE_OS::strcmp (static_cast<const char*>(this->in_.seq[i]), static_cast<const char*>(this->out_->seq[i])) ||
+              ACE_OS::strcmp (static_cast<const char*>(this->in_.seq[i]), static_cast<const char*>(this->ret_->seq[i])))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/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/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/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
index 6c5f5825295..d1453ff16a4 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
@@ -6,6 +6,7 @@
 
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
+#include "tao/CORBA_String.h"
 
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index 729804b2872..e2e9aa6acf8 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -8,6 +8,7 @@
 
 #include "tao/LocalObject.h"
 #include "tao/ORBInitializer_Registry.h"
+#include "tao/CORBA_String.h"
 
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
index 1a1256f6ad7..bebf68e6c26 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
@@ -6,6 +6,7 @@
 
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
+#include "tao/CORBA_String.h"
 
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/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/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/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/Bug_2510_Regression/Bug_2510_Regression.mpc b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
deleted file mode 100644
index a49d6902aa6..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, pi_server, interceptors {
-  Source_Files {
-    test_i.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoclient, pi, interceptors {
-  after += *Server
-  Source_Files {
-    testC.cpp
-    Client_ORBInitializer.cpp
-    client_interceptor.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
deleted file mode 100644
index acceb91568b..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-//
-
-#include "Client_ORBInitializer.h"
-#include "client_interceptor.h"
-
-ACE_RCSID (Bug_2510_Regression, Client_ORBInitializer, "$Id$")
-
-Client_ORBInitializer::Client_ORBInitializer (void)
-{
-}
-
-void
-Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableInterceptor::SlotId slot_id = info->allocate_slot_id ();
-
-  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;
-
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_UNUSED_ARG (slot_id);
-}
-
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
deleted file mode 100644
index 569419fb346..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-//
-
-#ifndef TAO_CLIENT_ORB_INITIALIZER_H
-#define TAO_CLIENT_ORB_INITIALIZER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/PI.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Client ORB initializer.
-class Client_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor
-  Client_ORBInitializer (void);
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CLIENT_ORB_INITIALIZER_H */
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
deleted file mode 100644
index 7c0c3cc2431..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/Synch.h"
-#include "testC.h"
-#include "Client_ORBInitializer.h"
-#include "tao/ORBInitializer_Registry.h"
-
-ACE_RCSID(Bug_2510_Regression, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "ef:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'e':
-      break;
-      case 'f':
-        ior = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-v "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  return 0;
-}
-
-static ACE_THR_FUNC_RETURN run_test(void* pData)
-{
-    Test_Interceptors::Visual_ptr server = static_cast<Test_Interceptors::Visual_ptr>(pData);
-
-    server->normal (10 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    return (ACE_THR_FUNC_RETURN)0;
-}
-
-int
-main (int argc, char *argv[])
-{
-    ACE_TRY_NEW_ENV
-    {
-        PortableInterceptor::ORBInitializer_ptr temp_initializer;
-
-        ACE_NEW_RETURN (temp_initializer,
-                      Client_ORBInitializer,
-                      -1);  // No exceptions yet!
-        PortableInterceptor::ORBInitializer_var initializer =
-        temp_initializer;
-
-        PortableInterceptor::register_orb_initializer (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;
-
-        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_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",
-                             ior),
-                            1);
-        }
-
-        ACE_hthread_t threadHandle;
-        if ( ACE_Thread::spawn(	run_test,
-                                static_cast<void*>(server.in()),
-						        THR_NEW_LWP | THR_JOINABLE ,
-                                0,
-                                & threadHandle
-                               ) == -1 )
-        {
-           ACE_ERROR_RETURN ((LM_ERROR,"Cannot start thread"), 1);
-        }
-
-        ACE_Thread::join (threadHandle);
-        ACE_TRY_CHECK;
-
-        //server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-    }
-
-    ACE_CATCHANY
-    {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in client:");
-        return 1;
-    }
-
-    ACE_ENDTRY;
-
-    return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
deleted file mode 100644
index 8b6c9a89a5c..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// $Id$
-
-#include "client_interceptor.h"
-#include "tao/OctetSeqC.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Constants.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (Bug_2510_Regression,
-           client_interceptor,
-           "$Id$")
-
-const IOP::ServiceId service_id = 0xdeadbeef;
-const char *request_msg = "REQUEST message";
-const char *reply_msg = "REPLY message";
-const char *forward_msg = "FORWARD message";
-
-Echo_Client_Request_Interceptor::
-Echo_Client_Request_Interceptor ()
-  : myname_ ("Echo_Client_Interceptor")
-{
-}
-
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
-{
-}
-
-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 operation =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var target =
-    ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,"%s.send_request from %s\n", this->myname_, operation.in ()));
-}
-
-void
-Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::String_var operation =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var target =
-    ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,"%s.receive_reply from %s\n", this->myname_, operation.in ()));
-}
-
-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 operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,"%s.receive_other from %s\n", this->myname_, operation.in ()));
-}
-
-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 operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,"%s.receive_exception from %s\n", this->myname_, operation.in ()));
-}
-
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
deleted file mode 100644
index 95c3e21346f..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef TAO_CLIENT_INTERCEPTOR_H
-#define TAO_CLIENT_INTERCEPTOR_H
-
-#include "tao/PI/PI.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#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 ();
-  // 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
-
-private:
-  const char *myname_;
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_CLIENT_INTERCEPTOR_H */
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl
deleted file mode 100755
index fa204e17d8c..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/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 ("test.ior");
-
-unlink $file;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
-}
-else {
-    $SV = new PerlACE::Process ("server", "-o $file");
-}
-$CL = new PerlACE::Process ("client", "-f file://$file");
-
-print STDERR "\n\n==== Running interceptor 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/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
deleted file mode 100644
index 4043ed02514..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "test_i.h"
-#include "tao/ORBInitializer_Registry.h"
-
-ACE_RCSID (Bug_2510_Regression,
-           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
-    {
-      // Now create an ORB
-      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;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Visual_i server_impl (orb.in ());
-
-      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 =
-        orb->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 (ior_output_file != 0)
-        {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file for writing IOR: %s",
-                               ior_output_file),
-                              1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      orb->run (ACE_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 in server:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
deleted file mode 100644
index d895106d35a..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-module Test_Interceptors
-{
-  exception Silly
-    {};
-
-  interface Visual
-  {
-    // = TITLE
-    //   A test idl for checking interceptor visually.
-    //
-    // = DESCRIPTION
-    //
-
-    void normal (in long arg);
-    // Normal operation.
-
-    void nothing ();
-    // Normal operation without return.
-
-    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/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
deleted file mode 100644
index 39039d4e834..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-
-ACE_RCSID (Bug_2510_Regression,
-           test_i,
-           "$Id$")
-
-
-Visual_i::Visual_i (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void
-Visual_i::normal (CORBA::Long arg
-                  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
-}
-
-void
-Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
-}
-
-void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test_Interceptors::Silly))
-{
-  ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing 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->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
deleted file mode 100644
index 5a6df58c457..00000000000
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   test_i.h
- *
- *  $Id$
- *
- *  @author Nanbor Wang
- */
-//=============================================================================
-
-
-#ifndef TAO_INTERCEPTOR_TEST_I_H
-#define TAO_INTERCEPTOR_TEST_I_H
-
-#include "testS.h"
-
-/**
- * @class Visual_i
- *
- * Implements the Visual interface in test.idl
- */
-class Visual_i : public POA_Test_Interceptors::Visual
-{
-
-public:
-
-  Visual_i (CORBA::ORB_ptr orb);
-
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test_Interceptors::Silly));
-
-  void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  /// The ORB pseudo-reference (for shutdown).
-  CORBA::ORB_var orb_;
-
-};
-
-#endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
index 1aaceae2c8c..e2bb8dc1d6a 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;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index a9db6a71b8a..b8ad135337f 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",
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/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/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index 4845a04bed7..6db30b8116c 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -39,7 +39,7 @@ Client_ORBInitializer::post_init (
   // Extract the last forward reference from the argument list.
   CORBA::ULong args_len = args->length ();
   for (CORBA::ULong i = 0; i < args_len; ++i)
-    if (ACE_OS::strcmp ("-k", args[i]) == 0
+    if (ACE_OS::strcmp ("-k", static_cast<const char*>(args[i])) == 0
         && i < (args_len - 1))
       forward_str = args[i + 1];
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/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_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index c29013285ff..b8c44b203e0 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -181,7 +181,7 @@ FOO_IORInterceptor::components_established (
 
 void
 FOO_IORInterceptor::adapter_manager_state_changed (
-    const char *,
+    PortableInterceptor::AdapterManagerId ,
     PortableInterceptor::AdapterState
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 4fc980070d1..699083a8fde 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -78,7 +78,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
-      const char * id,
+      PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
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..92c607cbf00 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 "
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/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..8c0943196de 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 "
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/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/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/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/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/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..2fdd31ec451 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,
@@ -88,9 +89,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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp
index ffcf6dbf8a3..481fe5eaebd 100644
--- a/TAO/tests/RTScheduling/Current/test.cpp
+++ b/TAO/tests/RTScheduling/Current/test.cpp
@@ -3,15 +3,18 @@
 #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;
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
index 37da9a5de01..873abdd819a 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -7,6 +7,8 @@
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
 
+#include "tao/RTScheduling/RTSchedulerC.h"
+
 class Data
 {
  public:
diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
index fab57bcd8ce..bfbb4a96681 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,8 +23,8 @@ 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;
diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp
index 885e7ba2fd7..5e9ac4bf9e0 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -3,8 +3,11 @@
 #include "Scheduler.h"
 #include "tao/ORB.h"
 #include "ace/Atomic_Op.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTScheduling/Request_Interceptor.h"
 
+#include "tao/IOP_IORC.h"
+
 TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var current_obj =
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index 14c947939fb..a1d655029af 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"));
@@ -36,8 +37,10 @@ parse_args (int argc,
 #endif /* THREAD_CANCELLED */
 
 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;
@@ -45,13 +48,13 @@ 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;
 
-      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"
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index 73e333552ca..3cb3f08da75 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"
@@ -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/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index 42a390c4b01..51e136dffd5 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -5,15 +5,18 @@
 #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);
diff --git a/TAO/tests/RTScheduling/VoidData/test_client.cpp b/TAO/tests/RTScheduling/VoidData/test_client.cpp
index 087080ddbba..fdfb092a483 100644
--- a/TAO/tests/RTScheduling/VoidData/test_client.cpp
+++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp
@@ -2,15 +2,18 @@
 #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;
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 2532701858e..f8d3b4e0193 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 8f0bc9e45ef..0c250a584fe 100644
--- a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
@@ -14,7 +14,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 b763787544e..b747a2264b8 100644
--- a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
+++ b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
@@ -31,14 +31,6 @@ project(*Bounded_String) : taoexe {
   }
 }
 
-project(*UB_Arr_Seq): taoexe, boost_unit_test_framework {
-  exename = unbounded_array_sequence_ut
-  Source_Files {
-    mock_array.cpp
-    unbounded_array_sequence_ut.cpp
-  }
-}
-
 project(*Obj_Ref_Seq_Elem): taoexe, boost_unit_test_framework {
   exename = object_reference_sequence_element_ut
   Source_Files {
diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
index 30082a9d4c9..19741a165f2 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
new file mode 100644
index 00000000000..8225e59f89a
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
@@ -0,0 +1,105 @@
+#ifndef guard_bounded_basic_string_sequence_hpp
+#define guard_bounded_basic_string_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement bounded sequences for strings and wide-strings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "bounded_reference_allocation_traits.hpp"
+#include "string_traits.hpp"
+#include "generic_sequence.hpp"
+#include "string_sequence_element.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename charT, CORBA::ULong MAX>
+class bounded_basic_string_sequence
+{
+public:
+  typedef charT character_type;
+  typedef charT * value_type;
+  typedef charT const * const_value_type;
+
+  typedef details::string_traits<charT,true> element_traits;
+  typedef details::bounded_reference_allocation_traits<value_type,element_traits,MAX,true> allocation_traits;
+
+  typedef details::string_sequence_element<element_traits> element_type;
+
+  typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
+
+  inline bounded_basic_string_sequence()
+    : impl_()
+  {}
+  inline bounded_basic_string_sequence(
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release)
+    : impl_(MAX, length, data, release)
+  {}
+  /* Use default ctor, operator= and dtor */
+  inline CORBA::ULong maximum() const {
+    return impl_.maximum();
+  }
+  inline CORBA::Boolean release() const {
+    return impl_.release();
+  }
+  inline CORBA::ULong length() const {
+    return impl_.length();
+  }
+
+  inline void length(CORBA::ULong length) {
+    implementation_type::range::check_length(length, MAX);
+    impl_.length(length);
+  }
+  inline const_value_type operator[](CORBA::ULong i) const {
+    return impl_[i];
+  }
+  inline element_type operator[](CORBA::ULong i) {
+    return element_type(impl_[i], release());
+  }
+  inline const_value_type const * get_buffer() const {
+    return impl_.get_buffer();
+  }
+  inline void replace(
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false) {
+    impl_.replace(MAX, length, data, release);
+  }
+  inline value_type * get_buffer(CORBA::Boolean orphan = false) {
+    return impl_.get_buffer(orphan);
+  }
+  inline void swap(bounded_basic_string_sequence & rhs) throw() {
+    impl_.swap(rhs.impl_);
+  }
+
+  static value_type * allocbuf(CORBA::ULong maximum)
+  {
+    return implementation_type::allocbuf(maximum);
+  }
+  static value_type * allocbuf() {
+    return implementation_type::allocbuf(MAX);
+  }
+  static void freebuf(value_type * buffer)
+  {
+    implementation_type::freebuf(buffer);
+  }
+
+private:
+  implementation_type impl_;
+};
+
+} // 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
new file mode 100644
index 00000000000..184b8f7df6a
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
@@ -0,0 +1,102 @@
+#ifndef guard_bounded_object_reference_sequence_hpp
+#define guard_bounded_object_reference_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement bounded sequences for object references.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "bounded_reference_allocation_traits.hpp"
+#include "object_reference_traits.hpp"
+#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>
+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::bounded_reference_allocation_traits<value_type,element_traits,MAX,true> allocation_traits;
+
+  typedef details::object_reference_sequence_element<element_traits> element_type;
+
+  typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
+
+  inline bounded_object_reference_sequence()
+    : impl_()
+  {}
+  inline bounded_object_reference_sequence(
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release)
+    : impl_(MAX, length, data, release)
+  {}
+
+  /* Use default ctor, operator= and dtor */
+  inline CORBA::ULong maximum() const {
+    return impl_.maximum();
+  }
+  inline CORBA::Boolean release() const {
+    return impl_.release();
+  }
+  inline CORBA::ULong length() const {
+    return impl_.length();
+  }
+
+  inline void length(CORBA::ULong length) {
+    implementation_type::range::check_length(length, MAX);
+    impl_.length(length);
+  }
+  inline const_value_type operator[](CORBA::ULong i) const {
+    return impl_[i];
+  }
+  inline element_type operator[](CORBA::ULong i) {
+    return element_type(impl_[i], release());
+  }
+  inline const_value_type const * get_buffer() const {
+    return impl_.get_buffer();
+  }
+  inline void replace(
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false) {
+    impl_.replace(MAX, length, data, release);
+  }
+  inline value_type * get_buffer(CORBA::Boolean orphan = false) {
+    return impl_.get_buffer(orphan);
+  }
+  inline void swap(bounded_object_reference_sequence & rhs) throw() {
+    impl_.swap(rhs.impl_);
+  }
+
+  static value_type * allocbuf(CORBA::ULong maximum)
+  {
+    return implementation_type::allocbuf(maximum);
+  }
+  static void freebuf(value_type * buffer)
+  {
+    implementation_type::freebuf(buffer);
+  }
+
+
+private:
+  implementation_type impl_;
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_bounded_object_reference_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
new file mode 100644
index 00000000000..193a6657f7a
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
@@ -0,0 +1,64 @@
+#ifndef guard_bounded_reference_allocation_traits_hpp
+#define guard_bounded_reference_allocation_traits_hpp
+/**
+ * @file
+ *
+ * @brief Details can be found in the documentation for
+ * TAO::details::generic_sequence 
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename T, class ref_traits, CORBA::ULong MAX, bool dummy>
+struct bounded_reference_allocation_traits
+{
+  typedef T value_type;
+  typedef ref_traits reference_traits;
+
+  inline static CORBA::ULong default_maximum()
+  {
+    return MAX;
+  }
+
+  inline static value_type * default_buffer_allocation()
+  {
+    return allocbuf(MAX);
+  }
+
+  inline static value_type * allocbuf(CORBA::ULong /* maximum */)
+  {
+    value_type * buffer = new value_type[MAX];
+    // no throw
+    reference_traits::zero_range(buffer, buffer + MAX);
+
+    return buffer;
+  }
+
+  inline static void freebuf(value_type * buffer)
+  {
+    reference_traits::release_range(buffer, buffer + MAX);
+    delete[] buffer;
+  }
+
+  inline static CORBA::ULong maximum()
+  {
+    return MAX;
+  }
+};
+
+} // namespace details
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_bounded_reference_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
new file mode 100644
index 00000000000..c42738744bc
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
@@ -0,0 +1,41 @@
+#ifndef guard_bounded_string_sequence_hpp
+#define guard_bounded_string_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement bounded sequences for strings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "bounded_basic_string_sequence.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+template<CORBA::ULong MAX>
+class bounded_string_sequence
+  : public details::bounded_basic_string_sequence<char,MAX>
+{
+public:
+  inline bounded_string_sequence()
+    : details::bounded_basic_string_sequence<char,MAX>()
+  {}
+  inline bounded_string_sequence(
+      CORBA::ULong length,
+      char * * data,
+      CORBA::Boolean release = false)
+    : details::bounded_basic_string_sequence<char,MAX>(
+        length, data, release)
+  {}
+};
+
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_bounded_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
new file mode 100644
index 00000000000..e7727f449de
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
@@ -0,0 +1,59 @@
+#ifndef guard_bounded_value_allocation_traits_hpp
+#define guard_bounded_value_allocation_traits_hpp
+/**
+ * @file
+ *
+ * @brief Details can be found in the documentation for
+ * TAO::details::generic_sequence 
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename T, CORBA::ULong MAX, bool dummy>
+struct bounded_value_allocation_traits
+{
+  typedef T value_type;
+
+  inline static CORBA::ULong default_maximum()
+  {
+    return MAX;
+  }
+
+  inline static value_type * default_buffer_allocation()
+  {
+    return allocbuf(MAX);
+  }
+
+  inline static value_type * allocbuf(CORBA::ULong /* maximum */)
+  {
+    return new value_type[MAX];
+  }
+
+  inline static void freebuf(value_type * buffer)
+  {
+    delete[] buffer;
+  }
+
+  inline static CORBA::ULong maximum()
+  {
+    return MAX;
+  }
+  /* static CORBA::ULong const MAXIMUM = MAX; */
+};
+
+} // 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
new file mode 100644
index 00000000000..994122e22ce
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
@@ -0,0 +1,98 @@
+#ifndef guard_bounded_value_sequence_hpp
+#define guard_bounded_value_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement bounded sequences for types with value-like
+ * semantics.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "bounded_value_allocation_traits.hpp"
+#include "value_traits.hpp"
+#include "generic_sequence.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+template<class T, CORBA::ULong MAX>
+class bounded_value_sequence
+{
+public:
+  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;
+  typedef details::value_traits<value_type,true> element_traits;
+  typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
+
+  inline bounded_value_sequence()
+    : impl_()
+  {}
+  inline bounded_value_sequence(
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false)
+    : impl_(MAX, length, data, release)
+  {}
+  /* Use default ctor, operator= and dtor */
+  inline CORBA::ULong maximum() const {
+    return impl_.maximum();
+  }
+  inline CORBA::Boolean release() const {
+    return impl_.release();
+  }
+  inline CORBA::ULong length() const {
+    return impl_.length();
+  }
+  inline void length(CORBA::ULong length) {
+    implementation_type::range::check_length(length, MAX);
+    impl_.length(length);
+  }
+  inline value_type const & operator[](CORBA::ULong i) const {
+    return impl_[i];
+  }
+  inline value_type & operator[](CORBA::ULong i) {
+    return impl_[i];
+  }
+  inline void replace(
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false) {
+    impl_.replace(MAX, length, data, release);
+  }
+  inline value_type const * get_buffer() const {
+    return impl_.get_buffer();
+  }
+  inline value_type * get_buffer(CORBA::Boolean orphan = false) {
+    return impl_.get_buffer(orphan);
+  }
+  inline void swap(bounded_value_sequence & rhs) throw() {
+    impl_.swap(rhs.impl_);
+  }
+  static value_type * allocbuf(CORBA::ULong maximum) {
+    return implementation_type::allocbuf(maximum);
+  }
+  static value_type * allocbuf() {
+    return implementation_type::allocbuf(MAX);
+  }
+  static void freebuf(value_type * buffer)
+  {
+    implementation_type::freebuf(buffer);
+  }
+
+private:
+  implementation_type impl_;
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_bounded_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
new file mode 100644
index 00000000000..8fff36ae5ea
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
@@ -0,0 +1,42 @@
+#ifndef guard_bounded_wstring_sequence_hpp
+#define guard_bounded_wstring_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement bounded sequences for wstrings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+
+#include "bounded_basic_string_sequence.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+template<CORBA::ULong MAX>
+class bounded_wstring_sequence
+  : public details::bounded_basic_string_sequence<CORBA::WChar,MAX>
+{
+public:
+  inline bounded_wstring_sequence()
+    : details::bounded_basic_string_sequence<CORBA::WChar,MAX>()
+  {}
+  inline bounded_wstring_sequence(
+      CORBA::ULong length,
+      CORBA::WChar * * data,
+      CORBA::Boolean release = false)
+    : details::bounded_basic_string_sequence<CORBA::WChar,MAX>(
+        length, data, release)
+  {}
+};
+
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_bounded_wstring_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
new file mode 100644
index 00000000000..a5b933f9855
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
@@ -0,0 +1,263 @@
+#ifndef guard_generic_sequence_hpp
+#define guard_generic_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement the generic version of CORBA sequences.
+ *
+ * All CORBA sequences are based on this class template.  The behavior
+ * of this class is controlled by two sets of traits.  First, the
+ * ALLOCATION_TRAITS control how buffers are allocated and
+ * initialized.  Since this is where most of the variation between
+ * unbounded and bounded sequences is found, the ALLOCATION_TRAITS can
+ * be thought as the bounded aspect of the sequence.
+ *
+ * Second, the element traits control how are elements copied,
+ * initialized and released.  Value-like types, such as integers and
+ * structures, have trivial initialization and release requirements
+ * (their constructor/destructors do the job!)   But reference-like
+ * types, such as strings and object references, have more complicated
+ * requirements.  This is yet another aspect of the sequences, we can
+ * call it the "element copy semantics" or something.
+ *
+ * Oh, and let us not forget the type that the sequences encapsulates.
+ *
+ * The intent is not for sequences to simply derive or instantiate this
+ * type.  Instead, different each sequence type is written using
+ * composition.  They instantiate a generic sequence with the correct
+ * traits, and implement the adapt the generic sequence interface to
+ * whatever requirements the spec may impose.  For example, replace()
+ * has different number of arguments in bounded vs. unbounded
+ * sequences, and operator[] returns different types depending on the
+ * underlying type of the sequence.
+ *
+ * This class offers the strong exception-safety guarantee, as long as
+ * destructors and release operations do not throw.
+ *
+ * This class is not thread-safe.  Thread-safe collections are mostly
+ * useless anyways.
+ *
+ * In general the performance characteristics of the class depends on
+ * the traits.  Obviously, they can only be expressed on the number of
+ * element constructor and destructor calls.  If the constructor takes
+ * O(K) time that is not the sequence fault!
+ *
+ * All accessors are O(1), single-element modifiers are O(1), multiple
+ * element modifiers are O(n + m) where n is the number of elements
+ * originally in the sequence, and m is the number of elements left in
+ * the sequence afterwards.
+ *
+ * Beware:
+ * - get_buffer(true) may modify multiple elements
+ * - length(CORBA::ULong) may modify multiple elements!
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "range_checking.hpp"
+
+#include <algorithm>
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename T,
+         class ALLOCATION_TRAITS,
+         class ELEMENT_TRAITS>
+class generic_sequence
+{
+public:
+  typedef T value_type;
+  typedef ALLOCATION_TRAITS allocation_traits;
+  typedef ELEMENT_TRAITS element_traits;
+  typedef range_checking<value_type,true> range;
+
+  generic_sequence()
+    : maximum_(allocation_traits::default_maximum())
+    , length_(0)
+    , buffer_(allocation_traits::default_buffer_allocation())
+    , release_(true)
+  {
+  }
+
+  explicit generic_sequence(CORBA::ULong maximum)
+    : maximum_(maximum)
+    , length_(0)
+    , buffer_(allocbuf(maximum_))
+    , release_(true)
+  {
+  }
+
+  generic_sequence(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release)
+    : maximum_(maximum)
+    , length_(length)
+    , buffer_(data)
+    , release_(release)
+  {
+  }
+
+  generic_sequence(generic_sequence const & rhs)
+    : maximum_(0)
+    , length_(0)
+    , buffer_(0)
+    , release_(false)
+  {
+    generic_sequence tmp(rhs.maximum_);
+    tmp.length_ = rhs.length_;
+    element_traits::copy_range(
+        rhs.buffer_, rhs.buffer_ + rhs.length_, tmp.buffer_);
+    swap(tmp);
+  }
+
+  generic_sequence & operator=(generic_sequence const & rhs)
+  {
+    generic_sequence tmp(rhs);
+    swap(tmp);
+    return * this;
+  }
+
+  ~generic_sequence()
+  {
+    if (release_)
+    {
+      freebuf(buffer_);
+    }
+  }
+
+  inline CORBA::ULong maximum() const
+  {
+    return maximum_;
+  }
+
+  inline CORBA::Boolean release() const
+  {
+    return release_;
+  }
+
+  inline CORBA::ULong length() const
+  {
+    return length_;
+  }
+
+  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;
+    }
+
+    generic_sequence 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);
+  }
+
+  value_type const & operator[](CORBA::ULong i) const
+  {
+    range::check(i, length_, maximum_, "operator[]() const");
+    return buffer_[i];
+  }
+
+  value_type & operator[](CORBA::ULong i)
+  {
+    range::check(i, length_, maximum_, "operator[]() non-const");
+    return buffer_[i];
+  }
+
+  void replace(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release)
+  {
+    generic_sequence tmp(maximum, length, data, release);
+    swap(tmp);
+  }
+
+  value_type const * get_buffer() const
+  {
+    if (buffer_ == 0)
+    {
+      buffer_ = allocbuf(maximum_);
+    }
+    return buffer_;
+  }
+
+  value_type * get_buffer(CORBA::Boolean orphan)
+  {
+    if (orphan && !release_)
+    {
+      return 0;
+    }
+    if (buffer_ == 0)
+    {
+      buffer_ = allocbuf(maximum_);
+    }
+    if (!orphan)
+    {
+      return buffer_;
+    }
+
+    generic_sequence tmp;
+    swap(tmp);
+    tmp.release_ = false;
+
+    return tmp.buffer_;
+  }
+
+  void swap(generic_sequence & rhs) throw()
+  {
+    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);
+  }
+
+private:
+  CORBA::ULong maximum_;
+  CORBA::ULong length_;
+  mutable value_type * buffer_;
+  CORBA::Boolean release_;
+};
+
+} // namespace details
+} // namespace CORBA
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_generic_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp b/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp
new file mode 100644
index 00000000000..e5437a1a51e
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp
@@ -0,0 +1,35 @@
+/**
+ * @file
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@atdesk.com>
+ */
+#include "mock_stream.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+call_counter mock_stream::serialize_calls;
+call_counter mock_stream::deserialize_calls;
+
+mock_stream::
+~mock_stream()
+{
+}
+
+CORBA::ULong
+mock_stream::length () const
+{
+  return 100;
+}
+
+CORBA::Boolean operator<< (mock_stream &, const CORBA::ULong)
+{
+  return true;
+}
+CORBA::Boolean operator>> (mock_stream &, CORBA::ULong &)
+{
+  return true;
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp b/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp
new file mode 100644
index 00000000000..8bd2ef1a5d1
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp
@@ -0,0 +1,40 @@
+#ifndef guard_mock_stream_hpp
+#define guard_mock_stream_hpp
+/**
+ * @file
+ *
+ * @brief Mock an stream
+ *
+ * $Id$
+ *
+ * @author Johnny Willemsen
+ */
+#include "ace/config-all.h"
+
+#include "testing_counters.hpp"
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class mock_stream
+ *
+ * @brief Implement a concrete class with the right interface for a stream.
+ */
+class mock_stream
+{
+public:
+  ~mock_stream();
+
+  CORBA::ULong length () const;
+
+  static call_counter serialize_calls;
+  static call_counter deserialize_calls;
+};
+
+CORBA::Boolean operator<< (mock_stream &, const CORBA::ULong);
+CORBA::Boolean operator>> (mock_stream &, CORBA::ULong &);
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_mock_stream_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
new file mode 100644
index 00000000000..ec6a58ad65e
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
@@ -0,0 +1,126 @@
+#ifndef guard_object_reference_sequence_element_hpp
+#define guard_object_reference_sequence_element_hpp
+/**
+ * @file
+ *
+ * @brief Implement the type returned by operator[] in object_reference
+ * sequences.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename traits>
+class object_reference_sequence_element
+{
+public:
+  typedef typename traits::object_type object_reference_type;
+  typedef object_reference_type * value_type;
+  typedef object_reference_type const * const_value_type;
+  typedef typename traits::object_type_var object_reference_var;
+
+private:
+  inline object_reference_sequence_element<traits> & pseudo_copy_swap(
+      object_reference_var & rhs)
+  {
+    if (release())
+    {
+      traits::release(*element_);
+    }
+    *element_ = rhs._retn();
+    return *this;
+  }
+
+public:
+  object_reference_sequence_element(
+      value_type & e, CORBA::Boolean release)
+    : element_(&e)
+    , release_(release)
+  {
+  }
+
+  object_reference_sequence_element(
+      object_reference_sequence_element const & rhs)
+    : element_(rhs.element_)
+    , release_(rhs.release_)
+  {
+  }
+
+  ~object_reference_sequence_element()
+  {
+  }
+
+  object_reference_sequence_element & operator=(
+      object_reference_var const & rhs)
+  {
+    object_reference_var tmp(rhs);
+    return pseudo_copy_swap(tmp);
+  }
+
+  object_reference_sequence_element & operator=(
+      object_reference_sequence_element const & rhs)
+  {
+    object_reference_var tmp(traits::duplicate(*rhs.element_));
+    return pseudo_copy_swap(tmp);
+  }
+
+  object_reference_sequence_element & operator=(value_type rhs)
+  {
+    object_reference_var tmp(rhs);
+    return pseudo_copy_swap(tmp);
+  }
+
+  inline operator value_type()
+  {
+    return *element_;
+  }
+
+  inline operator const_value_type() const
+  {
+    return *element_;
+  }
+
+  inline value_type operator->()
+  {
+    return *element_;
+  }
+
+  inline value_type operator->() const
+  {
+    return *element_;
+  }
+
+  void swap(object_reference_sequence_element & rhs)
+  {
+    std::swap(element_, rhs.element_);
+    std::swap(release_, rhs.release_);
+  }
+
+  inline CORBA::Boolean release() const
+  {
+    return release_;
+  }
+
+private:
+  // This function is not implemented
+  object_reference_sequence_element();
+
+private:
+  value_type * element_;
+  CORBA::Boolean release_;
+};
+
+} // 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_traits.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
new file mode 100644
index 00000000000..780a530ea00
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
@@ -0,0 +1,84 @@
+#ifndef guard_object_reference_traits_hpp
+#define guard_object_reference_traits_hpp
+/**
+ * @file
+ *
+ * @brief Implement the element manipulation traits for object
+ *        reference types.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "object_reference_traits_base.hpp"
+
+#include <algorithm>
+#include <functional>
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<class object_t, class object_t_var, class derived>
+struct object_reference_traits_decorator
+{
+  typedef object_t object_type;
+  typedef object_type * value_type;
+  typedef object_type const * const_value_type;
+  typedef object_t_var object_type_var;
+
+  inline static void zero_range(
+      object_type ** begin, object_type ** end)
+  {
+    std::fill(begin, end, derived::nil());
+  }
+
+  inline static void initialize_range(
+      object_type ** begin, object_type ** end)
+  {
+    std::generate(begin, end, &derived::default_initializer);
+  }
+
+  inline static void copy_range(
+      object_type ** begin, object_type ** end, object_type ** dst)
+  {
+    std::transform(begin, end, dst, &derived::duplicate);
+  }
+
+  inline static void release_range(
+      object_type ** begin, object_type ** end)
+  {
+    std::for_each(begin, end, &derived::release);
+  }
+
+  inline static object_type const * initialize_if_zero(object_type * & element)
+  {
+    if (element == 0)
+    {
+      element = derived::nil();
+    }
+    return element;
+  }
+};
+
+template<typename object_t, typename object_t_var, 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> >
+{
+#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
new file mode 100644
index 00000000000..b048719abc5
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
@@ -0,0 +1,55 @@
+#ifndef object_reference_traits_base_hpp
+#define object_reference_traits_base_hpp
+/**
+ * @file
+ *
+ * @brief Base class for the object reference traits.
+ *
+ * $Id$
+ *
+ * @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>
+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;
+
+  inline static void release(object_type * object)
+  {
+    TAO::Objref_Traits<object_type>::release(object);
+  }
+
+  inline static object_type * duplicate(object_type * object)
+  {
+    return TAO::Objref_Traits<object_type>::duplicate(object);
+  }
+
+  inline static object_type * nil()
+  {
+    return TAO::Objref_Traits<object_type>::nil();
+  }
+
+  inline static object_type * default_initializer()
+  {
+    return nil();
+  }
+};
+
+} // namespace details
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // object_reference_traits_base_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/range_checking.hpp b/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
new file mode 100644
index 00000000000..85a71af0abc
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
@@ -0,0 +1,149 @@
+#ifndef guard_range_checking_hpp
+#define guard_range_checking_hpp
+/**
+ * @file
+ *
+ * @brief Details can be found in the documentation for
+ * TAO::details::generic_sequence
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+/**
+ * @struct range_checking
+ *
+ * @brief Configurable traits to tradeoff safety vs. performance in
+ *        the implementation of TAO sequences.
+ *
+ * The CORBA specification grants certain latitude to implementors by
+ * not defining the behavior of sequences under certain conditions.
+ * Probably the most clear example is the operator[] access, where the
+ * application <b>must</b> set the length to a high enough value
+ * before using the operator[].
+ *
+ * Implementors that cater to high-performance applications tend to
+ * exploit this latitude to the extreme, basically reasoning that
+ * correct applications will behave normally, while incorrect
+ * applications will crash, but those crashes will be detected during
+ * development/testing.
+ *
+ * Realizing that this may be a bad tradeoff some implementors offer
+ * compile-time hooks to control the behavior of sequences when used
+ * improperly, some implementors may go as far as using run-time
+ * hooks.
+ *
+ * The implementation of sequences calls the following template class
+ * in points where the application may trigger undefined behavior.
+ * The application developer can use partial (or full) template
+ * specialization to introduce her own code at these critical points.
+ *
+ * Some examples may help, suppose you want to change your application
+ * so for all sequence types the operator[] raises an exception if the
+ * index is out of range.  Then you would provide the following
+ * (partial) template specialization:
+ *
+ * <PRE>
+ * template<typename T>
+ * struct range_checking<T,true> {
+ *   void check(CORBA::ULong index, CORBA::ULong length) {
+ *     if (index < length)
+ *       return;
+ *     throw std::range_error("CORBA sequence range error");
+ *   };
+ * ...
+ * ..
+ * };
+ * </PRE>
+ *
+ * This specialization must be introduced before any sequence code is
+ * seen, therefore, the application would also need to define the
+ * following macro in their $ACE_ROOT/ace/config.h file:
+ *
+ * - #define TAO_USER_DEFINED_SEQUENCE_SAFETY_TRAITS_INCLUDE "<filename here>"
+ *
+ * Likewise, if the application only wanted to check the range for a
+ * special type, say some structure MyStruct, then they would provide
+ * a full specialization.  Just for giggles, we will also introduce
+ * run-time controls to this example:
+ *
+ * <PRE>
+ * template<>
+ * struct safety_traits<tao::details::value_traits<MyStruct>,true> {
+ *   bool enable_range_checking;
+ *   void check_range(CORBA::ULong index, CORBA::ULong length) {
+ *     if (!enable_range_checking || index < length)
+ *       return;
+ *     throw std::range_error("CORBA sequence range error");
+ *   };
+ * ...
+ * ..
+ * };
+ * </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
+ *       sequences would get the same behavior:
+ *       // IDL
+ *       typedef sequence<MyStruct> MyStructSequence;
+ *       typedef sequence<MyStruct> MyStructList;
+ *
+ * @todo There is no way to control behavior on a per-sequence basis,
+ *       i.e. to have some sequences of longs checked while others are
+ *       not.  This is easy to fix, simply:
+ *       - make all members of safety_traits non-static
+ *       - have each sequence contain their own instance of
+ *         safety_traits
+ *       - grant users read/write access to the safety_traits of each
+ *         sequence
+ *       but there are footprint consequences to that approach.  Until
+ *       there is more demand to justify the cost, I will not
+ *       implement such a change.
+ */
+template<typename T, bool dummy>
+struct range_checking
+{
+  typedef T value_type;
+
+  inline static void check(
+      CORBA::ULong /* index */,
+      CORBA::ULong /* length */,
+      CORBA::ULong /* maximum */,
+      char const * /* function_name */)
+  {
+    // Applications and tests can specialize this function to define
+    // their own behavior
+  }
+
+  inline static void check_length(
+      CORBA::ULong & /* new_length */,
+      CORBA::ULong /* maximum */)
+  {
+    /*
+    if (maximum < new_length)
+      new_length = maximum;
+    */
+  }
+};
+
+} // 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
+
+#endif // guard_range_checking_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
new file mode 100644
index 00000000000..9ce72bb0ece
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
@@ -0,0 +1,123 @@
+#ifndef guard_string_sequence_element_hpp
+#define guard_string_sequence_element_hpp
+/**
+ * @file
+ *
+ * @brief Implement the type returned by operator[] in string
+ * sequences.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename traits>
+class string_sequence_element
+{
+public:
+  typedef typename traits::char_type character_type;
+  typedef character_type * value_type;
+  typedef character_type const * const_value_type;
+  typedef typename traits::string_var string_var;
+  typedef typename traits::string_mgr string_mgr;
+
+private:
+  inline string_sequence_element<traits> & pseudo_copy_swap(
+      string_var & rhs)
+  {
+    if (release())
+    {
+      traits::release(*element_);
+    }
+    *element_ = rhs._retn();
+    return *this;
+  }
+
+public:
+  string_sequence_element(
+      value_type & e, CORBA::Boolean release)
+    : element_(&e)
+    , release_(release)
+  {
+  }
+
+  string_sequence_element(
+      string_sequence_element const & rhs)
+    : element_(rhs.element_)
+    , release_(rhs.release_)
+  {
+  }
+
+  ~string_sequence_element()
+  {
+  }
+
+  string_sequence_element & operator=(const_value_type rhs)
+  {
+    string_var tmp(rhs);
+    return pseudo_copy_swap(tmp);
+  }
+
+  string_sequence_element & operator=(value_type rhs)
+  {
+    string_var tmp(rhs);
+    return pseudo_copy_swap(tmp);
+  }
+
+  string_sequence_element & operator=(string_sequence_element const & rhs)
+  {
+    string_var tmp(static_cast<const_value_type>(rhs));
+    return pseudo_copy_swap(tmp);
+  }
+
+  string_sequence_element & operator=(string_var const & rhs)
+  {
+    string_var tmp(rhs);
+    return pseudo_copy_swap(tmp);
+  }
+
+  string_sequence_element & operator=(string_mgr const & rhs)
+  {
+    string_var tmp(rhs.in());
+    return pseudo_copy_swap(tmp);
+  }
+
+  inline operator const_value_type() const
+  {
+    return *element_;
+  }
+
+  void swap(string_sequence_element & rhs)
+  {
+    std::swap(element_, rhs.element_);
+    std::swap(release_, rhs.release_);
+  }
+
+  CORBA::Boolean release() const
+  {
+    return release_;
+  }
+
+private:
+  // This function is not implemented
+  string_sequence_element();
+
+private:
+  value_type * element_;
+  CORBA::Boolean release_;
+};
+
+} // namespace details
+} // namespace CORBA
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_string_sequence_element_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/string_traits.hpp b/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
new file mode 100644
index 00000000000..71d4f2fb7b6
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
@@ -0,0 +1,76 @@
+#ifndef guard_string_traits_hpp
+#define guard_string_traits_hpp
+/**
+ * @file
+ *
+ * @brief Implement the element manipulation traits for string types.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "string_traits_base.hpp"
+
+#include <algorithm>
+#include <functional>
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename char_type, class derived>
+struct string_traits_decorator
+{
+  typedef char_type * value_type;
+  typedef char_type const * const_value_type;
+
+  inline static void zero_range(
+      char_type ** begin, char_type ** end)
+  {
+    std::fill(begin, end, static_cast<char_type*>(0));
+  }
+
+  inline static void initialize_range(
+      char_type ** begin, char_type ** end)
+  {
+    std::generate(begin, end, &derived::default_initializer);
+  }
+
+  inline static void copy_range(
+      char_type ** begin, char_type ** end, char_type ** dst)
+  {
+    std::transform(begin, end, dst, &derived::duplicate);
+  }
+
+  inline static void release_range(
+      char_type ** begin, char_type ** end)
+  {
+    std::for_each(begin, end, &derived::release);
+  }
+
+  inline static char_type const * initialize_if_zero(char_type * & element)
+  {
+    if (element == 0)
+    {
+      element = derived::default_initializer();
+    }
+    return element;
+  }
+};
+
+template<class charT, bool dummy>
+struct string_traits
+  : public string_traits_base<charT>
+  , public string_traits_decorator<charT,string_traits<charT,dummy> >
+{
+};
+
+} // 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
new file mode 100644
index 00000000000..7f1c8936207
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
@@ -0,0 +1,80 @@
+#ifndef guard_string_traits_base_hpp
+#define guard_string_traits_base_hpp
+/**
+ * @file
+ *
+ * @brief Isolate the string_traits from the accidental differences
+ * between wstring and string.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "tao/CORBA_String.h"
+#include "tao/Managed_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+  namespace details
+  {
+
+    template<typename charT>
+    struct string_traits_base
+    {
+    };
+
+    template<>
+    struct string_traits_base<char>
+    {
+      typedef char char_type;
+      typedef CORBA::String_var string_var;
+      typedef TAO_String_Manager string_mgr;
+
+      inline static char_type * default_initializer()
+      {
+        return CORBA::string_dup("");
+      }
+
+      inline static char_type * duplicate(char_type const * s)
+      {
+        return CORBA::string_dup(s);
+      }
+
+      inline static void release(char_type * s)
+      {
+        CORBA::string_free(s);
+      }
+    };
+
+    template<>
+    struct string_traits_base<CORBA::WChar>
+    {
+      typedef CORBA::WChar char_type;
+      typedef CORBA::WString_var string_var;
+      typedef TAO_WString_Manager string_mgr;
+
+      inline static char_type * default_initializer()
+      {
+        static CORBA::WChar empty[] = { 0 };
+        return CORBA::wstring_dup(empty);
+      }
+
+      inline static char_type * duplicate(char_type const * s)
+      {
+        return CORBA::wstring_dup(s);
+      }
+
+      inline static void release(char_type * s)
+      {
+        CORBA::wstring_free(s);
+      }
+    };
+
+  } // namespace details
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_string_traits_base_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
new file mode 100644
index 00000000000..b8e2191d860
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
@@ -0,0 +1,108 @@
+#ifndef guard_unbounded_basic_string_sequence_hpp
+#define guard_unbounded_basic_string_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement unbounded sequences for strings and wide-strings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "unbounded_reference_allocation_traits.hpp"
+#include "string_traits.hpp"
+#include "generic_sequence.hpp"
+#include "string_sequence_element.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename charT>
+class unbounded_basic_string_sequence
+{
+public:
+  typedef charT character_type;
+  typedef character_type * value_type;
+  typedef character_type const * const_value_type;
+
+  typedef details::string_traits<character_type,true> element_traits;
+  typedef details::unbounded_reference_allocation_traits<value_type,element_traits,true> allocation_traits;
+
+  typedef details::string_sequence_element<element_traits> element_type;
+
+  typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
+
+  inline unbounded_basic_string_sequence()
+    : impl_()
+  {}
+  inline explicit unbounded_basic_string_sequence(CORBA::ULong maximum)
+    : impl_(maximum)
+  {}
+  inline unbounded_basic_string_sequence(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release)
+    : impl_(maximum, length, data, release)
+  {}
+
+  /* Use default ctor, operator= and dtor */
+  inline CORBA::ULong maximum() const {
+    return impl_.maximum();
+  }
+  inline CORBA::Boolean release() const {
+    return impl_.release();
+  }
+  inline CORBA::ULong length() const {
+    return impl_.length();
+  }
+
+  inline void length(CORBA::ULong length) {
+    impl_.length(length);
+  }
+  inline const_value_type operator[](CORBA::ULong i) const {
+    return impl_[i];
+  }
+  inline element_type operator[](CORBA::ULong i) {
+    return element_type(impl_[i], release());
+  }
+  inline const_value_type const * get_buffer() const {
+    return impl_.get_buffer();
+  }
+  inline void replace(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false) {
+    impl_.replace(maximum, length, data, release);
+  }
+  inline value_type * get_buffer(CORBA::Boolean orphan = false) {
+    return impl_.get_buffer(orphan);
+  }
+  inline void swap(unbounded_basic_string_sequence & rhs) throw() {
+    impl_.swap(rhs.impl_);
+  }
+
+  static value_type * allocbuf(CORBA::ULong maximum)
+  {
+    return implementation_type::allocbuf(maximum);
+  }
+  static void freebuf(value_type * buffer)
+  {
+    implementation_type::freebuf(buffer);
+  }
+
+
+private:
+  implementation_type impl_;
+};
+
+} // namespace details
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_unbounded_basic_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
new file mode 100644
index 00000000000..4d095a7b9e8
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
@@ -0,0 +1,105 @@
+#ifndef guard_unbounded_object_reference_sequence_hpp
+#define guard_unbounded_object_reference_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement unbounded sequences for object references.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "unbounded_reference_allocation_traits.hpp"
+#include "object_reference_traits.hpp"
+#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>
+class unbounded_object_reference_sequence
+{
+public:
+  typedef object_t object_type;
+  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::unbounded_reference_allocation_traits<value_type,element_traits,true> allocation_traits;
+
+  typedef details::object_reference_sequence_element<element_traits> element_type;
+
+  typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
+
+  inline unbounded_object_reference_sequence()
+    : impl_()
+  {}
+  inline explicit unbounded_object_reference_sequence(CORBA::ULong maximum)
+    : impl_(maximum)
+  {}
+  inline unbounded_object_reference_sequence(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release)
+    : impl_(maximum, length, data, release)
+  {}
+
+  /* Use default ctor, operator= and dtor */
+  inline CORBA::ULong maximum() const {
+    return impl_.maximum();
+  }
+  inline CORBA::Boolean release() const {
+    return impl_.release();
+  }
+  inline CORBA::ULong length() const {
+    return impl_.length();
+  }
+
+  inline void length(CORBA::ULong length) {
+    impl_.length(length);
+  }
+  inline const_value_type operator[](CORBA::ULong i) const {
+    return impl_[i];
+  }
+  inline element_type operator[](CORBA::ULong i) {
+    return element_type(impl_[i], release());
+  }
+  inline const_value_type const * get_buffer() const {
+    return impl_.get_buffer();
+  }
+  inline void replace(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false) {
+    impl_.replace(maximum, length, data, release);
+  }
+  inline value_type * get_buffer(CORBA::Boolean orphan = false) {
+    return impl_.get_buffer(orphan);
+  }
+  inline void swap(unbounded_object_reference_sequence & rhs) throw() {
+    impl_.swap(rhs.impl_);
+  }
+
+  static value_type * allocbuf(CORBA::ULong maximum)
+  {
+    return implementation_type::allocbuf(maximum);
+  }
+  static void freebuf(value_type * buffer)
+  {
+    implementation_type::freebuf(buffer);
+  }
+
+
+private:
+  implementation_type impl_;
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_unbounded_object_reference_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
new file mode 100644
index 00000000000..043f24add9a
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
@@ -0,0 +1,284 @@
+#ifndef guard_unbounded_octet_sequence_hpp
+#define guard_unbounded_octet_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement octet sequences
+ *
+ * $Id$
+ *
+ * @author Johnny Willemsen
+ */
+#include "tao/orbconf.h"
+
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
+
+#include "unbounded_value_allocation_traits.hpp"
+#include "value_traits.hpp"
+#include "unbounded_value_sequence.hpp"
+#include "range_checking.hpp"
+
+#include "tao/Basic_Types.h"
+#include "ace/Message_Block.h"
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+template<>
+class unbounded_value_sequence<CORBA::Octet>
+{
+public:
+  typedef CORBA::Octet value_type;
+  typedef CORBA::Octet element_type;
+  typedef CORBA::Octet const const_value_type;
+
+  typedef details::unbounded_value_allocation_traits<value_type,true> allocation_traits;
+  typedef details::value_traits<value_type,true> element_traits;
+  typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
+  typedef details::range_checking<value_type,true> range;
+
+  inline unbounded_value_sequence<CORBA::Octet>()
+    : maximum_ (allocation_traits::default_maximum())
+    , length_ (0)
+    , buffer_ (allocation_traits::default_buffer_allocation())
+    , release_ (true)
+    , mb_ (0)
+  {}
+  inline explicit unbounded_value_sequence<CORBA::Octet>(CORBA::ULong maximum)
+    : maximum_(maximum)
+    , length_(0)
+    , buffer_(allocbuf(maximum_))
+    , release_(true)
+    , mb_ (0)
+  {}
+  inline unbounded_value_sequence<CORBA::Octet>(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false)
+    : maximum_ (maximum),
+      length_ (length),
+      buffer_ (data),
+      release_ (release),
+      mb_ (0)
+  {}
+  inline ~unbounded_value_sequence<CORBA::Octet>() {
+    if (mb_)
+      ACE_Message_Block::release (mb_);
+    if (release_)
+      freebuf(buffer_);
+  }
+  /// Create a sequence of octets from a single message block (i.e. it
+  /// ignores any chaining in the meesage block).
+  inline unbounded_value_sequence<CORBA::Octet> (CORBA::ULong length,
+                                                 const ACE_Message_Block* mb)
+    : maximum_ (length)
+    , length_ (length)
+    , buffer_ (reinterpret_cast <CORBA::Octet *>(mb->rd_ptr ()))
+    , release_ (false)
+    ,  mb_(0) {
+    // Get the message block flags.
+    ACE_Message_Block::Message_Flags flg = mb->self_flags ();
+
+    // If the DONT_DELETE flag is disabled just a duplicate would
+    // help. If the DONT_DELETE flag is enabled a deep copy is needed as
+    // the contents would be on stack. Just incrementing the ref count
+    // on the stack based data block would only crash the program when
+    // the stack unwinds
+    if (ACE_BIT_DISABLED (flg,
+                          ACE_Message_Block::DONT_DELETE))
+      {
+        this->mb_ = ACE_Message_Block::duplicate (mb);
+      }
+    else
+      {
+        // As we are in CORBA mode, all the data blocks would be aligned
+        // on an 8 byte boundary
+        ACE_Message_Block msgb (*mb,
+                                ACE_CDR::MAX_ALIGNMENT);
+
+        // Get the base pointer of the incoming message block
+        char *start = ACE_ptr_align_binary (mb->base (),
+                                            ACE_CDR::MAX_ALIGNMENT);
+
+        // Get the read and write displacements in the incoming stream
+        size_t rd_pos = mb->rd_ptr () - start;
+        size_t wr_pos = mb->wr_ptr () - start;
+
+        this->mb_ = ACE_Message_Block::duplicate (&msgb);
+
+        this->mb_->rd_ptr (rd_pos);
+        this->mb_->wr_ptr (wr_pos);
+      }
+  }
+  inline CORBA::ULong maximum() const {
+    return maximum_;
+  }
+  inline CORBA::Boolean release() const {
+    return release_;
+  }
+  inline CORBA::ULong length() const {
+    return length_;
+  }
+  inline void length(CORBA::ULong length) {
+    if (length <= maximum_ || length <= length_)
+    {
+      if (length_ < length)
+      {
+        // TODO This code does not provide the strong-exception
+        //      guarantee, but it does provide the weak-exception
+        //      guarantee.  The problem would appear when
+        //      initialize_range() raises an exception after several
+        //      elements have been modified.  One could argue that
+        //      this problem is irrelevant, as the elements already
+        //      modified are unreachable to conforming applications.
+        element_traits::initialize_range(
+            buffer_ + length_, buffer_ + length);
+      }
+      length_ = length;
+      return;
+    }
+
+    unbounded_value_sequence<CORBA::Octet> tmp(length);
+    tmp.length_ = length;
+    element_traits::copy_range(
+        buffer_, buffer_ + length_, tmp.buffer_);
+    element_traits::initialize_range(
+        tmp.buffer_ + length_, tmp.buffer_ + length);
+    swap(tmp);
+  }
+  inline value_type const & operator[](CORBA::ULong i) const {
+    range::check(i, length_, maximum_, "operator[]() const");
+    return buffer_[i];
+  }
+  inline value_type & operator[](CORBA::ULong i) {
+    range::check(i, length_, maximum_, "operator[]() non-const");
+    return buffer_[i];
+  }
+  inline void replace(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false) {
+    unbounded_value_sequence<CORBA::Octet> tmp(maximum, length, data, release);
+    swap(tmp);
+  }
+  inline value_type const * get_buffer() const {
+    if (buffer_ == 0)
+      {
+        buffer_ = allocbuf(maximum_);
+      }
+    return buffer_;
+  }
+  inline value_type * get_buffer(CORBA::Boolean orphan = false) {
+    if (orphan && !release_)
+    {
+      return 0;
+    }
+    if (buffer_ == 0)
+    {
+      buffer_ = allocbuf(maximum_);
+    }
+    if (!orphan)
+    {
+      return buffer_;
+    }
+
+    unbounded_value_sequence<CORBA::Octet> tmp;
+    swap(tmp);
+    tmp.release_ = false;
+
+    return tmp.buffer_;
+  }
+  inline void swap(unbounded_value_sequence & rhs) throw() {
+    std::swap (mb_, rhs.mb_);
+    std::swap (maximum_, rhs.maximum_);
+    std::swap (length_, rhs.length_);
+    std::swap (buffer_, rhs.buffer_);
+    std::swap (release_, rhs.release_);
+  }
+  static value_type * allocbuf(CORBA::ULong maximum) {
+    return allocation_traits::allocbuf(maximum);
+  }
+  static void freebuf(value_type * buffer) {
+    allocation_traits::freebuf(buffer);
+  }
+
+  /// Returns the underlying message block, the caller must *not*
+  /// release the copy.
+  inline ACE_Message_Block* mb (void) const {
+    return mb_;
+  }
+
+  /// Replaces the current buffer with <mb>, using only <length> bytes.
+  /// It takes a duplicate of <mb> so the user still owns it.
+  inline void replace (CORBA::ULong length, const ACE_Message_Block* mb) {
+    unbounded_value_sequence<CORBA::Octet> s (length, mb);
+    swap (s);
+  }
+
+  unbounded_value_sequence<CORBA::Octet> (
+    const unbounded_value_sequence<CORBA::Octet> &rhs)
+    : maximum_ (0)
+    , length_ (0)
+    , buffer_(0)
+    , release_(false)
+    , mb_ (0)
+  {
+    unbounded_value_sequence<CORBA::Octet> tmp(rhs.maximum_);
+    tmp.length_ = rhs.length_;
+    if (rhs.mb_ == 0)
+      {
+        ACE_OS::memcpy (tmp.buffer_,
+                        rhs.buffer_,
+                        rhs.length_);
+      }
+    else
+      {
+        size_t offset = 0;
+        for (const ACE_Message_Block *i = rhs.mb_; i != 0; i = i->cont ())
+          {
+            ACE_OS::memcpy (tmp.buffer_ + offset,
+                            i->rd_ptr (),
+                            i->length ());
+
+            offset += i->length ();
+          }
+      }
+    swap(tmp);
+  }
+
+  unbounded_value_sequence<CORBA::Octet> &
+    operator= (const unbounded_value_sequence<CORBA::Octet> & rhs)
+  {
+    unbounded_value_sequence<CORBA::Octet> tmp(rhs);
+    swap(tmp);
+    return * this;
+  }
+
+private:
+  /// The maximum number of elements the buffer can contain.
+  CORBA::ULong maximum_;
+
+  /// The current number of elements in the buffer.
+  CORBA::ULong length_;
+
+  /// The buffer with all the elements, casting must be done in derived
+  /// classes.
+  mutable value_type * buffer_;
+
+  /// If true then the sequence should release the buffer when it is
+  /// destroyed.
+  CORBA::Boolean release_;
+  ACE_Message_Block* mb_;
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif
+
+#endif // guard_unbounded_octet_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
new file mode 100644
index 00000000000..2c5a2da2da2
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
@@ -0,0 +1,68 @@
+#ifndef guard_unbounded_reference_allocation_traits_hpp
+#define guard_unbounded_reference_allocation_traits_hpp
+/**
+ * @file
+ *
+ * @brief Details can be found in the documentation for
+ * TAO::details::generic_sequence 
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename T, class ref_traits, bool dummy>
+struct unbounded_reference_allocation_traits
+{
+  typedef T value_type;
+  typedef ref_traits reference_traits;
+
+  inline static CORBA::ULong default_maximum()
+  {
+    return 0;
+  }
+
+  inline static value_type * default_buffer_allocation()
+  {
+    return 0;
+  }
+
+  inline static value_type * allocbuf(CORBA::ULong maximum)
+  {
+    value_type * buffer = new value_type[maximum + 1];
+    reinterpret_cast<value_type**>(buffer)[0] = buffer + maximum + 1;
+
+    // no throw
+    reference_traits::zero_range(buffer + 1, buffer + maximum + 1);
+
+    return buffer + 1;
+  }
+
+  inline static void freebuf(value_type * buffer)
+  {
+    if(buffer != 0)
+    {
+      value_type * begin = buffer - 1;
+      value_type * end = reinterpret_cast<value_type*>(*begin);
+      reference_traits::release_range(buffer, end);
+
+      buffer = begin;
+    }
+    delete[] buffer;
+  }
+};
+
+} // namespace details
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_unbounded_reference_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
new file mode 100644
index 00000000000..c54a430b494
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
@@ -0,0 +1,42 @@
+#ifndef guard_unbounded_string_sequence_hpp
+#define guard_unbounded_string_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement unbounded sequences for strings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "unbounded_basic_string_sequence.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+class unbounded_string_sequence
+  : public details::unbounded_basic_string_sequence<char>
+{
+public:
+  inline unbounded_string_sequence()
+    : details::unbounded_basic_string_sequence<char>()
+  {}
+  inline /* explicit */ unbounded_string_sequence(CORBA::ULong maximum)
+    : details::unbounded_basic_string_sequence<char>(maximum)
+  {}
+  inline unbounded_string_sequence(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false)
+    : details::unbounded_basic_string_sequence<char>(
+        maximum, length, data, release)
+  {}
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_unbounded_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
new file mode 100644
index 00000000000..7b6b3598bf7
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
@@ -0,0 +1,53 @@
+#ifndef guard_unbounded_value_allocation_traits_hpp
+#define guard_unbounded_value_allocation_traits_hpp
+/**
+ * @file
+ *
+ * @brief Details can be found in the documentation for
+ * TAO::details::generic_sequence 
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename T, bool dummy>
+struct unbounded_value_allocation_traits
+{
+  typedef T value_type;
+
+  inline static CORBA::ULong default_maximum()
+  {
+    return 0;
+  }
+
+  inline static value_type * default_buffer_allocation()
+  {
+    return 0;
+  }
+
+  inline static value_type * allocbuf(CORBA::ULong maximum)
+  {
+    return new value_type[maximum];
+  }
+
+  inline static void freebuf(value_type * buffer)
+  {
+    delete[] buffer;
+  }
+};
+
+} // 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
new file mode 100644
index 00000000000..4702561423a
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
@@ -0,0 +1,98 @@
+#ifndef guard_unbounded_value_sequence_hpp
+#define guard_unbounded_value_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement unbounded sequences for types with value-like
+ * semantics.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+
+#include "unbounded_value_allocation_traits.hpp"
+#include "value_traits.hpp"
+#include "generic_sequence.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+template<class T>
+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;
+  typedef details::value_traits<value_type,true> element_traits;
+  typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
+
+  inline unbounded_value_sequence()
+    : impl_()
+  {}
+  inline explicit unbounded_value_sequence(CORBA::ULong maximum)
+    : impl_(maximum)
+  {}
+  inline unbounded_value_sequence(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false)
+    : impl_(maximum, length, data, release)
+  {}
+  /* Use default ctor, operator= and dtor */
+  inline CORBA::ULong maximum() const {
+    return impl_.maximum();
+  }
+  inline CORBA::Boolean release() const {
+    return impl_.release();
+  }
+  inline CORBA::ULong length() const {
+    return impl_.length();
+  }
+  inline void length(CORBA::ULong length) {
+    impl_.length(length);
+  }
+  inline value_type const & operator[](CORBA::ULong i) const {
+    return impl_[i];
+  }
+  inline value_type & operator[](CORBA::ULong i) {
+    return impl_[i];
+  }
+  inline void replace(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false) {
+    impl_.replace(maximum, length, data, release);
+  }
+  inline value_type const * get_buffer() const {
+    return impl_.get_buffer();
+  }
+  inline value_type * get_buffer(CORBA::Boolean orphan = false) {
+    return impl_.get_buffer(orphan);
+  }
+  inline void swap(unbounded_value_sequence & rhs) throw() {
+    impl_.swap(rhs.impl_);
+  }
+  static value_type * allocbuf(CORBA::ULong maximum) {
+    return implementation_type::allocbuf(maximum);
+  }
+  static void freebuf(value_type * buffer) {
+    implementation_type::freebuf(buffer);
+  }
+
+private:
+  implementation_type impl_;
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_unbounded_string_sequence_hpp
+
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
new file mode 100644
index 00000000000..50a503e62b3
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
@@ -0,0 +1,42 @@
+#ifndef guard_unbounded_wstring_sequence_hpp
+#define guard_unbounded_wstring_sequence_hpp
+/**
+ * @file
+ *
+ * @brief Implement unbounded sequences for wide strings.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "unbounded_basic_string_sequence.hpp"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+
+class unbounded_wstring_sequence
+  : public details::unbounded_basic_string_sequence<CORBA::WChar>
+{
+public:
+  inline unbounded_wstring_sequence()
+    : details::unbounded_basic_string_sequence<CORBA::WChar>()
+  {}
+  inline /* explicit */ unbounded_wstring_sequence(CORBA::ULong maximum)
+    : details::unbounded_basic_string_sequence<CORBA::WChar>(maximum)
+  {}
+  inline unbounded_wstring_sequence(
+      CORBA::ULong maximum,
+      CORBA::ULong length,
+      value_type * data,
+      CORBA::Boolean release = false)
+    : details::unbounded_basic_string_sequence<CORBA::WChar>(
+        maximum, length, data, release)
+  {}
+};
+
+} // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+#endif // guard_unbounded_wstring_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/value_traits.hpp b/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
new file mode 100644
index 00000000000..91bb20e8696
--- /dev/null
+++ b/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
@@ -0,0 +1,54 @@
+#ifndef guard_value_traits_hpp
+#define guard_value_traits_hpp
+/**
+ * @file
+ *
+ * @brief Implement the element manipulation traits for types with
+ * value-like semantics.
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan
+ */
+#include "tao/Basic_Types.h"
+
+#include <algorithm>
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+namespace details
+{
+
+template<typename T, bool dummy>
+struct value_traits
+{
+  typedef T value_type;
+  typedef T const const_value_type;
+
+  inline static void zero_range(
+      value_type * begin , value_type * end)
+  {
+    std::fill(begin, end, value_type ());
+  }
+
+  inline static void initialize_range(
+      value_type * begin, value_type * end)
+  {
+    std::fill(begin, end, value_type ());
+  }
+
+  inline static void copy_range(
+      value_type * begin, value_type * end, value_type *dst)
+  {
+    std::copy(begin, end, dst);
+  }
+};
+
+} // 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/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/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/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 34732cdac90..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 =
@@ -148,6 +151,8 @@ main (int argc, char *argv[])
                           Smart_Test_Factory,
                           -1);
 
+          // To make KAI Compiler happy as it considers <test_factory> to be
+          // an unused variable.
           ACE_UNUSED_ARG (test_factory);
         }
 
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 a54fa3856f3..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
@@ -134,6 +137,8 @@ main (int argc, char *argv[])
                       Smart_Test_Factory (one_shot_factory),
                       -1);
 
+      // To make KAI Compiler happy as it considers <test_factory> to be
+      // an unused variable.
       ACE_UNUSED_ARG (test_factory);
 
       run_test (orb.in (), 1);
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/client.cpp b/TAO/tests/Smart_Proxies/client.cpp
index 74b28effab2..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 =
@@ -83,6 +86,8 @@ main (int argc, char *argv[])
                       Smart_Test_Factory,
                       -1);
 
+      // To make KAI Compiler happy as it considers <test_factory> to be
+      // an unused variable.
       ACE_UNUSED_ARG (test_factory);
 
       Test_var server =
diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp
index 47c2c88884b..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
@@ -57,6 +60,8 @@ int main (int argc, char* argv[])
                       Test_Smart_Factory,
                       -1);
 
+      // To make KAI Compiler happy as it considers <test_factory> to be
+      // an unused variable.
       ACE_UNUSED_ARG (test_factory);
 
       Test_var server =
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/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/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/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/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/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/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/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/catior.cpp b/TAO/utils/catior/catior.cpp
index 4a53e5683d3..7003d10b704 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -460,7 +460,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
   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)
@@ -650,7 +650,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                         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 ())
               {
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/THANKS b/THANKS
index 5315b60830d..931b45b7a58 100644
--- a/THANKS
+++ b/THANKS
@@ -2100,7 +2100,6 @@ Qingbo Cai <qingbo dot cai at case dot edu>
 David White <david dot white dot 7 at gmail dot com>
 Jason Zhang <zzm9981 at 163 dot com>
 Mark Paulus <mark dot paulus at mci dot com>
-Martin Cornelius <Martin at Cornelius at smiths-heimann dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 3e900bc24ef..af89390c667 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -353,7 +353,6 @@ ACE::hash_pjw (const char *str)
   return ACE::hash_pjw (str, ACE_OS::strlen (str));
 }
 
-#if defined (ACE_HAS_WCHAR)
 u_long
 ACE::hash_pjw (const wchar_t *str, size_t len)
 {
@@ -383,7 +382,6 @@ ACE::hash_pjw (const wchar_t *str)
 {
   return ACE::hash_pjw (str, ACE_OS::strlen (str));
 }
-#endif /* ACE_HAS_WCHAR */
 
 #if !defined (ACE_HAS_WINCE)
 ACE_TCHAR *
@@ -3330,7 +3328,6 @@ ACE::strndup (const char *str, size_t n)
   return ACE_OS::strsncpy (s, str, len + 1);
 }
 
-#if defined (ACE_HAS_WCHAR)
 wchar_t *
 ACE::strndup (const wchar_t *str, size_t n)
 {
@@ -3352,7 +3349,6 @@ ACE::strndup (const wchar_t *str, size_t n)
                         0);
   return ACE_OS::strsncpy (s, str, len + 1);
 }
-#endif /* ACE_HAS_WCHAR */
 
 char *
 ACE::strnnew (const char *str, size_t n)
@@ -3375,7 +3371,6 @@ ACE::strnnew (const char *str, size_t n)
   return ACE_OS::strsncpy (s, str, len + 1);
 }
 
-#if defined (ACE_HAS_WCHAR)
 wchar_t *
 ACE::strnnew (const wchar_t *str, size_t n)
 {
@@ -3396,7 +3391,6 @@ ACE::strnnew (const wchar_t *str, size_t n)
                   0);
   return ACE_OS::strsncpy (s, str, len + 1);
 }
-#endif /* ACE_HAS_WCHAR */
 
 const char *
 ACE::strend (const char *s)
@@ -3407,7 +3401,6 @@ ACE::strend (const char *s)
   return s;
 }
 
-#if defined ACE_HAS_WCHAR
 const wchar_t *
 ACE::strend (const wchar_t *s)
 {
@@ -3416,7 +3409,6 @@ ACE::strend (const wchar_t *s)
 
   return s;
 }
-#endif
 
 char *
 ACE::strnew (const char *s)
@@ -3433,7 +3425,6 @@ ACE::strnew (const char *s)
     return ACE_OS::strcpy (t, s);
 }
 
-#if defined (ACE_HAS_WCHAR)
 wchar_t *
 ACE::strnew (const wchar_t *s)
 {
@@ -3448,7 +3439,6 @@ ACE::strnew (const wchar_t *s)
   else
     return ACE_OS::strcpy (t, s);
 }
-#endif /* ACE_HAS_WCHAR */
 
 inline static bool equal_char(char a, char b, bool case_sensitive)
 {
diff --git a/ace/ACE.h b/ace/ACE.h
index ecafe8a3c36..581d239c41e 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -427,7 +427,6 @@ namespace ACE
   /// @c ACE_OS::malloc to allocate the new string.
   extern ACE_Export char *strnnew (const char *str, size_t n);
 
-#if defined (ACE_HAS_WCHAR)
   extern ACE_Export const wchar_t *strend (const wchar_t *s);
 
   extern ACE_Export wchar_t *strnew (const wchar_t *s);
@@ -438,8 +437,6 @@ namespace ACE
 
   extern ACE_Export wchar_t *strnnew (const wchar_t *str, size_t n);
 
-#endif /* ACE_HAS_WCHAR */
-
   /**
    * On Windows, determines if a specified pathname ends with ".exe"
    * (not case sensitive). If on Windows and there is no ".exe" suffix,
@@ -536,13 +533,11 @@ namespace ACE
   /// Computes the hash value of {str} using the "Hash PJW" routine.
   extern ACE_Export u_long hash_pjw (const char *str, size_t len);
 
-#if defined (ACE_HAS_WCHAR)
   /// Computes the hash value of {str} using the "Hash PJW" routine.
   extern ACE_Export u_long hash_pjw (const wchar_t *str);
 
   /// Computes the hash value of {str} using the "Hash PJW" routine.
   extern ACE_Export u_long hash_pjw (const wchar_t *str, size_t len);
-#endif /* ACE_HAS_WCHAR */
 
   /// Computes CRC-CCITT for the string.
   extern ACE_Export ACE_UINT16 crc_ccitt(const char *str);
@@ -632,7 +627,7 @@ namespace ACE
   ACE_NAMESPACE_INLINE_FUNCTION u_long log2 (u_long num);
 
   /// Hex conversion utility.
-  ACE_NAMESPACE_INLINE_FUNCTION ACE_TCHAR nibble2hex (u_int n);
+  ACE_NAMESPACE_INLINE_FUNCTION char nibble2hex (u_int n);
 
   /// Convert a hex character to its byte representation.
   ACE_NAMESPACE_INLINE_FUNCTION u_char hex2byte (ACE_TCHAR c);
diff --git a/ace/ACE.inl b/ace/ACE.inl
index f4e3c2e0cb2..a755557fe5c 100644
--- a/ace/ACE.inl
+++ b/ace/ACE.inl
@@ -303,7 +303,7 @@ ACE::log2 (u_long num)
   return log;
 }
 
-ACE_INLINE ACE_TCHAR
+ACE_INLINE char
 ACE::nibble2hex (u_int n)
 {
   // Hexadecimal characters.
@@ -312,9 +312,9 @@ ACE::nibble2hex (u_int n)
   // loads of warnings when inlining.
   // problem (incorrect warning leftover from older GNU) has been reported as
   // TSR to Windriver.
-  const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef");
+  const char hex_chars[] = "0123456789abcdef";
 #else
-  static const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef");
+  static const char hex_chars[] = "0123456789abcdef";
 #endif
 
   // @@ UNICODE does this work?
diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp
index 703db37986f..97a3cd7ae1a 100644
--- a/ace/ARGV.cpp
+++ b/ace/ARGV.cpp
@@ -8,285 +8,15 @@
 #include "ace/ARGV.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_Memory.h"
-
-ACE_RCSID(ace, ARGV, "$Id$")
-
 // Open versioned namespace, if enabled by the user.
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_ALLOC_HOOK_DEFINE (ACE_ARGV)
-
-void
-ACE_ARGV::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_ARGV::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("argc_ = %d"), this->argc_));
-
-  ACE_ARGV *this_obj = const_cast<ACE_ARGV *> (this);
-
-  for (int i = 0; i < this->argc_; i++)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_LIB_TEXT ("\nargv_[%i] = %s"),
-                i,
-                this_obj->argv ()[i]));
-
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\n")));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-// Creates this->argv_ out of this->buf_.  New memory is allocated for
-// each element of the array.  This is used by the array-to-string
-// style constructor and for creating this->argv_ when in iterative
-// mode.
-
-int
-ACE_ARGV::string_to_argv (void)
-{
-  ACE_TRACE ("ACE_ARGV::string_to_argv");
-
-  return ACE_OS::string_to_argv (this->buf_,
-                                 this->argc_,
-                                 this->argv_,
-                                 this->substitute_env_args_);
-}
-
-int
-ACE_ARGV::argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf)
-{
-  return ACE_OS::argv_to_string (argv, buf);
-}
-
-ACE_ARGV::ACE_ARGV (const ACE_TCHAR buf[],
-                    int substitute_env_args)
-  : substitute_env_args_ (substitute_env_args),
-    state_ (TO_PTR_ARRAY),
-    argc_ (0),
-    argv_ (0),
-    buf_ (0),
-    length_ (0),
-    queue_ ()
-{
-  ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR[] to ACE_TCHAR *[]");
-
-  if (buf == 0 || buf[0] == 0)
-    return;
-
-  // Make an internal copy of the string.
-  ACE_NEW (this->buf_,
-           ACE_TCHAR[ACE_OS::strlen (buf) + 1]);
-  ACE_OS::strcpy (this->buf_, buf);
-
-  // Create this->argv_.
-  if (this->string_to_argv () == -1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_LIB_TEXT ("%p\n"),
-                ACE_LIB_TEXT ("string_to_argv")));
-}
-
-ACE_ARGV::ACE_ARGV (ACE_TCHAR *argv[],
-                    int substitute_env_args)
-  : substitute_env_args_ (substitute_env_args),
-    state_ (TO_STRING),
-    argc_ (0),
-    argv_ (0),
-    buf_ (0),
-    length_ (0),
-    queue_ ()
-{
-  ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR*[] to ACE_TCHAR[]");
-
-  if (argv == 0 || argv[0] == 0)
-    return;
-
-  this->argc_ = ACE_OS::argv_to_string (argv, this->buf_, substitute_env_args);
-}
-
-ACE_ARGV::ACE_ARGV (ACE_TCHAR *first_argv[],
-                    ACE_TCHAR *second_argv[],
-                    int substitute_env_args)
-  : substitute_env_args_ (substitute_env_args),
-    state_ (TO_STRING),
-    argc_ (0),
-    argv_ (0),
-    buf_ (0),
-    length_ (0),
-    queue_ ()
-{
-  ACE_TRACE ("ACE_ARGV::ACE_ARGV ACE_TCHAR*[] + ACE_TCHAR *[] to ACE_TCHAR[]");
-
-  int first_argc;
-  int second_argc;
-
-  ACE_TCHAR *first_buf;
-  ACE_TCHAR *second_buf;
-
-  // convert the first argv to a string
-  first_argc = this->argv_to_string (first_argv, first_buf);
-
-  // convert the second argv to a string
-  second_argc = this->argv_to_string (second_argv, second_buf);
-
-  // Add the number of arguments in both the argvs.
-  this->argc_ = first_argc + second_argc;
-
-  size_t buf_len =
-    ACE_OS::strlen (first_buf) + ACE_OS::strlen (second_buf) + 1;
-
-  // Allocate memory to the lenght of the combined argv string.
-  ACE_NEW (this->buf_,
-           ACE_TCHAR[buf_len + 1]);
-
-  // copy the first argv string to the buffer
-  ACE_OS::strcpy (this->buf_, first_buf);
-
-  // concatenate the second argv string to the buffer
-  ACE_OS::strcat (this->buf_, second_buf);
-
-  //   Delete the first and second buffers
-
-  delete [] first_buf;
-
-  delete [] second_buf;
-}
-
-
-ACE_ARGV::ACE_ARGV (int substitute_env_args)
-  : substitute_env_args_ (substitute_env_args),
-    state_ (ITERATIVE),
-    argc_ (0),
-    argv_ (0),
-    buf_ (0),
-    length_ (0),
-    queue_ ()
-{
-  ACE_TRACE ("ACE_ARGV::ACE_ARGV Iterative");
-
-  // Nothing to do yet -- the user puts in arguments via add ()
-}
-
-int
-ACE_ARGV::add (const ACE_TCHAR *next_arg)
-{
-  // Only allow this to work in the "iterative" verion -- the
-  // ACE_ARGVs created with the one argument constructor.
-  if (this->state_ != ITERATIVE)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  // Put the new argument at the end of the queue.
-  if (this->queue_.enqueue_tail (const_cast <ACE_TCHAR *> (next_arg)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_LIB_TEXT ("Can't add more to ARGV queue")),
-                      -1);
-
-  this->length_ += ACE_OS::strlen (next_arg);
-
-  this->argc_++;
-
-  // Wipe argv_ and buf_ away so that they will be recreated if the
-  // user calls argv () or buf ().
-  if (this->argv_ != 0)
-    {
-      for (int i = 0; this->argv_[i] != 0; i++)
-        ACE_OS::free ((void *) this->argv_[i]);
-
-      delete [] this->argv_;
-      this->argv_ = 0;
-    }
-
-  delete [] this->buf_;
-  this->buf_ = 0;
-
-  return 0;
-}
-
-int
-ACE_ARGV::add (ACE_TCHAR *argv[])
-{
-  for (int i = 0; argv[i] != 0; i++)
-    if (this->add (argv[i]) == -1)
-      return -1;
-
-  return 0;
-}
-
-// Free up argv_ and buf_
-
-ACE_ARGV::~ACE_ARGV (void)
-{
-  ACE_TRACE ("ACE_ARGV::~ACE_ARGV");
-
-  if (this->argv_ != 0)
-    for (int i = 0; this->argv_[i] != 0; i++)
-      ACE_OS::free ((void *) this->argv_[i]);
-
-  delete [] this->argv_;
-  delete [] this->buf_;
-}
-
-// Create buf_ out of the queue_.  This is only used in the
-// "iterative" mode.
-
-int
-ACE_ARGV::create_buf_from_queue (void)
-{
-  ACE_TRACE ("ACE_ARGV::create_buf_from_queue");
-
-  // If the are no arguments, don't do anything
-  if (this->argc_ <= 0)
-    return -1;
-
-  delete [] this->buf_;
-
-  ACE_NEW_RETURN (this->buf_,
-                  ACE_TCHAR[this->length_ + this->argc_],
-                  -1);
-
-  // Get an iterator over the queue
-  ACE_Unbounded_Queue_Iterator<ACE_TCHAR *> iter (this->queue_);
-
-  ACE_TCHAR **arg = 0;
-  ACE_TCHAR *ptr = this->buf_;
-  size_t len;
-  int more = 0;
-
-  while (!iter.done ())
-    {
-      // Get next argument from the queue.
-      iter.next (arg);
-
-      more = iter.advance ();
-
-      len = ACE_OS::strlen (*arg);
-
-      // Copy the argument into buf_
-      ACE_OS::memcpy ((void *) ptr,
-                      (const void *) (*arg),
-                      len * sizeof (ACE_TCHAR));
-      // Move the pointer down.
-      ptr += len;
-
-      // Put in an argument separating space.
-      if (more != 0)
-        *ptr++ = ' ';
-    }
+ACE_RCSID(ace, ARGV, "$Id$")
 
-  // Put in the NUL terminator
-  *ptr = '\0';
+#if !defined (__ACE_INLINE__)
+template class ACE_TARGV<ACE_TCHAR>;
+#endif /* __ACE_INLINE__ */
 
-  return 0;
-}
 
 // Close versioned namespace, if enabled by the user.
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/ARGV.h b/ace/ARGV.h
index f7c0468b151..09c83fcca06 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -27,20 +27,21 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
- * @class ACE_ARGV
+ * @class ACE_TARGV
  *
  * @brief Builds a counted argument vector (ala argc/argv) from either
  * a string or a set of separate tokens. Can substitute environment
  * variable values for tokens that are environment variable references.
  */
-class ACE_Export ACE_ARGV
+template < typename CHAR_TYPE = char >
+class ACE_Export ACE_TARGV
 {
 public:
   // = Initialization and termination.
   /**
    * Splits the specified string into an argument vector, split at whitespace.
    *
-   * @param buf   An ACE_TCHAR array to split into tokens for the vector.
+   * @param buf   An CHAR_TYPE array to split into tokens for the vector.
    *
    * @param substitute_env_args  If non-zero, any token that is an
    *              an environment variable reference ($VAR) will have
@@ -51,57 +52,57 @@ public:
    *              references within a token. For example, @c $HOME/file will
    *              not substitute the value of the HOME environment variable.
    */
-  ACE_ARGV (const ACE_TCHAR buf[],
+  ACE_TARGV (const CHAR_TYPE buf[],
             int substitute_env_args = 1);
 
   /**
    * Converts @a argv into a linear string.  If @a substitute_env_args
    * is enabled then we'll substitute the environment variables for
    * each $ENV encountered in the string.  The <buf> operation is not
-   * allowed on an ACE_ARGV created this way.
+   * allowed on an ACE_TARGV created this way.
    */
-  ACE_ARGV (ACE_TCHAR *argv[],
+  ACE_TARGV (CHAR_TYPE *argv[],
             int substitute_env_args = 1);
 
   /**
-   * Creates an ACE_ARGV which is the concatenation of the first_argv
+   * Creates an ACE_TARGV which is the concatenation of the first_argv
    * and the second argv. The argv arguments should be null pointer
    * terminated.
    */
-  ACE_ARGV (ACE_TCHAR *first_argv[],
-            ACE_TCHAR *second_argv[],
+  ACE_TARGV (CHAR_TYPE *first_argv[],
+            CHAR_TYPE *second_argv[],
             int substitute_env_args =1);
 
   /**
-   * Entry point for creating an ACE_TCHAR *[] command line
+   * Entry point for creating an CHAR_TYPE *[] command line
    * iteratively via the <add> method.  When this constructor is used,
    * the <ITERATIVE> state is enabled.  The <argv> and <buf> methods
    * are allowed, and the result is recreated when called multiple
    * times.  The subscript operator is not allowed.
    */
-  ACE_ARGV (int substitute_env_args = 1);
+  ACE_TARGV (int substitute_env_args = 1);
 
   /// Destructor.
-  ~ACE_ARGV (void);
+  ~ACE_TARGV (void);
 
   // = Accessor arguments.
   /// Returns the <index>th string in the ARGV array.
-  const ACE_TCHAR *operator[] (size_t index);
+  const CHAR_TYPE *operator[] (size_t index);
 
   /**
    * Returns the @c argv array.  Caller should not delete this memory
-   * since the ACE_ARGV destructor will delete it.  If the caller
+   * since the ACE_TARGV destructor will delete it.  If the caller
    * modifies the array in the iterative mode, the changes are not
    * saved to the queue.
    */
-  ACE_TCHAR **argv (void);
+  CHAR_TYPE **argv (void);
 
   /// Returns @c argc.
   int argc (void) const;
 
   /// Returns the @c buf.  Caller should not delete this memory since
-  /// the ACE_ARGV destructor will delete it.
-  const ACE_TCHAR *buf (void);
+  /// the ACE_TARGV destructor will delete it.
+  const CHAR_TYPE *buf (void);
 
   /// Dump the state of an object.
   void dump (void) const;
@@ -114,45 +115,45 @@ public:
   /// assume ownership of managing its memory, i.e., the caller is
   /// responsible for memory management.  Returns -1 on failure and 0
   /// on success.
-  int add (const ACE_TCHAR *next_arg);
+  int add (const CHAR_TYPE *next_arg);
 
   /**
    * Add another @a argv array.  The @a argv parameter must be NULL
    * terminated.  This only works in the <ITERATIVE> state.  Returns
    * -1 on failure and 0 on success.
    */
-  int add (ACE_TCHAR *argv[]);
+  int add (CHAR_TYPE *argv[]);
 
-  /// What state is this ACE_ARGV in?
+  /// What state is this ACE_TARGV in?
   int state (void) const;
 
   // These are the states possible via the different constructors.
   enum States
   {
-    /// ACE_ARGV converts buf[] to ACE_TCHAR *argv[]
+    /// ACE_TARGV converts buf[] to CHAR_TYPE *argv[]
     TO_STRING = 1,
-    /// ACE_ARGV converts ACE_TCHAR *argv[] to buf[]
+    /// ACE_TARGV converts CHAR_TYPE *argv[] to buf[]
     TO_PTR_ARRAY = 2,
-    /// Builds buf[] or ACE_TCHAR *argv[] iteratively with <add>.
+    /// Builds buf[] or CHAR_TYPE *argv[] iteratively with <add>.
     ITERATIVE = 3
   };
 
 private:
   /// Copy Constructor not implemented
-  ACE_ARGV (const ACE_ARGV&);
+  ACE_TARGV (const ACE_TARGV&);
 
   /// Assignment '=' operator not implemented
-  ACE_ARGV operator= (const ACE_ARGV&);
+  ACE_TARGV operator= (const ACE_TARGV&);
 
   /// Creates buf_ from the queue, deletes previous buf_.
   int create_buf_from_queue (void);
 
-  /// Converts buf_ into the ACE_TCHAR *argv[] format.
+  /// Converts buf_ into the CHAR_TYPE *argv[] format.
   int string_to_argv (void);
 
   /// Returns the string created from argv in buf and
   /// returns the number of arguments.
-  int argv_to_string (ACE_TCHAR **argv, ACE_TCHAR *&buf);
+  int argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf);
 
   /// Replace args with environment variable values?
   int substitute_env_args_;
@@ -164,10 +165,10 @@ private:
   int argc_;
 
   /// The array of string arguments.
-  ACE_TCHAR **argv_;
+  CHAR_TYPE **argv_;
 
   /// Buffer containing the <argv> contents.
-  ACE_TCHAR *buf_;
+  CHAR_TYPE *buf_;
 
   /// Total length of the arguments in the queue, not counting
   /// separating spaces
@@ -175,9 +176,11 @@ private:
 
   /// Queue which keeps user supplied arguments.  This is only
   /// active in the "iterative" mode.
-  ACE_Unbounded_Queue<ACE_TCHAR *> queue_;
+  ACE_Unbounded_Queue<CHAR_TYPE *> queue_;
 };
 
+typedef ACE_TARGV<ACE_TCHAR> ACE_ARGV;
+
 // Close versioned namespace, if enabled by the user.
 ACE_END_VERSIONED_NAMESPACE_DECL
 
@@ -185,5 +188,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/ARGV.inl"
 #endif /* __ACE_INLINE__ */
 
+
 #include /**/ "ace/post.h"
 #endif /* ACE_ARGUMENT_VECTOR_H */
diff --git a/ace/ARGV.inl b/ace/ARGV.inl
index 47711a486ee..f3342e403e9 100644
--- a/ace/ARGV.inl
+++ b/ace/ARGV.inl
@@ -2,44 +2,319 @@
 // $Id$
 
 #include "ace/Global_Macros.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_Memory.h"
 
 // Open versioned namespace, if enabled by the user.
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+template < typename CHAR_TYPE > void
+ACE_TARGV<CHAR_TYPE>::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::dump");
+
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("argc_ = %d"), this->argc_));
+
+  ACE_TARGV *this_obj = const_cast<ACE_TARGV *> (this);
+
+  for (int i = 0; i < this->argc_; i++)
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_LIB_TEXT ("\nargv_[%i] = %s"),
+                i,
+                this_obj->argv ()[i]));
+
+  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_));
+  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
+}
+
+// Creates this->argv_ out of this->buf_.  New memory is allocated for
+// each element of the array.  This is used by the array-to-string
+// style constructor and for creating this->argv_ when in iterative
+// mode.
+
+template < typename CHAR_TYPE > int
+ACE_TARGV<CHAR_TYPE>::string_to_argv (void)
+{
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::string_to_argv");
+
+  return ACE_OS::string_to_argv (this->buf_,
+                                 this->argc_,
+                                 this->argv_,
+                                 this->substitute_env_args_);
+}
+
+template < typename CHAR_TYPE > int
+ACE_TARGV<CHAR_TYPE>::argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf)
+{
+  return ACE_OS::argv_to_string (argv, buf);
+}
+
+template < typename CHAR_TYPE >
+ACE_TARGV<CHAR_TYPE>::ACE_TARGV (const CHAR_TYPE buf[],
+		    int substitute_env_args)
+  : substitute_env_args_ (substitute_env_args),
+    state_ (TO_PTR_ARRAY),
+    argc_ (0),
+    argv_ (0),
+    buf_ (0),
+    length_ (0),
+    queue_ ()
+{
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV CHAR_TYPE[] to CHAR_TYPE *[]");
+
+  if (buf == 0 || buf[0] == 0)
+    return;
+
+  // Make an internal copy of the string.
+  ACE_NEW (this->buf_,
+           CHAR_TYPE[ACE_OS::strlen (buf) + 1]);
+  ACE_OS::strcpy (this->buf_, buf);
+
+  // Create this->argv_.
+  if (this->string_to_argv () == -1)
+    ACE_ERROR ((LM_ERROR,
+                ACE_LIB_TEXT ("%p\n"),
+                ACE_LIB_TEXT ("string_to_argv")));
+}
+
+template < typename CHAR_TYPE >
+ACE_TARGV<CHAR_TYPE>::ACE_TARGV (CHAR_TYPE *argv[],
+		    int substitute_env_args)
+  : substitute_env_args_ (substitute_env_args),
+    state_ (TO_STRING),
+    argc_ (0),
+    argv_ (0),
+    buf_ (0),
+    length_ (0),
+    queue_ ()
+{
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV CHAR_TYPE*[] to CHAR_TYPE[]");
+
+  if (argv == 0 || argv[0] == 0)
+    return;
+
+  this->argc_ = ACE_OS::argv_to_string (argv, this->buf_, substitute_env_args);
+}
+
+template < typename CHAR_TYPE >
+ACE_TARGV<CHAR_TYPE>::ACE_TARGV (CHAR_TYPE *first_argv[],
+                    CHAR_TYPE *second_argv[],
+                    int substitute_env_args)
+  : substitute_env_args_ (substitute_env_args),
+    state_ (TO_STRING),
+    argc_ (0),
+    argv_ (0),
+    buf_ (0),
+    length_ (0),
+    queue_ ()
+{
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV CHAR_TYPE*[] + CHAR_TYPE *[] to CHAR_TYPE[]");
+
+  int first_argc;
+  int second_argc;
+
+  CHAR_TYPE *first_buf;
+  CHAR_TYPE *second_buf;
+
+  // convert the first argv to a string
+  first_argc = this->argv_to_string (first_argv, first_buf);
+
+  // convert the second argv to a string
+  second_argc = this->argv_to_string (second_argv, second_buf);
+
+  // Add the number of arguments in both the argvs.
+  this->argc_ = first_argc + second_argc;
+
+  size_t buf_len =
+    ACE_OS::strlen (first_buf) + ACE_OS::strlen (second_buf) + 1;
+
+  // Allocate memory to the lenght of the combined argv string.
+  ACE_NEW (this->buf_,
+           CHAR_TYPE[buf_len + 1]);
+
+  // copy the first argv string to the buffer
+  ACE_OS::strcpy (this->buf_, first_buf);
+
+  // concatenate the second argv string to the buffer
+  ACE_OS::strcat (this->buf_, second_buf);
+
+  //   Delete the first and second buffers
+
+  delete [] first_buf;
+
+  delete [] second_buf;
+}
+
+template < typename CHAR_TYPE >
+ACE_TARGV<CHAR_TYPE>::ACE_TARGV (int substitute_env_args)
+  : substitute_env_args_ (substitute_env_args),
+    state_ (ITERATIVE),
+    argc_ (0),
+    argv_ (0),
+    buf_ (0),
+    length_ (0),
+    queue_ ()
+{
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::ACE_TARGV Iterative");
+
+  // Nothing to do yet -- the user puts in arguments via add ()
+}
+
+template < typename CHAR_TYPE > int
+ACE_TARGV<CHAR_TYPE>::add (const CHAR_TYPE *next_arg)
+{
+  // Only allow this to work in the "iterative" verion -- the
+  // ACE_TARGVs created with the one argument constructor.
+  if (this->state_ != ITERATIVE)
+    {
+      errno = EINVAL;
+      return -1;
+    }
+
+  // Put the new argument at the end of the queue.
+  if (this->queue_.enqueue_tail (const_cast <CHAR_TYPE *> (next_arg)) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_LIB_TEXT ("Can't add more to ARGV queue")),
+                      -1);
+
+  this->length_ += ACE_OS::strlen (next_arg);
+
+  this->argc_++;
+
+  // Wipe argv_ and buf_ away so that they will be recreated if the
+  // user calls argv () or buf ().
+  if (this->argv_ != 0)
+    {
+      for (int i = 0; this->argv_[i] != 0; i++)
+	ACE_OS::free ((void *) this->argv_[i]);
+
+      delete [] this->argv_;
+      this->argv_ = 0;
+    }
+
+  delete [] this->buf_;
+  this->buf_ = 0;
+
+  return 0;
+}
+
+template < typename CHAR_TYPE > int
+ACE_TARGV<CHAR_TYPE>::add (CHAR_TYPE *argv[])
+{
+  for (int i = 0; argv[i] != 0; i++)
+    if (this->add (argv[i]) == -1)
+      return -1;
+
+  return 0;
+}
+
+// Free up argv_ and buf_
+template < typename CHAR_TYPE >
+ACE_TARGV<CHAR_TYPE>::~ACE_TARGV (void)
+{
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::~ACE_TARGV");
+
+  if (this->argv_ != 0)
+    for (int i = 0; this->argv_[i] != 0; i++)
+      ACE_OS::free ((void *) this->argv_[i]);
+
+  delete [] this->argv_;
+  delete [] this->buf_;
+}
+
+// Create buf_ out of the queue_.  This is only used in the
+// "iterative" mode.
+
+template < typename CHAR_TYPE > int
+ACE_TARGV<CHAR_TYPE>::create_buf_from_queue (void)
+{
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::create_buf_from_queue");
+
+  // If the are no arguments, don't do anything
+  if (this->argc_ <= 0)
+    return -1;
+
+  delete [] this->buf_;
+
+  ACE_NEW_RETURN (this->buf_,
+                  CHAR_TYPE[this->length_ + this->argc_],
+                  -1);
+
+  // Get an iterator over the queue
+  ACE_Unbounded_Queue_Iterator<CHAR_TYPE *> iter (this->queue_);
+
+  CHAR_TYPE **arg;
+  CHAR_TYPE *ptr = this->buf_;
+  size_t len;
+  int more = 0;
+
+  while (!iter.done ())
+    {
+      // Get next argument from the queue.
+      iter.next (arg);
+
+      more = iter.advance ();
+
+      len = ACE_OS::strlen (*arg);
+
+      // Copy the argument into buf_
+      ACE_OS::memcpy ((void *) ptr,
+                      (const void *) (*arg),
+                      len * sizeof (CHAR_TYPE));
+      // Move the pointer down.
+      ptr += len;
+
+      // Put in an argument separating space.
+      if (more != 0)
+	*ptr++ = ' ';
+    }
+
+  // Put in the NUL terminator
+  *ptr = '\0';
+
+  return 0;
+}
+
 // Return the number of args
-ACE_INLINE int
-ACE_ARGV::argc (void) const
+template < typename CHAR_TYPE > int
+ACE_TARGV<CHAR_TYPE>::argc (void) const
 {
-  ACE_TRACE ("ACE_ARGV::argc");
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::argc");
   return this->argc_;
 }
 
-// Return the state of this ACE_ARGV
-ACE_INLINE int
-ACE_ARGV::state(void) const
+// Return the state of this ACE_TARGV
+template < typename CHAR_TYPE > int
+ACE_TARGV<CHAR_TYPE>::state(void) const
 {
-  ACE_TRACE ("ACE_ARGV::state");
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::state");
   return this->state_;
 }
 
 // Return the arguments in a space-separated string
-ACE_INLINE const ACE_TCHAR *
-ACE_ARGV::buf (void)
+template < typename CHAR_TYPE > const CHAR_TYPE *
+ACE_TARGV<CHAR_TYPE>::buf (void)
 {
-  ACE_TRACE ("ACE_ARGV::buf");
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::buf");
 
   if (this->buf_ == 0 && this->state_ == ITERATIVE)
     this->create_buf_from_queue ();
 
-  return (const ACE_TCHAR *) this->buf_;
+  return (const CHAR_TYPE *) this->buf_;
 }
 
 // Return the arguments in an entry-per-argument array
 
-ACE_INLINE ACE_TCHAR **
-ACE_ARGV::argv (void)
+template < typename CHAR_TYPE > CHAR_TYPE **
+ACE_TARGV<CHAR_TYPE>::argv (void)
 {
-  ACE_TRACE ("ACE_ARGV::argv");
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::argv");
 
   // Try to create the argv_ if it isn't there
   if (this->argv_ == 0)
@@ -49,24 +324,24 @@ ACE_ARGV::argv (void)
 
       // Convert buf_ to argv_
       if (this->string_to_argv () == -1)
-        return (ACE_TCHAR **) 0;
+        return (CHAR_TYPE **) 0;
     }
 
-  return (ACE_TCHAR **) this->argv_;
+  return (CHAR_TYPE **) this->argv_;
 }
 
 // Subscript operator.
 
-ACE_INLINE const ACE_TCHAR *
-ACE_ARGV::operator[] (size_t i)
+template < typename CHAR_TYPE > const CHAR_TYPE *
+ACE_TARGV<CHAR_TYPE>::operator[] (size_t i)
 {
-  ACE_TRACE ("ACE_ARGV::operator[]");
+  ACE_TRACE ("ACE_TARGV<CHAR_TYPE>::operator[]");
 
   // Don't go out of bounds.
   if (i >= static_cast<size_t> (this->argc_))
     return 0;
 
-  return (const ACE_TCHAR *) this->argv ()[i];
+  return (const CHAR_TYPE *) this->argv ()[i];
 }
 
 // Close versioned namespace, if enabled by the user.
diff --git a/ace/Arg_Shifter.cpp b/ace/Arg_Shifter.cpp
index 3c2ebd9fe08..f29f2522ca7 100644
--- a/ace/Arg_Shifter.cpp
+++ b/ace/Arg_Shifter.cpp
@@ -1,212 +1,14 @@
 #include "ace/Arg_Shifter.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_strings.h"
-#include "ace/OS_Errno.h"
-#include "ace/OS_Memory.h"
+
+#if !defined (__ACE_INLINE__)
+#include "ace/Arg_Shifter.inl"
+#endif /* __ACE_INLINE__ */
+
 
 ACE_RCSID (ace,
            Arg_Shifter,
            "$Id$")
 
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_Arg_Shifter::ACE_Arg_Shifter (int& argc,
-                                  const ACE_TCHAR** argv,
-                                  const ACE_TCHAR** temp)
-  : argc_ (argc),
-    total_size_ (argc),
-    temp_ (temp),
-    argv_ (argv),
-    current_index_ (0),
-    back_ (argc - 1),
-    front_ (0)
-{
-  this->init ();
-}
-
-ACE_Arg_Shifter::ACE_Arg_Shifter (int& argc,
-                                  ACE_TCHAR** argv,
-                                  ACE_TCHAR** temp)
-  : argc_ (argc),
-    total_size_ (argc),
-    temp_ ((const ACE_TCHAR **) temp),
-    argv_ ((const ACE_TCHAR **) argv),
-    current_index_ (0),
-    back_ (argc - 1),
-    front_ (0)
-{
-  this->init ();
-}
-
-void
-ACE_Arg_Shifter::init (void)
-{
-  // If not provided with one, allocate a temporary array.
-  if (this->temp_ == 0)
-    ACE_NEW (this->temp_,
-             const ACE_TCHAR *[this->total_size_]);
-
-  if (this->temp_ != 0)
-    {
-      // Fill the temporary array.
-      this->argc_ = 0;
-      for (int i = 0; i < this->total_size_; i++)
-        {
-          this->temp_[i] = this->argv_[i];
-          this->argv_[i] = 0;
-        }
-    }
-  else
-    {
-      // Allocation failed, prohibit iteration.
-      this->current_index_ = this->argc_;
-      this->front_ = this->argc_;
-    }
-}
-
-ACE_Arg_Shifter::~ACE_Arg_Shifter (void)
-{
-  // Delete the temporary vector.
-  delete [] temp_;
-}
-
-const ACE_TCHAR *
-ACE_Arg_Shifter::get_current (void) const
-{
-  const ACE_TCHAR * retval = 0;
-
-  if (this->is_anything_left ())
-    retval =  this->temp_[current_index_];
-
-  return retval;
-}
-
-const ACE_TCHAR *
-ACE_Arg_Shifter::get_the_parameter (const ACE_TCHAR *flag)
-{
-  // the return 0's abound because this method
-  // would otherwise be a deep if { } else { }
-
-  // check to see if any arguments still exist
-  if (!this->is_anything_left())
-    return 0;
-
-  // check to see if the flag is the argument
-  int offset = this->cur_arg_strncasecmp (flag);
-  if (offset == -1)
-    return 0;
-
-  if (offset == 0)
-    {
-      this->consume_arg ();
-
-      if (!this->is_parameter_next())
-        {
-          return 0;
-        }
-    }
-  // the paramter is in the middle somewhere...
-  return this->temp_[current_index_] + offset;
-}
-
-int
-ACE_Arg_Shifter::cur_arg_strncasecmp (const ACE_TCHAR *flag)
-{
-  // Check for a current argument
-  if (this->is_anything_left())
-    {
-      size_t flag_length = ACE_OS::strlen (flag);
-
-      // Check for presence of the flag
-      if (ACE_OS::strncasecmp(this->temp_[current_index_],
-                              flag,
-                              flag_length) == 0)
-        {
-          if (ACE_OS::strlen(temp_[current_index_]) ==
-              flag_length)
-            {
-              // match and lengths are equal
-              return 0;
-            }
-          else
-            {
-              // matches, with more info to boot!
-        size_t remaining = ACE_OS::strspn
-                (this->temp_[current_index_] + flag_length,
-                ACE_LIB_TEXT (" ")) + flag_length;
-        return static_cast<int> (remaining);
-            }
-        }
-    }
-  // failure
-  return -1;
-}
-
-int
-ACE_Arg_Shifter::consume_arg (int number)
-{
-  int retval = 0;
-
-  // Stick knowns at the end of the vector (consumed).
-  if (this->is_anything_left() >= number)
-    {
-      for (int i = 0, j = this->back_ - (number - 1);
-           i < number;
-           ++i, ++j, ++this->current_index_)
-        this->argv_[j] = this->temp_[this->current_index_];
-
-      this->back_ -= number;
-      retval = 1;
-    }
-
-  return retval;
-}
-
-int
-ACE_Arg_Shifter::ignore_arg (int number)
-{
-  int retval = 0;
-
-  // Keep unknowns at the head of the vector.
-  if (this->is_anything_left () >= number)
-    {
-      for (int i = 0;
-           i < number;
-           i++, this->current_index_++, this->front_++)
-        this->argv_[this->front_] = this->temp_[this->current_index_];
-
-      retval = 1;
-      this->argc_ += number;
-    }
-
-  return retval;
-}
-
-int
-ACE_Arg_Shifter::is_anything_left (void) const
-{
-  return this->total_size_ - this->current_index_;
-}
-
-int
-ACE_Arg_Shifter::is_option_next (void) const
-{
-  return this->is_anything_left () &&
-    this->temp_[this->current_index_][0] == '-';
-}
-
-int
-ACE_Arg_Shifter::is_parameter_next (void) const
-{
-  return this->is_anything_left ()
-    && this->temp_[this->current_index_][0] != '-';
-}
-
-int
-ACE_Arg_Shifter::num_ignored_args (void) const
-{
-  return this->front_;
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
+#if !defined (__ACE_INLINE__)
+template class ACE_TArg_Shifter< ACE_TCHAR >;
+#endif /* __ACE_INLINE__ */
diff --git a/ace/Arg_Shifter.h b/ace/Arg_Shifter.h
index b75537a1338..b63a9d8d82d 100644
--- a/ace/Arg_Shifter.h
+++ b/ace/Arg_Shifter.h
@@ -39,7 +39,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * has placed all the unknown arguments in their original order at
  * the front of original @a argv.
  */
-class ACE_Export ACE_Arg_Shifter
+template < typename CHAR_TYPE = char >
+class ACE_TArg_Shifter
 {
 public:
   // = Initialization and termination methods.
@@ -57,28 +58,28 @@ public:
    * @param argv The argument vector to shift. The string pointers in
    *    the vector will be reordered to place the @a argc unconsumed
    *    arguments at the front of the vector.
-   * @param temp A vector of @c ACE_TCHAR pointers at least @a argc
+   * @param temp A vector of @c CHAR_TYPE pointers at least @a argc
    *    elements long. The vector will be used for argument shifting as
    *    the specified @a argv vector is consumed. The vector must not
    *    be modified while this object exists. If this argument is 0
    *    (the default) the object will allocate and free the temporary
    *    vector transparently.
    */
-  ACE_Arg_Shifter (int& argc,
-                   const ACE_TCHAR **argv,
-                   const ACE_TCHAR **temp = 0);
+  ACE_TArg_Shifter (int& argc,
+                   const CHAR_TYPE **argv,
+                   const CHAR_TYPE **temp = 0);
 
   /// Same behavior as the preceding constructor, but without the
   /// "const" qualifier.
-  ACE_Arg_Shifter (int& argc,
-                   ACE_TCHAR **argv,
-                   ACE_TCHAR **temp = 0);
+  ACE_TArg_Shifter (int& argc,
+                   CHAR_TYPE **argv,
+                   CHAR_TYPE **temp = 0);
 
   /// Destructor.
-  ~ACE_Arg_Shifter (void);
+  ~ACE_TArg_Shifter (void);
 
   /// Get the current head of the vector.
-  const ACE_TCHAR *get_current (void) const;
+  const CHAR_TYPE *get_current (void) const;
 
   /**
    * If the @a flag matches the current_arg of arg shifter
@@ -112,7 +113,7 @@ public:
    * together '-foobarflagVALUE', the flag is NOT consumed
    * and the cur arg is left pointing to the entire flag/value pair
    */
-  const ACE_TCHAR *get_the_parameter (const ACE_TCHAR* flag);
+  const CHAR_TYPE *get_the_parameter (const CHAR_TYPE* flag);
 
   /**
    * Check if the current argument matches (case insensitive) <flag>
@@ -143,7 +144,7 @@ public:
    * Case C: If neither of Case A or B is met (no match)
    * then -1 is returned
    */
-  int cur_arg_strncasecmp (const ACE_TCHAR *flag);
+  int cur_arg_strncasecmp (const CHAR_TYPE *flag);
 
   /// Consume @a number argument(s) by sticking them/it on the end of
   /// the vector.
@@ -169,10 +170,10 @@ public:
 
 private:
   /// Copy Constructor should not be used.
-  ACE_Arg_Shifter (const ACE_Arg_Shifter&);
+  ACE_TArg_Shifter (const ACE_TArg_Shifter&);
 
   /// Assignment '=' operator should not be used.
-  ACE_Arg_Shifter operator= (const ACE_Arg_Shifter&);
+  ACE_TArg_Shifter operator= (const ACE_TArg_Shifter&);
 
   /// Refactor the constructor logic.
   void init (void);
@@ -184,10 +185,10 @@ private:
   int total_size_;
 
   /// The temporary array over which we traverse.
-  const ACE_TCHAR **temp_;
+  const CHAR_TYPE **temp_;
 
   /// The array in which the arguments are reordered.
-  const ACE_TCHAR **argv_;
+  const CHAR_TYPE **argv_;
 
   /// The element in <temp_> we're currently examining.
   int current_index_;
@@ -201,8 +202,15 @@ private:
   int front_;
 };
 
+typedef ACE_TArg_Shifter< ACE_TCHAR > ACE_Arg_Shifter;
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+#if defined (__ACE_INLINE__)
+#include "ace/Arg_Shifter.inl"
+#endif /* __ACE_INLINE__ */
+
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_ARG_SHIFTER_H */
diff --git a/ace/Arg_Shifter.inl b/ace/Arg_Shifter.inl
new file mode 100644
index 00000000000..eb11e4c42b4
--- /dev/null
+++ b/ace/Arg_Shifter.inl
@@ -0,0 +1,226 @@
+// -*- C++ -*-
+#include "ace/Arg_Shifter.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_strings.h"
+#include "ace/OS_Errno.h"
+#include "ace/OS_Memory.h"
+
+ACE_RCSID (ace,
+           Arg_Shifter,
+           "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+template < typename CHAR_TYPE >
+ACE_TArg_Shifter<CHAR_TYPE>::ACE_TArg_Shifter (int& argc,
+                                  const CHAR_TYPE** argv,
+                                  const CHAR_TYPE** temp)
+  : argc_ (argc),
+    total_size_ (argc),
+    temp_ (temp),
+    argv_ (argv),
+    current_index_ (0),
+    back_ (argc - 1),
+    front_ (0)
+{
+  this->init ();
+}
+
+template < typename CHAR_TYPE >
+ACE_TArg_Shifter<CHAR_TYPE>::ACE_TArg_Shifter (int& argc,
+                                  CHAR_TYPE** argv,
+                                  CHAR_TYPE** temp)
+  : argc_ (argc),
+    total_size_ (argc),
+    temp_ ((const CHAR_TYPE **) temp),
+    argv_ ((const CHAR_TYPE **) argv),
+    current_index_ (0),
+    back_ (argc - 1),
+    front_ (0)
+{
+  this->init ();
+}
+
+template < typename CHAR_TYPE >
+void
+ACE_TArg_Shifter<CHAR_TYPE>::init (void)
+{
+  // If not provided with one, allocate a temporary array.
+  if (this->temp_ == 0)
+    ACE_NEW (this->temp_,
+             const CHAR_TYPE *[this->total_size_]);
+
+  if (this->temp_ != 0)
+    {
+      // Fill the temporary array.
+      this->argc_ = 0;
+      for (int i = 0; i < this->total_size_; i++)
+	{
+	  this->temp_[i] = this->argv_[i];
+	  this->argv_[i] = 0;
+	}
+    }
+  else
+    {
+      // Allocation failed, prohibit iteration.
+      this->current_index_ = this->argc_;
+      this->front_ = this->argc_;
+    }
+}
+
+template < typename CHAR_TYPE >
+ACE_TArg_Shifter<CHAR_TYPE>::~ACE_TArg_Shifter (void)
+{
+  // Delete the temporary vector.
+  delete [] temp_;
+}
+
+template < typename CHAR_TYPE >
+const CHAR_TYPE *
+ACE_TArg_Shifter<CHAR_TYPE>::get_current (void) const
+{
+  const CHAR_TYPE * retval = 0;
+
+  if (this->is_anything_left ())
+    retval =  this->temp_[current_index_];
+
+  return retval;
+}
+
+template < typename CHAR_TYPE >
+const CHAR_TYPE *
+ACE_TArg_Shifter<CHAR_TYPE>::get_the_parameter (const CHAR_TYPE *flag)
+{
+  // the return 0's abound because this method
+  // would otherwise be a deep if { } else { }
+
+  // check to see if any arguments still exist
+  if (!this->is_anything_left())
+    return 0;
+
+  // check to see if the flag is the argument
+  int offset = this->cur_arg_strncasecmp (flag);
+  if (offset == -1)
+    return 0;
+
+  if (offset == 0)
+    {
+      this->consume_arg ();
+
+      if (!this->is_parameter_next())
+	{
+	  return 0;
+	}
+    }
+  // the paramter is in the middle somewhere...
+  return this->temp_[current_index_] + offset;
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_TArg_Shifter<CHAR_TYPE>::cur_arg_strncasecmp (const CHAR_TYPE *flag)
+{
+  // Check for a current argument
+  if (this->is_anything_left())
+    {
+      size_t flag_length = ACE_OS::strlen (flag);
+
+      // Check for presence of the flag
+      if (ACE_OS::strncasecmp(this->temp_[current_index_],
+                              flag,
+                              flag_length) == 0)
+	{
+	  if (ACE_OS::strlen(temp_[current_index_]) ==
+	      flag_length)
+	    {
+	      // match and lengths are equal
+	      return 0;
+	    }
+	  else
+	    {
+	      // matches, with more info to boot!
+        CHAR_TYPE space[2] = { ' ', 0 };
+        size_t remaining = ACE_OS::strspn
+                (this->temp_[current_index_] + flag_length,
+                space) + flag_length;
+        return static_cast<int> (remaining);
+	    }
+	}
+    }
+  // failure
+  return -1;
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_TArg_Shifter<CHAR_TYPE>::consume_arg (int number)
+{
+  int retval = 0;
+
+  // Stick knowns at the end of the vector (consumed).
+  if (this->is_anything_left() >= number)
+    {
+      for (int i = 0, j = this->back_ - (number - 1);
+	   i < number;
+	   ++i, ++j, ++this->current_index_)
+	this->argv_[j] = this->temp_[this->current_index_];
+
+      this->back_ -= number;
+      retval = 1;
+    }
+
+  return retval;
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_TArg_Shifter<CHAR_TYPE>::ignore_arg (int number)
+{
+  int retval = 0;
+
+  // Keep unknowns at the head of the vector.
+  if (this->is_anything_left () >= number)
+    {
+      for (int i = 0;
+	   i < number;
+	   i++, this->current_index_++, this->front_++)
+	this->argv_[this->front_] = this->temp_[this->current_index_];
+
+      retval = 1;
+      this->argc_ += number;
+    }
+
+  return retval;
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_TArg_Shifter<CHAR_TYPE>::is_anything_left (void) const
+{
+  return this->total_size_ - this->current_index_;
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_TArg_Shifter<CHAR_TYPE>::is_option_next (void) const
+{
+  return this->is_anything_left () &&
+    this->temp_[this->current_index_][0] == '-';
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_TArg_Shifter<CHAR_TYPE>::is_parameter_next (void) const
+{
+  return this->is_anything_left ()
+    && this->temp_[this->current_index_][0] != '-';
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_TArg_Shifter<CHAR_TYPE>::num_ignored_args (void) const
+{
+  return this->front_;
+}
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Argv_Type_Converter.cpp b/ace/Argv_Type_Converter.cpp
index 2fca97a0671..78d2788c331 100644
--- a/ace/Argv_Type_Converter.cpp
+++ b/ace/Argv_Type_Converter.cpp
@@ -15,55 +15,47 @@ ACE_RCSID (ace,
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_USES_WCHAR)
 ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, wchar_t** argv)
-  : saved_argc_ (argc)
-    , char_argv_ (0)
-    , wchar_argv_ (argv)
-    , before_pass_argc_ (argc)
-    , original_type_ (1)
-    , wchar_passed_ (0)
-    , char_passed_ (0)
+: saved_argc_ (argc)
+, char_argv_ (0)
+, wchar_argv_ (argv)
+, before_pass_argc_ (argc)
+, original_type_wchar_ (true)
+, wchar_passed_ (false)
+, char_passed_ (false)
 {
   this->initialize ();
 
   for (int i = 0; i < argc; ++i)
     {
       this->char_argv_[i] =
-        ACE_OS::strdup (ACE_TEXT_ALWAYS_CHAR (argv[i]));
+        ACE::String_Conversion::Convert_Out< char >( argv[i] ).c_str();
     }
 }
-#endif  // ACE_USES_WCHAR
 
 
 ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, char** argv)
-  : saved_argc_(argc)
-  , char_argv_(argv)
-#if defined (ACE_USES_WCHAR)
-    , wchar_argv_(0)
-    , before_pass_argc_(argc)
-    , original_type_(0)
-    , wchar_passed_(0)
-    , char_passed_(0)
+: saved_argc_(argc)
+, char_argv_(argv)
+, wchar_argv_(false)
+, before_pass_argc_(argc)
+, original_type_wchar_(false)
+, wchar_passed_(false)
+, char_passed_(false)
 {
   this->initialize();
 
   for (int i = 0; i < argc; ++i)
     {
       this->wchar_argv_[i] =
-        ACE_OS::strdup (ACE_TEXT_ANTI_TO_TCHAR (argv[i]));
+        ACE::String_Conversion::Convert_Out< wchar_t >( argv[i] ).c_str();
     }
 }
-#else
-{
-}
-#endif  // ACE_USES_WCHAR
 
 ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void)
 {
-#if defined (ACE_USES_WCHAR)
   // selectively delete the 'copy' of argv
-  if (this->original_type_)
+  if (this->original_type_wchar_)
     {
       // if original type is wchar_t
       if (this->char_passed_)
@@ -72,7 +64,7 @@ ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void)
         }
       for (int i = 0; i < this->before_pass_argc_; ++i)
         {
-          ACE_OS::free (this->char_argv_[i]);
+          ACE::String_Conversion::Convert_Out<char>::free( this->char_argv_[i] );
         }
       delete [] this->char_argv_;
     }
@@ -84,18 +76,16 @@ ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void)
       }
       for (int i = 0; i < this->before_pass_argc_; ++i)
         {
-          ACE_OS::free (this->wchar_argv_[i]);
+          ACE::String_Conversion::Convert_Out<wchar_t>::free( this->wchar_argv_[i] );
         }
       delete [] this->wchar_argv_;
     }
-#endif  // ACE_USES_WCHAR
 }
 
-#if defined (ACE_USES_WCHAR)
 void
 ACE_Argv_Type_Converter::initialize (void)
 {
-  if (this->original_type_)
+  if (this->original_type_wchar_)
     {  // make a copy of argv in 'char' type
       // Create one more argv entry than original argc for the NULL.
       ACE_NEW (char_argv_, char*[this->saved_argc_ + 1]);
@@ -120,14 +110,14 @@ ACE_Argv_Type_Converter::align_char_with_wchar (void)
     {
       // if n'th entries of both argv lists are different
       if (ACE_OS::strcmp(this->char_argv_[wchar_argv_index],
-                                ACE_TEXT_ALWAYS_CHAR (match_argv)) != 0)
+                                ACE_TEXT_TO_CHAR_IN (match_argv)) != 0)
         {
           // loop through the wchar argv list entries that are after
           // wchar_argv_index
           for (int i = wchar_argv_index + 1; i < before_pass_argc_; ++i)
             {
               if (ACE_OS::strcmp (this->char_argv_[i],
-                                         ACE_TEXT_ALWAYS_CHAR (match_argv))
+                                  ACE_TEXT_TO_CHAR_IN (match_argv))
                   == 0)
                 {
                   // swap the pointers in the char argv list
@@ -156,7 +146,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void)
     {
       // if n'th entries of both argv lists are different
       if (ACE_OS::strcmp (
-            ACE_TEXT_ALWAYS_CHAR (this->wchar_argv_[char_argv_index]),
+            ACE_TEXT_TO_CHAR_IN (this->wchar_argv_[char_argv_index]),
             match_argv) != 0)
         {
           // loop through the wchar argv list entries that are after
@@ -164,7 +154,7 @@ ACE_Argv_Type_Converter::align_wchar_with_char (void)
           for (int i = char_argv_index + 1; i < this->before_pass_argc_; ++i)
             {
               if (ACE_OS::strcmp (
-                    ACE_TEXT_ALWAYS_CHAR(this->wchar_argv_[i]),
+                    ACE_TEXT_TO_CHAR_IN(this->wchar_argv_[i]),
                     match_argv) == 0) {
                 // swap the pointers in the char argv list
                 wchar_t* temp = this->wchar_argv_[char_argv_index];
@@ -188,23 +178,22 @@ ACE_Argv_Type_Converter::cleanup (void)
   for (int i = this->saved_argc_; i < this->before_pass_argc_; ++i)
     {
       //  Check whether it's ours to delete.
-      if (original_type_ == 1)
+      if (original_type_wchar_ == true)
         {
-          ACE_OS::free (this->char_argv_[i]);
+          ACE::String_Conversion::Convert_Out<char>::free( this->char_argv_[i] );
           this->char_argv_[i] = 0;
         }
       else
         {
-          ACE_OS::free (this->wchar_argv_[i]);
+          ACE::String_Conversion::Convert_Out<wchar_t>::free( this->wchar_argv_[i] );
           this->wchar_argv_[i] = 0;
         }
     }
 
   this->before_pass_argc_ = this->saved_argc_;
 
-  this->wchar_passed_ = 0;
-  this->char_passed_ = 0;
+  this->wchar_passed_ = false;
+  this->char_passed_ = false;
 }
-#endif  // ACE_USES_WCHAR
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Argv_Type_Converter.h b/ace/Argv_Type_Converter.h
index 89ba35c6220..381448af6ab 100644
--- a/ace/Argv_Type_Converter.h
+++ b/ace/Argv_Type_Converter.h
@@ -42,15 +42,16 @@ public:
 
   ACE_Argv_Type_Converter (int &argc, char** argv);
 
-#if defined (ACE_USES_WCHAR)
   ACE_Argv_Type_Converter (int &argc, wchar_t** argv);
-#endif  // ACE_USES_WCHAR
 
   ~ACE_Argv_Type_Converter (void);
 
   /// Returns the pointer of converted command line.
   ACE_TCHAR** get_TCHAR_argv (void);
 
+  /// Returns the pointer of converted command line.
+  wchar_t** get_Wide_argv (void);
+
   /// Returns the pointer of ASCII (char) command line.
   char** get_ASCII_argv (void);
 
@@ -65,8 +66,6 @@ private:
   /// Assignment '=' operator should not be used.
   ACE_Argv_Type_Converter operator= (const ACE_Argv_Type_Converter&);
 
-#if defined (ACE_USES_WCHAR)
-
   /// Perform common initialization for two Ctor's.
   void initialize (void);
 
@@ -80,17 +79,15 @@ private:
 
   /// Clean up removed (comsumed) argv entries and reset the pass flags.
   void cleanup (void);
-#endif  // ACE_USES_WCHAR
 
 private:
   /// Original number of input paramter, same as 'argc'.
   int &saved_argc_;
 
-  /// Data member pointer that contains converted argv in ACE_ANTI_TCHAR.
+  /// Data member pointer that contains converted argv in char.
   char** char_argv_;
 
-#if defined (ACE_USES_WCHAR)
-  /// Data member pointer that contains converted argv in ACE_TCHAR.
+  /// Data member pointer that contains converted argv in wchar_t.
   wchar_t** wchar_argv_;
 
   /// argc value before any argv has been passed.
@@ -98,14 +95,13 @@ private:
 
   /// FALSE represents original argv passed in is char, and TRUE
   /// represents wchar_t.
-  const int original_type_;
+  const bool original_type_wchar_;
 
   /// TRUE indicates wchar_t type argv has been passed.
-  int wchar_passed_;
+  bool wchar_passed_;
 
   /// TRUE indicates char type argv has been passed.
-  int char_passed_;
-#endif  /* ACE_USES_WCHAR */
+  bool char_passed_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Argv_Type_Converter.inl b/ace/Argv_Type_Converter.inl
index f56c83146b3..54b9ed2dfc1 100644
--- a/ace/Argv_Type_Converter.inl
+++ b/ace/Argv_Type_Converter.inl
@@ -8,6 +8,15 @@ ACE_INLINE ACE_TCHAR**
 ACE_Argv_Type_Converter::get_TCHAR_argv (void)
 {
 #if defined (ACE_USES_WCHAR)
+  return get_Wide_argv ();
+#else
+  return get_ASCII_argv ();
+#endif
+}
+
+ACE_INLINE wchar_t**
+ACE_Argv_Type_Converter::get_Wide_argv (void)
+{
   if (this->char_passed_)
     {
       this->align_wchar_with_char ();
@@ -15,22 +24,17 @@ ACE_Argv_Type_Converter::get_TCHAR_argv (void)
 
   this->wchar_passed_ = true;
   return this->wchar_argv_;
-#else
-  return this->char_argv_;
-#endif  // ACE_USES_WCHAR
 }
 
 ACE_INLINE char**
 ACE_Argv_Type_Converter::get_ASCII_argv (void)
 {
-#if defined (ACE_USES_WCHAR)
   if (this->wchar_passed_)
     {
       this->align_char_with_wchar ();
     }
 
-  this->char_passed_ = 1;
-#endif  // ACE_USES_WCHAR
+  this->char_passed_ = true;
 
   return this->char_argv_;
 }
diff --git a/ace/Auto_Event.cpp b/ace/Auto_Event.cpp
index 9e106ac8119..456ac2a4890 100644
--- a/ace/Auto_Event.cpp
+++ b/ace/Auto_Event.cpp
@@ -19,12 +19,11 @@ ACE_Auto_Event::ACE_Auto_Event (int initial_state,
   : ACE_Event (0,
                initial_state,
                type,
-               ACE_TEXT_CHAR_TO_TCHAR (name),
+               ACE_TEXT_TO_TCHAR_IN (name),
                arg)
 {
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_Auto_Event::ACE_Auto_Event (int initial_state,
                                 int type,
                                 const wchar_t *name,
@@ -32,11 +31,10 @@ ACE_Auto_Event::ACE_Auto_Event (int initial_state,
   : ACE_Event (0,
                initial_state,
                type,
-               ACE_TEXT_WCHAR_TO_TCHAR (name),
+               ACE_TEXT_TO_TCHAR_IN (name),
                arg)
 {
 }
-#endif /* ACE_HAS_WCHAR */
 
 void
 ACE_Auto_Event::dump (void) const
diff --git a/ace/Auto_Event.h b/ace/Auto_Event.h
index d7279a13150..db1a834e9c0 100644
--- a/ace/Auto_Event.h
+++ b/ace/Auto_Event.h
@@ -45,13 +45,11 @@ public:
                   const char *name = 0,
                   void *arg = 0);
 
-#if defined (ACE_HAS_WCHAR)
   /// Constructor which will create auto event (wchar_t version)
   ACE_Auto_Event (int initial_state,
                   int type,
                   const wchar_t *name,
                   void *arg = 0);
-#endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
   ~ACE_Auto_Event (void);
diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h
index 25b44e382c2..b4425f32896 100644
--- a/ace/Base_Thread_Adapter.h
+++ b/ace/Base_Thread_Adapter.h
@@ -29,8 +29,6 @@
 
 #if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
 # define ACE_THREAD_ADAPTER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_thread_adapter)
-#else
-# define ACE_THREAD_ADAPTER_NAME ace_thread_adapter
 #endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
 
 // Run the thread entry point for the ACE_Thread_Adapter.  This must
diff --git a/ace/Basic_Stats.cpp b/ace/Basic_Stats.cpp
index f81b29bfcaa..e727d1c8224 100644
--- a/ace/Basic_Stats.cpp
+++ b/ace/Basic_Stats.cpp
@@ -46,7 +46,35 @@ ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs)
 }
 
 void
-ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg,
+ACE_Basic_Stats::dump_results (const char *msg,
+                               ACE_UINT32 sf) const
+{
+#ifndef ACE_NLOGGING
+  if (this->samples_count () == 0u)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_LIB_TEXT ("%s : no data collected\n"), msg));
+      return;
+    }
+
+  ACE_UINT64 avg = this->sum_ / this->samples_count_;
+
+  ACE_UINT64 l_min = this->min_ / sf;
+  ACE_UINT64 l_max = this->max_ / sf;
+  ACE_UINT64 l_avg = avg / sf;
+
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_LIB_TEXT ("%s latency   : %Q[%d]/%Q/%Q[%d] (min/avg/max)\n"),
+              msg,
+              l_min, this->min_at_,
+              l_avg,
+              l_max, this->max_at_));
+
+#endif /* ACE_NLOGGING */
+}
+
+void
+ACE_Basic_Stats::dump_results (const wchar_t *msg,
                                ACE_UINT32 sf) const
 {
 #ifndef ACE_NLOGGING
diff --git a/ace/Basic_Stats.h b/ace/Basic_Stats.h
index 2dc50694e63..f0c8a0f3b38 100644
--- a/ace/Basic_Stats.h
+++ b/ace/Basic_Stats.h
@@ -55,7 +55,10 @@ public:
    * high resolution timer samples are acquired in clock ticks, but often
    * presented in microseconds.
    */
-  void dump_results (const ACE_TCHAR *msg,
+  void dump_results (const char *msg,
+                     ACE_UINT32 scale_factor) const;
+
+  void dump_results (const wchar_t *msg,
                      ACE_UINT32 scale_factor) const;
 
   /// The number of samples
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index abde82d342c..c3ee616356e 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -14,7 +14,6 @@
  *
  *  Sizes of built-in types:
  *    - ACE_SIZEOF_CHAR
- *    - ACE_SIZEOF_WCHAR
  *    - ACE_SIZEOF_SHORT
  *    - ACE_SIZEOF_INT
  *    - ACE_SIZEOF_LONG
@@ -83,23 +82,6 @@
 // A char always has 1 byte, by definition.
 # define ACE_SIZEOF_CHAR 1
 
-// Unfortunately, there isn't a portable way to determine the size of a wchar.
-// So we just define them on a platform basis. If the platform doesn't
-// define it and it's an XPG4 system, assume wchar_t is 4 bytes. Some code
-// uses ACE_SIZEOF_WCHAR in preprocessor statements, so sizeof() isn't valid.
-// If the platform config doesn't set this, and this guess is wrong,
-// Basic_Types_Test should catch the inconsistency.
-# if defined (ACE_HAS_WCHAR)
-#   if !defined (ACE_SIZEOF_WCHAR)
-#     if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
-#       define ACE_SIZEOF_WCHAR 4
-#     else
-// 0 so the Basic_Types test will catch this.
-#       define ACE_SIZEOF_WCHAR 0
-#     endif /* ACE_HAS_XPG4_MULTIBYTE_CHAR */
-#   endif /* !ACE_SIZEOF_WCHAR */
-# endif /* ACE_HAS_WCHAR */
-
 // The number of bytes in a short.
 # if !defined (ACE_SIZEOF_SHORT)
 #   if (USHRT_MAX) == 255U
@@ -271,17 +253,6 @@ typedef ACE_UINT16 ACE_USHORT16;  // @@ Backward compatibility.
 // Define a generic byte for use in codecs
 typedef unsigned char ACE_Byte;
 
-// Define a pseudo wide character type when wchar is not supported so we
-// can support basic wide character string operations.
-
-# if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
-#   define ACE_WINT_T wint_t
-#   define ACE_WCHAR_T wchar_t
-# else
-#   define ACE_WINT_T ACE_UINT16
-#   define ACE_WCHAR_T ACE_UINT16
-# endif /* ACE_HAS_WCHAR */
-
 // The number of bytes in a void *.
 # ifndef ACE_SIZEOF_VOID_P
 #   define ACE_SIZEOF_VOID_P ACE_SIZEOF_LONG
@@ -684,27 +655,34 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if !defined (ACE_UINT64_FORMAT_SPECIFIER)
 #  if defined (PRIu64)
-#    define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRIu64)
+#    define ACE_UINT64_FORMAT_SPECIFIER_A "%" PRIu64
+#    define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 #  elif ACE_SIZEOF_LONG == 8
-#    define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
+#    define ACE_UINT64_FORMAT_SPECIFIER_A "%lu"
+#    define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 #  else
-#    define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%llu")
+#    define ACE_UINT64_FORMAT_SPECIFIER_A "%llu"
+#    define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 #  endif /* defined (PRIu64) */
 #endif /* ACE_UINT64_FORMAT_SPECIFIER */
 
 #if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER)
 # if defined (ACE_WIN64)
-#  define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d")
+#  define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%I64d"
+#  define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A)
 # else
-#  define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%d")
+#  define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%d"
+#  define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A)
 # endif /* ACE_WIN64 */
 #endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */
 
 #if !defined (ACE_SIZE_T_FORMAT_SPECIFIER)
 # if defined (ACE_WIN64)
-#  define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
+#  define ACE_SIZE_T_FORMAT_SPECIFIER_A "%I64u"
+#  define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A)
 # else
-#  define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%u")
+#  define ACE_SIZE_T_FORMAT_SPECIFIER_A "%u"
+#  define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A)
 # endif /* ACE_WIN64 */
 #endif /* ACE_SIZE_T_FORMAT_SPECIFIER */
 
@@ -772,7 +750,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #define ACE_INT16_MAX 0x7FFF
 #define ACE_INT16_MIN -(ACE_INT16_MAX)-1
 #define ACE_UINT16_MAX 0xFFFF
-#define ACE_WCHAR_MAX ACE_UINT16_MAX
 #define ACE_INT32_MAX 0x7FFFFFFF
 #define ACE_INT32_MIN -(ACE_INT32_MAX)-1
 #define ACE_UINT32_MAX 0xFFFFFFFF
diff --git a/ace/CDR_Base.h b/ace/CDR_Base.h
index 7c37f4bbbf0..1caa81333ad 100644
--- a/ace/CDR_Base.h
+++ b/ace/CDR_Base.h
@@ -38,6 +38,7 @@
 
 #include "ace/Basic_Types.h"
 #include "ace/Default_Constants.h"
+#include "ace/If_Then_Else.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -167,10 +168,18 @@ public:
    * avoid complaints from all compilers is to define them all.
    */
   //@{
-  typedef bool Boolean;
+  typedef ACE::If_Then_Else<(sizeof (bool) == 1),
+                            bool,
+                            unsigned char>::result_type Boolean;
+
+# if !defined (ACE_CDR_WCHAR_OVERRIDE) || defined(ACE_USES_WCHAR)
+#  undef ACE_CDR_WCHAR_OVERRIDE
+#  define ACE_CDR_WCHAR_OVERRIDE wchar_t
+# endif
+
   typedef unsigned char Octet;
   typedef char Char;
-  typedef ACE_WCHAR_T WChar;
+  typedef ACE_CDR_WCHAR_OVERRIDE WChar;
   typedef ACE_INT16 Short;
   typedef ACE_UINT16 UShort;
   typedef ACE_INT32 Long;
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index afc43abc05b..2ca41fe93ed 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -613,30 +613,6 @@ ACE_OutputCDR::write_array (const void *x,
   return false;
 }
 
-
-ACE_CDR::Boolean
-ACE_OutputCDR::replace (ACE_CDR::Long x, char* loc)
-{
-  if (this->find (loc) == 0)
-    return false;
-
-#if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-  *reinterpret_cast<ACE_CDR::Long*> (loc) = x;
-#else
-  if (!strm->do_byte_swap ())
-  {
-    *reinterpret_cast<ACE_CDR::Long *> (loc) = x;
-  }
-  else
-  {
-    ACE_CDR::swap_4 (reinterpret_cast<const char*> (&x), loc);
-  }
-#endif /* ACE_ENABLE_SWAP_ON_WRITE */
-
-  return true;
-}
-
-
 ACE_CDR::Boolean
 ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x,
                                     ACE_CDR::ULong length)
@@ -656,23 +632,6 @@ ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x,
   return this->good_bit ();
 }
 
-
-ACE_Message_Block*
-ACE_OutputCDR::find (char* loc)
-{
-  ACE_Message_Block* mb = 0;
-  for (mb = &this->start_; mb != 0; mb = mb->cont ())
-  {
-    if (loc <= mb->wr_ptr () && loc >= mb->rd_ptr ())
-    {
-      break;
-    }
-  }
-
-  return mb;
-}
-
-
 // ****************************************************************
 
 ACE_InputCDR::ACE_InputCDR (const char *buf,
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index d6e7560e7fe..3c245ab945b 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -219,11 +219,6 @@ public:
   ACE_CDR::Boolean write_double (const ACE_CDR::Double &x);
   ACE_CDR::Boolean write_longdouble (const ACE_CDR::LongDouble &x);
 
-  // Overwrite the stream at the specified location that is previously
-  // written as a long type placeholder. There is no alignment required
-  // since the alignment is done before writing the long type placeholder.
-  ACE_CDR::Boolean replace (ACE_CDR::Long x, char* loc);
-
   /// For string we offer methods that accept a precomputed length.
   ACE_CDR::Boolean write_string (const ACE_CDR::Char *x);
   ACE_CDR::Boolean write_string (ACE_CDR::ULong len,
@@ -398,13 +393,7 @@ public:
   /// Set the underlying GIOP version..
   int get_version (ACE_CDR::Octet &major,
                    ACE_CDR::Octet &minor);
-
 private:
-
-  // Find the message block in the chain of message blocks
-  // that the provide location locates.
-  ACE_Message_Block* find (char* loc);
-
   /// disallow copying...
   ACE_OutputCDR (const ACE_OutputCDR& rhs);
   ACE_OutputCDR& operator= (const ACE_OutputCDR& rhs);
diff --git a/ace/CE_Screen_Output.cpp b/ace/CE_Screen_Output.cpp
index 3afc5325d9a..8a477b97a85 100644
--- a/ace/CE_Screen_Output.cpp
+++ b/ace/CE_Screen_Output.cpp
@@ -77,13 +77,13 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_TCHAR* output
 
 ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (ACE_ANTI_TCHAR* output)
 {
-    *this << ACE_TEXT_CHAR_TO_TCHAR(output);
+    *this << ACE_TEXT_TO_TCHAR_IN(output);
     return *this;
 }
 
 ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (const ACE_ANTI_TCHAR* output)
 {
-    *this << ACE_TEXT_CHAR_TO_TCHAR(output);
+    *this << ACE_TEXT_TO_TCHAR_IN(output);
     return *this;
 }
 
diff --git a/ace/Cleanup.h b/ace/Cleanup.h
index bd1f9c2e23c..37e46b7e7cb 100644
--- a/ace/Cleanup.h
+++ b/ace/Cleanup.h
@@ -30,10 +30,9 @@
 #if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
 # include "ace/Global_Macros.h"
 # define ACE_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ace_cleanup_destroyer)
-#else
-# define ACE_CLEANUP_DESTROYER_NAME ace_cleanup_destroyer
 #endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
 
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
diff --git a/ace/Container_Instantiations.cpp b/ace/Container_Instantiations.cpp
new file mode 100644
index 00000000000..031a262808d
--- /dev/null
+++ b/ace/Container_Instantiations.cpp
@@ -0,0 +1,28 @@
+// $Id$
+#include "ace/CDR_Base.h"
+#include "ace/Unbounded_Queue.h"
+#include "ace/Unbounded_Set.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Instantiations of templates with basic data types that can be used
+// across  ACE+TAO.
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Node<ACE_INT32>;
+template class ACE_Unbounded_Queue<ACE_INT32>;
+template class ACE_Unbounded_Queue_Iterator<ACE_INT32>;
+template class ACE_Unbounded_Set<ACE_HANDLE>;
+template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Node<ACE_INT32>
+#pragma instantiate ACE_Unbounded_Queue<ACE_INT32>
+#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_INT32>
+#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Default_Constants.h b/ace/Default_Constants.h
index 945e9ff3513..05419382e97 100644
--- a/ace/Default_Constants.h
+++ b/ace/Default_Constants.h
@@ -51,7 +51,8 @@
 #endif /* ACE_DEFAULT_PAGEFILE_POOL_CHUNK */
 
 #if !defined (ACE_DEFAULT_PAGEFILE_POOL_NAME)
-#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_LIB_TEXT ("Default_ACE_Pagefile_Memory_Pool")
+#define ACE_DEFAULT_PAGEFILE_POOL_NAME_A "Default_ACE_Pagefile_Memory_Pool"
+#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_LIB_TEXT (ACE_DEFAULT_PAGEFILE_POOL_NAME_A)
 #endif /* ACE_DEFAULT_PAGEFILE_POOL_NAME */
 
 #if !defined (ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY)
@@ -124,7 +125,8 @@
 # endif /* ACE_DEFAULT_MAX_SOCKET_BUFSIZ */
 
 # if !defined (ACE_DEFAULT_SERVER_PORT_STR)
-#   define ACE_DEFAULT_SERVER_PORT_STR ACE_LIB_TEXT("20002")
+#   define ACE_DEFAULT_SERVER_PORT_STR_A "20002"
+#   define ACE_DEFAULT_SERVER_PORT_STR ACE_LIB_TEXT(ACE_DEFAULT_SERVER_PORT_STR_A)
 # endif /* ACE_DEFAULT_SERVER_PORT_STR */
 
 // Used for the Service_Directory test
@@ -199,9 +201,11 @@
 // Used by the FIFO tests and the Client_Logging_Handler netsvc.
 # if !defined (ACE_DEFAULT_RENDEZVOUS)
 #   if defined (ACE_HAS_STREAM_PIPES)
-#     define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("/tmp/fifo.ace")
+#     define ACE_DEFAULT_RENDEZVOUS_A "/tmp/fifo.ace"
+#     define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT(ACE_DEFAULT_RENDEZVOUS_A)
 #   else
-#     define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("localhost:20010")
+#     define ACE_DEFAULT_RENDEZVOUS_A "localhost:20010"
+#     define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT(ACE_DEFAULT_RENDEZVOUS_A)
 #   endif /* ACE_HAS_STREAM_PIPES */
 # endif /* ACE_DEFAULT_RENDEZVOUS */
 
@@ -213,23 +217,27 @@
 # if !defined (ACE_DEFAULT_LOGGER_KEY)
 
 #     if defined (ACE_HAS_STREAM_PIPES)
-#       define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon")
+#       define ACE_DEFAULT_LOGGER_KEY_A "/tmp/server_daemon"
+#       define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT (ACE_DEFAULT_LOGGER_KEY_A)
 #     else
-#       define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("localhost:20012")
+#       define ACE_DEFAULT_LOGGER_KEY_A "localhost:20012"
+#       define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT (ACE_DEFAULT_LOGGER_KEY_A)
 #     endif /* ACE_HAS_STREAM_PIPES */
 # endif /* ACE_DEFAULT_LOGGER_KEY */
 
 // The way to specify the local host for loopback IP. This is usually
 // "localhost" but it may need changing on some platforms.
 # if !defined (ACE_LOCALHOST)
-#   define ACE_LOCALHOST ACE_LIB_TEXT ("localhost")
+#   define ACE_LOCALHOST_A "localhost"
+#   define ACE_LOCALHOST ACE_LIB_TEXT (ACE_LOCALHOST_A)
 # endif
 
 // This specification for an IPv6 localhost should work on all platforms
 // supporting IPv6
 # if defined (ACE_HAS_IPV6)
 #   if !defined (ACE_IPV6_LOCALHOST)
-#     define ACE_IPV6_LOCALHOST ACE_LIB_TEXT ("::1")
+#     define ACE_IPV6_LOCALHOST_A "::1"
+#     define ACE_IPV6_LOCALHOST ACE_LIB_TEXT (ACE_IPV6_LOCALHOST_A)
 #   endif /* ACE_IPV6_LOCALHOST*/
 #endif /* ACE_HAS_IPV6 */
 
@@ -237,14 +245,17 @@
 // supporting IPv6
 # if defined (ACE_HAS_IPV6)
 #   if !defined (ACE_IPV6_ANY)
-#     define ACE_IPV6_ANY ACE_LIB_TEXT ("::")
+#     define ACE_IPV6_ANY_A "::"
+#     define ACE_IPV6_ANY ACE_LIB_TEXT (ACE_IPV6_ANY_A)
 #   endif /* ACE_IPV6_ANY*/
 #endif /* ACE_HAS_IPV6 */
 
 # if !defined (ACE_DEFAULT_SERVER_HOST)
 #   if defined (ACE_HAS_IPV6)
+#     define ACE_DEFAULT_SERVER_HOST_A ACE_IPV6_LOCALHOST_A
 #     define ACE_DEFAULT_SERVER_HOST ACE_IPV6_LOCALHOST
 #   else /*ACE_HAS_IPV6*/
+#     define ACE_DEFAULT_SERVER_HOST_A ACE_LOCALHOST_A
 #     define ACE_DEFAULT_SERVER_HOST ACE_LOCALHOST
 #   endif /*ACE_HAS_IPV6*/
 # endif /* ACE_DEFAULT_SERVER_HOST */
@@ -431,10 +442,8 @@
 #endif /* ACE_WIN32 */
 
 // Define the Wide character and normal versions of some of the string macros
-#if defined (ACE_HAS_WCHAR)
 #  define ACE_DIRECTORY_SEPARATOR_STR_W ACE_TEXT_WIDE(ACE_DIRECTORY_SEPARATOR_STR_A)
 #  define ACE_DIRECTORY_SEPARATOR_CHAR_W ACE_TEXT_WIDE(ACE_DIRECTORY_SEPARATOR_CHAR_A)
-#endif /* ACE_HAS_WCHAR */
 
 #define ACE_DIRECTORY_SEPARATOR_STR ACE_LIB_TEXT (ACE_DIRECTORY_SEPARATOR_STR_A)
 #define ACE_DIRECTORY_SEPARATOR_CHAR ACE_LIB_TEXT (ACE_DIRECTORY_SEPARATOR_CHAR_A)
@@ -467,10 +476,8 @@
 #endif /* ACE_WIN32 */
 
 // Define the Wide character and normal versions of some of the string macros
-#if defined (ACE_HAS_WCHAR)
 #  define ACE_PLATFORM_W ACE_TEXT_WIDE(ACE_PLATFORM_A)
 #  define ACE_PLATFORM_EXE_SUFFIX_W ACE_TEXT_WIDE(ACE_PLATFORM_EXE_SUFFIX_A)
-#endif /* ACE_HAS_WCHAR */
 
 #define ACE_PLATFORM ACE_LIB_TEXT (ACE_PLATFORM_A)
 #define ACE_PLATFORM_EXE_SUFFIX ACE_LIB_TEXT (ACE_PLATFORM_EXE_SUFFIX_A)
@@ -486,7 +493,8 @@
 #  endif /* __MINGW32__ */
 #else /* !ACE_WIN32 */
 #  if !defined (ACE_LD_SEARCH_PATH)
-#    define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("LD_LIBRARY_PATH")
+#    define ACE_LD_SEARCH_PATH_A "LD_LIBRARY_PATH"
+#    define ACE_LD_SEARCH_PATH ACE_LIB_TEXT (ACE_LD_SEARCH_PATH_A)
 #  endif /* ACE_LD_SEARCH_PATH */
 #  if !defined (ACE_LD_SEARCH_PATH_SEPARATOR_STR)
 #    define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_LIB_TEXT (":")
@@ -505,9 +513,11 @@
 // Used for dynamic linking
 #   if !defined (ACE_DEFAULT_SVC_CONF)
 #     if (ACE_USES_CLASSIC_SVC_CONF == 1)
-#       define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf")
+#       define ACE_DEFAULT_SVC_CONF_A ".\\svc.conf"
+#       define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A)
 #     else
-#       define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf.xml")
+#       define ACE_DEFAULT_SVC_CONF_A ".\\svc.conf.xml"
+#       define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A)
 #     endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
 #   endif /* ACE_DEFAULT_SVC_CONF */
 #endif /* ACE_WIN32 */
@@ -515,14 +525,17 @@
  // Used for dynamic linking.
 #if !defined (ACE_DEFAULT_SVC_CONF)
 #  if (ACE_USES_CLASSIC_SVC_CONF == 1)
-#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf")
+#    define ACE_DEFAULT_SVC_CONF_A "./svc.conf"
+#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A)
 #  else
-#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf.xml")
+#    define ACE_DEFAULT_SVC_CONF_A "./svc.conf.xml"
+#    define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (ACE_DEFAULT_SVC_CONF_A)
 #  endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */
 #endif /* ACE_DEFAULT_SVC_CONF */
 
 #if !defined (ACE_LOGGER_KEY)
-#  define ACE_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon")
+#  define ACE_LOGGER_KEY_A "/tmp/server_daemon"
+#  define ACE_LOGGER_KEY ACE_LIB_TEXT (ACE_LOGGER_KEY_A)
 #endif /* ACE_LOGGER_KEY */
 
 // Theses defines are used by the ACE Name Server.
@@ -542,16 +555,12 @@
 #  else /* ACE_WIN32 */
 #    define ACE_DEFAULT_NAMESPACE_DIR_A "/tmp"
 #  endif /* ACE_WIN32 */
-#  if defined (ACE_HAS_WCHAR)
 #    define ACE_DEFAULT_NAMESPACE_DIR_W ACE_TEXT_WIDE(ACE_DEFAULT_NAMESPACE_DIR_A)
-#  endif /* ACE_HAS_WCHAR */
 #    define ACE_DEFAULT_NAMESPACE_DIR ACE_LIB_TEXT(ACE_DEFAULT_NAMESPACE_DIR_A)
 #endif /* ACE_LEGACY_MODE */
 
-#if defined (ACE_HAS_WCHAR)
 #  define ACE_DEFAULT_LOCALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_LOCALNAME_A)
 #  define ACE_DEFAULT_GLOBALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_GLOBALNAME_A)
-#endif /* ACE_HAS_WCHAR */
 
 #define ACE_DEFAULT_LOCALNAME ACE_LIB_TEXT (ACE_DEFAULT_LOCALNAME_A)
 #define ACE_DEFAULT_GLOBALNAME ACE_LIB_TEXT (ACE_DEFAULT_GLOBALNAME_A)
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index fa61f2ae6c5..e5a783d938c 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/ace/Dev_Poll_Reactor.cpp
@@ -1384,7 +1384,7 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
         }
       else
         {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"), handle, revents));
+          ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"), handle, revents));
           // ACE_ASSERT (0);
         }
 
diff --git a/ace/Dynamic_Service.h b/ace/Dynamic_Service.h
index d913f1a750d..88ac4115c12 100644
--- a/ace/Dynamic_Service.h
+++ b/ace/Dynamic_Service.h
@@ -42,12 +42,10 @@ class ACE_Dynamic_Service : public ACE_Dynamic_Service_Base
 {
 public:
   /// Return instance using @a name to search the Service_Repository.
-  static TYPE* instance (const ACE_TCHAR *name);
+  static TYPE* instance (const char *name);
 
-#if defined (ACE_USES_WCHAR)
   /// Return instance using @a name to search the Service_Repository.
-  static TYPE* instance (const ACE_ANTI_TCHAR *name);
-#endif  // ACE_USES_WCHAR
+  static TYPE* instance (const wchar_t *name);
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Dynamic_Service.inl b/ace/Dynamic_Service.inl
index 50bce680a39..108ddd32a09 100644
--- a/ace/Dynamic_Service.inl
+++ b/ace/Dynamic_Service.inl
@@ -4,12 +4,10 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_USES_WCHAR)
 template <class TYPE> ACE_INLINE TYPE *
 ACE_Dynamic_Service<TYPE>::instance (const ACE_ANTI_TCHAR *name)
 {
-  return instance (ACE_TEXT_CHAR_TO_TCHAR (name));
+  return instance (ACE_TEXT_TO_TCHAR_IN (name));
 }
-#endif  // ACE_USES_WCHAR
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Env_Value_T.inl b/ace/Env_Value_T.inl
index 63fe8df1f29..1af0296cf91 100644
--- a/ace/Env_Value_T.inl
+++ b/ace/Env_Value_T.inl
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -35,15 +36,9 @@ ACE_Env_Value<T>::open (const ACE_TCHAR *varname,
 template <class T> ACE_INLINE void
 ACE_Env_Value<T>::fetch_value (void)
 {
-#if defined (ACE_WIN32)
   const ACE_TCHAR *env = ACE_OS::getenv (this->varname_);
   if (env != 0)
     ACE_Convert (env, value_);
-#else
-  char *nenv = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (this->varname_));
-  if (nenv != 0)
-    ACE_Convert (ACE_TEXT_CHAR_TO_TCHAR (nenv), this->value_);
-#endif
 }
 
 template <class T> ACE_INLINE const ACE_TCHAR*
diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp
index c3991c309ea..cc471d5ce24 100644
--- a/ace/FILE_Connector.cpp
+++ b/ace/FILE_Connector.cpp
@@ -67,7 +67,7 @@ ACE_FILE_Connector::connect (ACE_FILE_IO &new_io,
       handle = ACE_OS::mkstemp (filename); // mkstemp() replaces "XXXXXX"
 
       if (handle == ACE_INVALID_HANDLE
-          || new_io.addr_.set (ACE_TEXT_CHAR_TO_TCHAR (filename)) != 0)
+          || new_io.addr_.set (ACE_TEXT_TO_TCHAR_IN (filename)) != 0)
         return -1;
 
       new_io.set_handle (handle);
diff --git a/ace/Functor.h b/ace/Functor.h
index 01967e5f977..9cf8f200336 100644
--- a/ace/Functor.h
+++ b/ace/Functor.h
@@ -480,9 +480,7 @@ public:
                    const char *rhs) const;
 };
 
-#if defined (ACE_HAS_WCHAR)
-
-#  if ! defined (ACE_LACKS_NATIVE_WCHAR_T)
+#  if ! defined (ACE_LACKS_BUILTIN_WCHAR_T)
 /**
  * @class ACE_Hash<wchar_t>
  *
@@ -495,7 +493,7 @@ public:
   /// Simply returns t
   unsigned long operator () (wchar_t t) const;
 };
-#  endif /* ACE_LACKS_NATIVE_WCHAR_T */
+#  endif /* ACE_LACKS_BUILTIN_WCHAR_T */
 /**
  * @class ACE_Hash<const wchar_t *>
  *
@@ -581,7 +579,6 @@ public:
                    const wchar_t *rhs) const;
 };
 
-#endif  // ACE_HAS_WCHAR
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ace/Functor.inl b/ace/Functor.inl
index 84e38313b02..c505ed328b3 100644
--- a/ace/Functor.inl
+++ b/ace/Functor.inl
@@ -56,13 +56,13 @@ ACE_Hash<char>::operator () (char t) const
   return t;
 }
 
-#if defined (ACE_HAS_WCHAR) && ! defined (ACE_LACKS_NATIVE_WCHAR_T)
+#if !defined (ACE_LACKS_BUILTIN_WCHAR_T)
 ACE_INLINE unsigned long
 ACE_Hash<wchar_t>::operator () (wchar_t t) const
 {
   return t;
 }
-#endif /* ACE_HAS_WCHAR && ! ACE_LACKS_NATIVE_WCHAR_T */
+#endif /* ACE_LACKS_BUILTIN_WCHAR_T */
 
 ACE_INLINE unsigned long
 ACE_Hash<signed char>::operator () (signed char t) const
@@ -243,9 +243,6 @@ ACE_Less_Than<char *>::operator () (const char *lhs, const char *rhs) const
   return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
-
-#if defined (ACE_HAS_WCHAR)
-
 ACE_INLINE unsigned long
 ACE_Hash<const wchar_t *>::operator () (const wchar_t *t) const
 {
@@ -284,6 +281,5 @@ ACE_Less_Than<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) c
   return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0;
 }
 
-#endif  // ACE_HAS_WCHAR
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Functor_String.h b/ace/Functor_String.h
index 6c68b026bd1..4becd6c4cf0 100644
--- a/ace/Functor_String.h
+++ b/ace/Functor_String.h
@@ -83,9 +83,6 @@ public:
                    const ACE_CString &rhs) const;
 };
 
-
-#if defined (ACE_USES_WCHAR)
-
 /**
  * @class ACE_Equal_To<ACE_WString>
  *
@@ -129,7 +126,6 @@ public:
                    const ACE_WString &rhs) const;
 };
 
-#endif /*ACE_USES_WCHAR*/
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ace/Functor_String.inl b/ace/Functor_String.inl
index 82e8775a718..a9d5f0597d6 100644
--- a/ace/Functor_String.inl
+++ b/ace/Functor_String.inl
@@ -29,7 +29,6 @@ ACE_Less_Than<ACE_CString>::operator () (const ACE_CString &lhs,
 }
 
 
-#if defined (ACE_USES_WCHAR)
 ACE_INLINE unsigned long
 ACE_Hash<ACE_WString>::operator () (const ACE_WString &t) const
 {
@@ -51,6 +50,5 @@ ACE_Less_Than<ACE_WString>::operator () (const ACE_WString &lhs,
   return (lhs < rhs);
 }
 
-#endif /*ACE_USES_WCHAR*/
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index db472fbbdd6..50e6d4fa07b 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -6,14 +6,6 @@
 #include "ace/Get_Opt.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/ACE.h"
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "ace/OS_Memory.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_ctype.h"
-#include "ace/OS_NS_stdlib.h"
-
 ACE_RCSID (ace,
            Get_Opt,
            "$Id$")
@@ -87,652 +79,17 @@ ACE_RCSID (ace,
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+// Open versioned namespace, if enabled by the user.
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_ALLOC_HOOK_DEFINE(ACE_Get_Opt)
-
-ACE_Get_Opt::ACE_Get_Opt (int argc,
-                          ACE_TCHAR **argv,
-                          const ACE_TCHAR *optstring,
-                          int skip,
-                          int report_errors,
-                          int ordering,
-                          int long_only)
-  : argc_ (argc),
-    argv_ (argv),
-    optind (skip),
-    opterr (report_errors),
-    optarg (0),
-    optstring_ (0),
-    long_only_ (long_only),
-    has_colon_ (0),
-    last_option_ (0),
-    nextchar_ (0),
-    optopt_ (0),
-    ordering_ (ordering),
-    nonopt_start_ (optind),
-    nonopt_end_ (optind),
-    long_option_ (0)
-{
-  ACE_TRACE ("ACE_Get_Opt::ACE_Get_Opt");
-
-  ACE_NEW (this->optstring_, ACE_TString (optstring));
-  ACE_NEW (this->last_option_, ACE_TString (ACE_LIB_TEXT ("")));
-
-  // First check to see if POSIXLY_CORRECT was set.
-  // Win32 is the only platform capable of wide-char env var.
-#if defined (ACE_WIN32)
-  const ACE_TCHAR *env_check = ACE_LIB_TEXT ("POSIXLY_CORRECT");
-#else
-  const char *env_check = "POSIXLY_CORRECT";
-#endif
-  if (ACE_OS::getenv (env_check) != 0)
-    this->ordering_ = REQUIRE_ORDER;
-
-  // Now, check to see if any or the following were passed at
-  // the begining of optstring: '+' same as POSIXLY_CORRECT;
-  // '-' turns off POSIXLY_CORRECT; or ':' which signifies we
-  // should return ':' if a parameter is missing for an option.
-  // We use a loop here, since a combination of "{+|-}:" in any
-  // order should be legal.
-  int done  = 0;
-  int offset = 0;
-  while (!done)
-    {
-      switch (optstring[offset++])
-        {
-        case '+':
-          this->ordering_ = REQUIRE_ORDER;
-          break;
-        case '-':
-          this->ordering_ = RETURN_IN_ORDER;
-          break;
-        case ':':
-          this->has_colon_ = 1;
-          break;
-        default:
-          // Quit as soon as we see something else...
-          done = 1;
-          break;
-        }
-    }
-}
-
-ACE_Get_Opt::~ACE_Get_Opt (void)
-{
-  ACE_TRACE ("ACE_Get_Opt::~ACE_Get_Opt");
-
-  size_t i = 0;
-  size_t size = this->long_opts_.size ();
-  ACE_Get_Opt_Long_Option *option = 0;
-  for (i = 0; i < size; ++i)
-    {
-     int retval = this->long_opts_.get (option, i);
-      if (retval != 0)
-        {
-          // Should never happen.
-          retval = 0;
-          continue;
-        }
-      if (option)
-        {
-          delete option;
-          option = 0;
-        }
-    }
-  delete this->optstring_;
-  delete this->last_option_;
-}
-
-int
-ACE_Get_Opt::nextchar_i (void)
-{
-  ACE_TRACE ("ACE_Get_Opt::nextchar_i");
-
-  if (this->ordering_ == PERMUTE_ARGS)
-    if (this->permute () == EOF)
-      return EOF;
-
-  // Update scanning pointer.
-  if (this->optind >= this->argc_)
-    {
-      // We're done...
-      this->nextchar_ = 0;
-      return EOF;
-    }
-  else if (*(this->nextchar_ = this->argv_[this->optind]) != '-'
-            || this->nextchar_[1] == '\0')
-    {
-      // We didn't get an option.
-
-      if (this->ordering_ == REQUIRE_ORDER
-          || this->ordering_ == PERMUTE_ARGS)
-        // If we permuted or require the options to be in order, we're done.
-        return EOF;
-
-      // It must be RETURN_IN_ORDER...
-      this->optarg = this->argv_[this->optind++];
-      this->nextchar_ = 0;
-      return 1;
-    }
-  else if (this->nextchar_[1] != 0
-           && *++this->nextchar_ == '-'
-           && this->nextchar_[1] == 0)
-    {
-      // Found "--" so we're done...
-      ++this->optind;
-      this->nextchar_ = 0;
-      return EOF;
-    }
-
-  // If it's a long option, and we allow long options advance nextchar_.
-  if (*this->nextchar_ == '-' && this->long_opts_.size () != 0)
-    this->nextchar_++;
-
-  return 0;
-}
-
-int
-ACE_Get_Opt::long_option_i (void)
-{
-  ACE_TRACE ("ACE_Get_Opt::long_option_i");
-
-  ACE_Get_Opt_Long_Option *p;
-  ACE_TCHAR *s = this->nextchar_;
-  int hits = 0;
-  int exact = 0;
-  ACE_Get_Opt_Long_Option *pfound = 0;
-  int indfound = 0;
-
-  // Advance to the end of the long option name so we can use
-  // it to get the length for a string compare.
-  while (*s && *s != '=')
-    s++;
-
-  size_t len = s - this->nextchar_;
-  // set last_option_ to nextchar_, up to the '='.
-  this->last_option (ACE_TString (this->nextchar_, len));
-
-  size_t size = this->long_opts_.size ();
-  u_int option_index = 0;
-  for (option_index = 0; option_index < size ; option_index++)
-    {
-      p = this->long_opts_[option_index];
-      ACE_ASSERT (p);
-
-      if (!ACE_OS::strncmp (p->name_, this->nextchar_, len))
-        {
-          // Got at least a partial match.
-          pfound = p;
-          indfound = option_index;
-          hits += 1;
-          if (len == ACE_OS::strlen(p->name_))
-            {
-              // And in fact, it's an exact match, so let's use it.
-              exact = 1;
-              break;
-            }
-        }
-    }
-
-  if ((hits > 1) && !exact)
-    {
-      // Great, we found a match, but unfortunately we found more than
-      // one and it wasn't exact.
-      if (this->opterr)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT ("%s: option `%s' is ambiguous\n"),
-                    this->argv_[0], this->argv_[this->optind]));
-      this->nextchar_ = 0;
-      this->optind++;
-      return '?';
-    }
-
-  if (pfound != 0)
-    {
-      // Okay, we found a good one (either a single hit or an exact match).
-      option_index = indfound;
-      this->optind++;
-      if (*s)
-        {
-          // s must point to '=' which means there's an argument (well
-          // close enough).
-          if (pfound->has_arg_ != NO_ARG)
-            // Good, we want an argument and here it is.
-            this->optarg = ++s;
-          else
-            {
-              // Whoops, we've got what looks like an argument, but we
-              // don't want one.
-              if (this->opterr)
-                  ACE_ERROR
-                    ((LM_ERROR,
-                      ACE_LIB_TEXT ("%s: long option `--%s' doesn't allow ")
-                      ACE_LIB_TEXT ("an argument\n"),
-                      this->argv_[0], pfound->name_));
-              // The spec doesn't cover this, so we keep going and the program
-              // doesn't know we ignored an argument if opt_err is off!!!
-            }
-        }
-      else if (pfound->has_arg_ == ARG_REQUIRED)
-        {
-          // s didn't help us, but we need an argument. Note that
-          // optional arguments for long options must use the "=" syntax,
-          // so we won't get here in that case.
-          if (this->optind < this->argc_)
-            // We still have some elements left, so use the next one.
-            this->optarg = this->argv_[this->optind++];
-          else
-            {
-              // All out of elements, so we have to punt...
-              if (this->opterr)
-                ACE_ERROR ((LM_ERROR,
-                            ACE_LIB_TEXT ("%s: long option '--%s' requires ")
-                            ACE_LIB_TEXT ("an argument\n"),
-                            this->argv_[0], pfound->name_));
-              this->nextchar_ = 0;
-              this->optopt_ = pfound->val_;   // Remember matching short equiv
-              return this->has_colon_ ? ':' : '?';
-            }
-        }
-      this->nextchar_ = 0;
-      this->long_option_ = pfound;
-      // Since val_ has to be either a valid short option or 0, this works
-      // great.  If the user really wants to know if a long option was passed.
-      this->optopt_ = pfound->val_;
-      return pfound->val_;
-    }
-  if (!this->long_only_ || this->argv_[this->optind][1] == '-'
-      || this->optstring_->find (*this->nextchar_) == ACE_TString::npos)
-    {
-      // Okay, we couldn't find a long option.  If it isn't long_only (which
-      // means try the long first, and if not found try the short) or a long
-      // signature was passed, e.g. "--", or it's not a short (not sure when
-      // this could happen) it's an error.
-      if (this->opterr)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT ("%s: illegal long option '--%s'\n"),
-                    this->argv_[0], this->nextchar_));
-      this->nextchar_ = 0;
-      this->optind++;
-      return '?';
-    }
-  return this->short_option_i ();
-}
-
-int
-ACE_Get_Opt::short_option_i (void)
-{
-  ACE_TRACE ("ACE_Get_Opt::short_option_i");
-
-  /* Look at and handle the next option-character.  */
-  ACE_TCHAR opt = *this->nextchar_++;
-  // Set last_option_ to opt
-  this->last_option (opt);
-
-  ACE_TCHAR *oli = 0;
-  oli =
-    const_cast<ACE_TCHAR*> (ACE_OS::strchr (this->optstring_->c_str (), opt));
-
-  /* Increment `optind' when we start to process its last character.  */
-  if (*this->nextchar_ == '\0')
-    ++this->optind;
-
-  if (oli == 0 || opt == ':')
-    {
-      if (this->opterr)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_LIB_TEXT ("%s: illegal short option -- %c\n"),
-                    this->argv_[0], opt));
-      return '?';
-    }
-  if (opt == 'W' && oli[1] == ';')
-    {
-      if (this->nextchar_[0] == 0)
-        this->nextchar_ = this->argv_[this->optind];
-      return long_option_i ();
-    }
-  this->optopt_ = oli[0];      // Remember the option that matched
-  if (oli[1] == ':')
-    {
-      if (oli[2] == ':')
-        {
-          // Takes an optional argument, and since short option args must
-          // must follow directly in the same argument, a NULL nextchar_
-          // means we didn't get one.
-          if (*this->nextchar_ != '\0')
-            {
-              this->optarg = this->nextchar_;
-              this->optind++;
-            }
-          else
-            this->optarg = 0;
-          this->nextchar_ = 0;
-        }
-      else
-        {
-          // Takes a required argument.
-          if (*this->nextchar_ != '\0')
-            {
-              // Found argument in same argv-element.
-              this->optarg = this->nextchar_;
-              this->optind++;
-            }
-          else if (this->optind == this->argc_)
-            {
-              // Ran out of arguments before finding required argument.
-              if (this->opterr)
-                ACE_ERROR ((LM_ERROR,
-                            ACE_LIB_TEXT ("%s: short option requires ")
-                            ACE_LIB_TEXT ("an argument -- %c\n"),
-                            this->argv_[0], opt));
-              opt = this->has_colon_ ? ':' : '?';
-            }
-          else
-            // Use the next argv-element as the argument.
-            this->optarg = this->argv_[this->optind++];
-          this->nextchar_ = 0;
-        }
-    }
-  return opt;
-}
-
-int
-ACE_Get_Opt::operator () (void)
-{
-  ACE_TRACE ("ACE_Get_Opt_Long::operator");
-
-  // First of all, make sure we reinitialize any pointers..
-  this->optarg = 0;
-  this->long_option_ = 0;
-
-  if (this->argv_ == 0)
-    {
-      // It can happen, e.g., on VxWorks.
-      this->optind = 0;
-      return -1;
-    }
-
-  // We check this because we can string short options together if the
-  // preceding one doesn't take an argument.
-  if (this->nextchar_ == 0 || *this->nextchar_ == '\0')
-    {
-      int retval = this->nextchar_i ();
-      if (retval != 0)
-        return retval;
-    }
-
-  if (((this->argv_[this->optind][0] == '-')
-       && (this->argv_[this->optind][1] == '-')) || this->long_only_)
-    return this->long_option_i ();
-
-  return this->short_option_i ();
-}
-
-int
-ACE_Get_Opt::long_option (const ACE_TCHAR *name,
-                          OPTION_ARG_MODE has_arg)
-{
-  ACE_TRACE ("ACE_Get_Opt::long_option (const ACE_TCHAR *name, OPTION_ARG_MODE has_arg)");
-  return this->long_option (name, 0, has_arg);
-}
-
-int
-ACE_Get_Opt::long_option (const ACE_TCHAR *name,
-                          int short_option,
-                          OPTION_ARG_MODE has_arg)
-{
-  ACE_TRACE ("ACE_Get_Opt::long_option (const ACE_TCHAR *name, int short_option, OPTION_ARG_MODE has_arg)");
-
-  // We only allow valid alpha-numeric characters as short options.
-  // If short_options is not a valid alpha-numeric, we can still return it
-  // when the long option is found, but won't allow the caller to pass it on
-  // the command line (how could they?).  The special case is 0, but since
-  // we always return it, we let the caller worry about that.
-#if defined (_MSC_VER) && (_MSC_VER >= 1300)
-  // For MSVC 7.x, we need to prevent "illegal" character getting into
-  // isalnum, otherwise, it will crash the program.
-  if (short_option > 0 &&
-      short_option < 256 &&
-      ACE_OS::ace_isalnum (static_cast<char> (short_option)) != 0)
-#else
-  if (ACE_OS::ace_isalnum (short_option) != 0)
-#endif /* _MSC_VER && _MSC_VER >= 1300 */
-    {
-      // If the short_option already exists, make sure it matches, otherwise
-      // add it.
-      ACE_TCHAR *s = 0;
-      if ((s = const_cast<ACE_TCHAR*> (
-                 ACE_OS::strchr (this->optstring_->c_str (),
-                                 short_option))) != 0)
-        {
-          // Short option exists, so verify the argument options
-          if (s[1] == ':')
-            {
-              if (s[2] == ':')
-                {
-                  if (has_arg != ARG_OPTIONAL)
-                    {
-                      if (this->opterr)
-                        ACE_ERROR
-                          ((LM_ERROR,
-                            ACE_LIB_TEXT ("Existing short option '%c' takes ")
-                            ACE_LIB_TEXT ("optional argument; adding %s ")
-                            ACE_LIB_TEXT ("requires ARG_OPTIONAL\n"),
-                            short_option, name));
-                      return -1;
-                    }
-                }
-              else
-                if (has_arg != ARG_REQUIRED)
-                  {
-                    if (this->opterr)
-                      ACE_ERROR
-                        ((LM_ERROR,
-                          ACE_LIB_TEXT ("Existing short option '%c' requires ")
-                          ACE_LIB_TEXT ("an argument; adding %s ")
-                          ACE_LIB_TEXT ("requires ARG_REQUIRED\n"),
-                          short_option, name));
-                    return -1;
-                  }
-            }
-          else if (has_arg != NO_ARG)
-            {
-              if (this->opterr)
-                ACE_ERROR
-                  ((LM_ERROR,
-                    ACE_LIB_TEXT ("Existing short option '%c' does not ")
-                    ACE_LIB_TEXT ("accept an argument; adding %s ")
-                    ACE_LIB_TEXT ("requires NO_ARG\n"),
-                    short_option, name));
-              return -1;
-            }
-        }
-      else
-        {
-          // Didn't find short option, so add it...
-          *this->optstring_ += (ACE_TCHAR) short_option;
-          if (has_arg == ARG_REQUIRED)
-            *this->optstring_ += ACE_LIB_TEXT (":");
-          else if (has_arg == ARG_OPTIONAL)
-            *this->optstring_ += ACE_LIB_TEXT ("::");
-        }
-    }
-
-  ACE_Get_Opt_Long_Option *option =
-    new ACE_Get_Opt_Long_Option (name, has_arg, short_option);
-
-  if (!option)
-    return -1;
-
-  // Add to array
-  size_t size = this->long_opts_.size ();
-  if (this->long_opts_.size (size + 1) != 0
-      || this->long_opts_.set (option, size) != 0)
-    {
-      delete option;
-      ACE_ERROR_RETURN
-        ((LM_ERROR, ACE_LIB_TEXT ("Could not add long option to array.\n")),
-         -1);
-    }
-  return 0;
-}
-
-const ACE_TCHAR*
-ACE_Get_Opt::long_option (void) const
-{
-  ACE_TRACE ("ACE_Get_Opt::long_option (void)");
-  if (this->long_option_)
-    return this->long_option_->name_;
-  return 0;
-}
-
-const ACE_TCHAR*
-ACE_Get_Opt::last_option (void) const
-{
-  return this->last_option_->c_str ();
-}
-
-void
-ACE_Get_Opt::last_option (const ACE_TString &last_option)
-{
-  *this->last_option_ = last_option;
-}
-
-void
-ACE_Get_Opt::dump (void) const
-{
-#if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Get_Opt::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")
-              ACE_LIB_TEXT ("opstring_ = %s\n")
-              ACE_LIB_TEXT ("long_only_ = %d\n")
-              ACE_LIB_TEXT ("has_colon_ = %d\n")
-              ACE_LIB_TEXT ("last_option_ = %s\n")
-              ACE_LIB_TEXT ("nextchar_ = %s\n")
-              ACE_LIB_TEXT ("optopt_ = %c\n")
-              ACE_LIB_TEXT ("ordering_ = %d\n"),
-              this->optstring_->c_str (),
-              this->long_only_,
-              this->has_colon_,
-              this->last_option_->c_str (),
-              this->nextchar_,
-              this->optopt_,
-              this->ordering_));
-
-  // now loop through the
-  size_t size = this->long_opts_.size ();
-  for (u_int i = 0; i < size ; ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")
-                  ACE_LIB_TEXT ("long_option name_ = %s\n")
-                  ACE_LIB_TEXT ("has_arg_ = %d\n")
-                  ACE_LIB_TEXT ("val_ = %d\n"),
-                  this->long_opts_[i]->name_,
-                  this->long_opts_[i]->has_arg_,
-                  this->long_opts_[i]->val_));
-    }
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-#endif /* ACE_HAS_DUMP */
-}
-
-void
-ACE_Get_Opt::permute_args (void)
-{
-  ACE_TRACE ("ACE_Get_Opt::permute_args");
-
-  u_long cyclelen, i, j, ncycle, nnonopts, nopts;
-  u_long opt_end = this->optind;
-  int cstart, pos = 0;
-  ACE_TCHAR *swap = 0;
-
-  nnonopts = this->nonopt_end_ - this->nonopt_start_;
-  nopts = opt_end - this->nonopt_end_;
-  ncycle = ACE::gcd (nnonopts, nopts);
-  cyclelen = (opt_end - this->nonopt_start_) / ncycle;
-
-  this->optind = this->optind - nnonopts;
-
-  for (i = 0; i < ncycle; i++)
-    {
-      cstart = this->nonopt_end_ + i;
-      pos = cstart;
-      for (j = 0; j < cyclelen; j++)
-        {
-          if (pos >= this->nonopt_end_)
-            pos -= nnonopts;
-          else
-            pos += nopts;
-          swap = this->argv_[pos];
-
-          ((ACE_TCHAR **)this->argv_)[pos] = argv_[cstart];
-
-          ((ACE_TCHAR **)this->argv_)[cstart] = swap;
-        }
-    }
-}
-
-int
-ACE_Get_Opt::permute (void)
-{
-  ACE_TRACE ("ACE_Get_Opt::permute");
-
-  if (this->nonopt_start_ != this->nonopt_end_
-      && this->nonopt_start_ != this->optind)
-    this->permute_args ();
-
-  this->nonopt_start_ = this->optind;
-
-  // Skip over args untill we find the next option.
-  while (this->optind < this->argc_
-         && (this->argv_[this->optind][0] != '-'
-             || this->argv_[this->optind][1] == '\0'))
-    this->optind++;
-
-  // Got an option, so mark this as the end of the non options.
-  this->nonopt_end_ = this->optind;
-
-  if (this->optind != this->argc_
-      && ACE_OS::strcmp (this->argv_[this->optind],
-                         ACE_LIB_TEXT ("--")) == 0)
-    {
-      // We found the marker for the end of the options.
-      this->optind++;
-
-      if (this->nonopt_start_ != this->nonopt_end_
-          && this->nonopt_end_ != this->optind)
-        this->permute_args ();
-    }
-
-  if (this->optind == this->argc_)
-    {
-      if (this->nonopt_start_ != this->nonopt_end_)
-        this->optind = this->nonopt_start_;
-      return EOF;
-    }
-  return 0;
-}
-
-const ACE_TCHAR *
-ACE_Get_Opt::optstring (void) const
-{
-  return this->optstring_->c_str ();
-}
-
-ACE_Get_Opt::ACE_Get_Opt_Long_Option::ACE_Get_Opt_Long_Option (
-  const ACE_TCHAR *name,
-  int has_arg,
-  int val)
-  :  name_ (ACE::strnew (name)),
-     has_arg_ (has_arg),
-     val_ (val)
-{}
-
-ACE_Get_Opt::ACE_Get_Opt_Long_Option::~ACE_Get_Opt_Long_Option (void)
-{
-  delete [] this->name_;
-}
+/**
+ * Templates cannot be exported. Only explicit instances can.
+ * This is also a way to restrict what instances will be
+ *  publicly available.
+ */
+#if !defined (__ACE_INLINE__)
+  template class ACE_Get_Arg_Opt< ACE_TCHAR >;
+#endif /* __ACE_INLINE__ */
 
+// Close versioned namespace, if enabled by the user.
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Get_Opt.h b/ace/Get_Opt.h
index 73a18f6a051..2237dd412f9 100644
--- a/ace/Get_Opt.h
+++ b/ace/Get_Opt.h
@@ -30,20 +30,24 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /*
  *  These definitions are for backward compatibility with previous versions.
- *  of ACE_Get_Opt.
+ *  of ACE_Get_Arg_Opt.
  */
 
 /**
- * @class ACE_Get_Opt
+ * @class ACE_Get_Arg_Opt
  *
  * @brief Iterator for parsing command-line arguments.
  *
  * This is a C++ wrapper for getopt(3c) and getopt_long(3c).
  */
 
-class ACE_Export ACE_Get_Opt
+template < typename CHAR_TYPE = char >
+class ACE_Export ACE_Get_Arg_Opt
 {
 public:
+  typedef CHAR_TYPE Char;
+  typedef ACE_String_Base<Char> String;
+
   /// Mutually exclusive ordering values.
   enum
   {
@@ -169,16 +173,16 @@ public:
    * xxx" will only find "xxx" as the argument for @e c if @a optstring is
    * specified as @c "abc:" not @c "abc::".
    */
-  ACE_Get_Opt (int argc,
-               ACE_TCHAR **argv,
-               const ACE_TCHAR *optstring = ACE_LIB_TEXT (""),
+  ACE_Get_Arg_Opt (int argc,
+               Char **argv,
+               const Char *optstring = 0,
                int skip_args = 1,
                int report_errors = 0,
                int ordering = PERMUTE_ARGS,
                int long_only = 0);
 
   /// Default dtor.
-  ~ACE_Get_Opt (void);
+  ~ACE_Get_Arg_Opt (void);
 
   /**
    * Scan elements of @a argv (whose length is @a argc) for short option
@@ -218,12 +222,14 @@ public:
    */
   int operator () (void);
 
+  static int eof();
+
   /**
    * For communication from @c operator() to the caller.  When
    * @c operator() finds an option that takes an argument, the argument
    * value is returned from this method, otherwise it returns 0.
    */
-  ACE_TCHAR *opt_arg (void) const;
+  Char *opt_arg (void) const;
 
   /**
    * Returns the most recently matched option character. Especially
@@ -231,7 +237,7 @@ public:
    * that's required, since this allows the caller to learn what option
    * was specified without its required argument.
    */
-  int opt_opt (void);
+  Char opt_opt (void);
 
   /**
    * Index in @a argv of the next element to be scanned.  This is used
@@ -258,7 +264,7 @@ public:
    * @retval 0  Success
    * @retval -1 The long option can not be added.
    */
-  int long_option (const ACE_TCHAR *name,
+  int long_option (const Char *name,
                    OPTION_ARG_MODE has_arg = NO_ARG);
 
   /// Adds a long option with a corresponding short option.
@@ -275,32 +281,32 @@ public:
    * @retval 0  Success
    * @retval -1 The long option can not be added.
    */
-  int long_option (const ACE_TCHAR *name,
+  int long_option (const Char *name,
                    int short_option,
                    OPTION_ARG_MODE has_arg = NO_ARG);
 
   /// Returns the name of the long option found on the last call to
   /// @c operator() or 0 if none was found.
-  const ACE_TCHAR *long_option (void) const;
+  const Char *long_option (void) const;
 
   /// The number of arguments in the internal @c argv_.
   int argc (void) const;
 
   /// Accessor for the internal @c argv_ pointer.
-  ACE_TCHAR **argv (void) const;
+  Char **argv (void) const;
 
   /// Accessor for the @c last_option that was processed.  This allows
   /// applications to know if the found option was a short or long
   /// option, and is especially useful in cases where it was invalid
   /// and the caller wants to print out the invalid value.
-  const ACE_TCHAR *last_option (void) const;
+  const Char *last_option (void) const;
 
   /// Dump the state of an object.
   void dump (void) const;
 
   /// Return the @a optstring.  This is handy to verify that calls to
   /// long_option added short options as expected.
-  const ACE_TCHAR *optstring (void) const;
+  const Char *optstring (void) const;
 
 public:
   /*
@@ -325,7 +331,7 @@ public:
    * write code that relies on this member being public; use the
    * @c argv() accessor method instead.
    */
-  ACE_TCHAR **argv_;
+  Char **argv_;
 
   /// Index in @c argv_ of the next element to be scanned.
   /**
@@ -354,18 +360,18 @@ public:
    * write code that relies on this member being public; use the
    * @c opt_arg() accessor method instead.
    */
-  ACE_TCHAR *optarg;
+  Char *optarg;
 
 private:
   /**
    * @class ACE_Get_Opt_Long_Option  This class is for internal use
-   * in the ACE_Get_Opt class, and is inaccessible to users.
+   * in the ACE_Get_Arg_Opt class, and is inaccessible to users.
    */
   class ACE_Get_Opt_Long_Option
   {
   public:
     /// ctor
-    ACE_Get_Opt_Long_Option (const ACE_TCHAR *name,
+    ACE_Get_Opt_Long_Option (const Char *name,
                              int has_arg,
                              int val = 0);
 
@@ -375,7 +381,7 @@ private:
     bool operator < (const ACE_Get_Opt_Long_Option &rhs);
 
     /// Long option name.
-    const ACE_TCHAR *name_;
+    const Char *name_;
 
     /// Contains value for <OPTION_ARG_MODE>.
     int has_arg_;
@@ -390,7 +396,7 @@ private:
   };
 
   /// Updates nextchar_.
-  int nextchar_i (void);
+  Char nextchar_i (void);
 
   /// Handles long options.
   int long_option_i (void);
@@ -407,16 +413,12 @@ private:
   int permute (void);
 
   /// Set last_option.
-  void last_option (const ACE_TString &s);
-
-  // Disallow copying and assignment.
-  ACE_Get_Opt (const ACE_Get_Opt &);
-  ACE_Get_Opt &operator= (const ACE_Get_Opt &);
+  void last_option (const String &s);
 
 private:
 
   /// Holds the option string.
-  ACE_TString *optstring_;
+  String *optstring_;
 
   /// Treat all options as long options.
   int long_only_;
@@ -428,7 +430,7 @@ private:
 
   /// This is the last option, short or long, that was processed.  This
   /// is handy to have in cases where the option passed was invalid.
-  ACE_TString *last_option_;
+  String *last_option_;
 
   /**
    * The next char to be scanned in the option-element in which the
@@ -437,7 +439,7 @@ private:
    * If this is zero, or a null string, it means resume the scan
    * by advancing to the next <argv>-element.
    */
-  ACE_TCHAR *nextchar_;
+  Char *nextchar_;
 
   /// Most recently matched short option character.
   int optopt_;
@@ -462,13 +464,19 @@ private:
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
+  // Disallow copying and assignment.
+  ACE_UNIMPLEMENTED_FUNC (ACE_Get_Arg_Opt (const ACE_Get_Arg_Opt<CHAR_TYPE> &))
+    ACE_UNIMPLEMENTED_FUNC (ACE_Get_Arg_Opt &operator= (const ACE_Get_Arg_Opt<CHAR_TYPE> &))
 };
 
+typedef ACE_Get_Arg_Opt< ACE_TCHAR > ACE_Get_Opt;
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 #include "ace/Get_Opt.inl"
 #endif /* __ACE_INLINE__ */
 
+
 #include /**/ "ace/post.h"
 #endif /* ACE_GET_OPT_H */
diff --git a/ace/Get_Opt.inl b/ace/Get_Opt.inl
index cbe5f167e55..6683215bdf6 100644
--- a/ace/Get_Opt.inl
+++ b/ace/Get_Opt.inl
@@ -2,40 +2,742 @@
 //
 // $Id$
 
+#include "ace/ACE.h"
+#include "ace/Log_Msg.h"
+#include "ace/SString.h"
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_ctype.h"
+#include "ace/OS_NS_stdlib.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE bool
-ACE_Get_Opt::ACE_Get_Opt_Long_Option::operator < (const ACE_Get_Opt_Long_Option &rhs)
+ACE_ALLOC_HOOK_DEFINE(ACE_Get_Arg_Opt)
+
+template < typename CHAR_TYPE >
+ACE_Get_Arg_Opt<CHAR_TYPE>::ACE_Get_Arg_Opt (int argc,
+                          Char **argv,
+                          const Char *optstring,
+                          int skip,
+                          int report_errors,
+                          int ordering,
+                          int long_only)
+  : argc_ (argc),
+    argv_ (argv),
+    optind (skip),
+    opterr (report_errors),
+    optarg (0),
+    optstring_ (0),
+    long_only_ (long_only),
+    has_colon_ (0),
+    last_option_ (0),
+    nextchar_ (0),
+    optopt_ (0),
+    ordering_ (ordering),
+    nonopt_start_ (optind),
+    nonopt_end_ (optind),
+    long_option_ (0)
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::ACE_Get_Arg_Opt");
+
+  if ( optstring != 0 )
+    ACE_NEW (this->optstring_, String (optstring));
+  else
+    ACE_NEW (this->optstring_, String);
+  ACE_NEW (this->last_option_, String);
+
+  // First check to see if POSIXLY_CORRECT was set.
+  // Win32 is the only platform capable of wide-char env var.
+#if defined (ACE_WIN32)
+  const ACE_TCHAR *env_check = ACE_LIB_TEXT ("POSIXLY_CORRECT");
+#else
+  const char *env_check = "POSIXLY_CORRECT";
+#endif
+  if (ACE_OS::getenv (env_check) != 0)
+    this->ordering_ = REQUIRE_ORDER;
+
+  // Now, check to see if any or the following were passed at
+  // the begining of optstring: '+' same as POSIXLY_CORRECT;
+  // '-' turns off POSIXLY_CORRECT; or ':' which signifies we
+  // should return ':' if a parameter is missing for an option.
+  // We use a loop here, since a combination of "{+|-}:" in any
+  // order should be legal.
+  int done  = 0;
+  int offset = 0;
+  while (!done)
+    {
+      switch (optstring[offset++])
+        {
+        case ACE_LIB_TEXT('+'):
+          this->ordering_ = REQUIRE_ORDER;
+          break;
+        case ACE_LIB_TEXT('-'):
+          this->ordering_ = RETURN_IN_ORDER;
+          break;
+        case ACE_LIB_TEXT(':'):
+          this->has_colon_ = 1;
+          break;
+        default:
+          // Quit as soon as we see something else...
+          done = 1;
+          break;
+        }
+    }
+}
+
+template < typename CHAR_TYPE >
+ACE_Get_Arg_Opt<CHAR_TYPE>::~ACE_Get_Arg_Opt (void)
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::~ACE_Get_Arg_Opt");
+
+  size_t i = 0;
+  size_t size = this->long_opts_.size ();
+  ACE_Get_Opt_Long_Option *option = 0;
+  for (i = 0; i < size; ++i)
+    {
+     int retval = this->long_opts_.get (option, i);
+      if (retval != 0)
+        {
+          // Should never happen.
+          retval = 0;
+          continue;
+        }
+      if (option)
+        {
+          delete option;
+          option = 0;
+        }
+    }
+  delete this->optstring_;
+  delete this->last_option_;
+}
+
+template < typename CHAR_TYPE >
+typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char
+ACE_Get_Arg_Opt<CHAR_TYPE>::nextchar_i (void)
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::nextchar_i");
+
+  if (this->ordering_ == PERMUTE_ARGS)
+    if (this->permute () == eof())
+      return eof();
+
+  // Update scanning pointer.
+  if (this->optind >= this->argc_)
+    {
+      // We're done...
+      this->nextchar_ = 0;
+      return eof();
+    }
+  else if (*(this->nextchar_ = this->argv_[this->optind]) != ACE_LIB_TEXT('-')
+            || this->nextchar_[1] == ACE_LIB_TEXT('\0'))
+    {
+      // We didn't get an option.
+
+      if (this->ordering_ == REQUIRE_ORDER
+          || this->ordering_ == PERMUTE_ARGS)
+        // If we permuted or require the options to be in order, we're done.
+        return eof();
+
+      // It must be RETURN_IN_ORDER...
+      this->optarg = this->argv_[this->optind++];
+      this->nextchar_ = 0;
+      return 1;
+    }
+  else if (this->nextchar_[1] != 0
+           && *++this->nextchar_ == ACE_LIB_TEXT('-')
+           && this->nextchar_[1] == ACE_LIB_TEXT('\0'))
+    {
+      // Found "--" so we're done...
+      ++this->optind;
+      this->nextchar_ = 0;
+      return eof();
+    }
+
+  // If it's a long option, and we allow long options advance nextchar_.
+  if (*this->nextchar_ == ACE_LIB_TEXT('-') && this->long_opts_.size () != 0)
+    this->nextchar_++;
+
+  return ACE_LIB_TEXT('\0');
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_Get_Arg_Opt<CHAR_TYPE>::long_option_i (void)
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::long_option_i");
+
+  ACE_Get_Opt_Long_Option *p;
+  Char *s = this->nextchar_;
+  int hits = 0;
+  int exact = 0;
+  ACE_Get_Opt_Long_Option *pfound = 0;
+  int indfound = 0;
+
+  // Advance to the end of the long option name so we can use
+  // it to get the length for a string compare.
+  while (*s && *s != ACE_LIB_TEXT('='))
+    s++;
+
+  size_t len = s - this->nextchar_;
+  // set last_option_ to nextchar_, up to the '='.
+  this->last_option (String (this->nextchar_, len));
+
+  size_t size = this->long_opts_.size ();
+  u_int option_index = 0;
+  for (option_index = 0; option_index < size ; option_index++)
+    {
+      p = this->long_opts_[option_index];
+      ACE_ASSERT (p);
+
+      if (!ACE_OS::strncmp (p->name_, this->nextchar_, len))
+        {
+          // Got at least a partial match.
+          pfound = p;
+          indfound = option_index;
+          hits += 1;
+          if (len == ACE_OS::strlen(p->name_))
+            {
+              // And in fact, it's an exact match, so let's use it.
+              exact = 1;
+              break;
+            }
+        }
+    }
+
+  if ((hits > 1) && !exact)
+    {
+      // Great, we found a match, but unfortunately we found more than
+      // one and it wasn't exact.
+      if (this->opterr)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_LIB_TEXT ("%s: option `%s' is ambiguous\n"),
+                    this->argv_[0], this->argv_[this->optind]));
+      this->nextchar_ = 0;
+      this->optind++;
+      return ACE_LIB_TEXT('?');
+    }
+
+  if (pfound != 0)
+    {
+      // Okay, we found a good one (either a single hit or an exact match).
+      option_index = indfound;
+      this->optind++;
+      if (*s)
+        {
+          // s must point to '=' which means there's an argument (well
+          // close enough).
+          if (pfound->has_arg_ != NO_ARG)
+            // Good, we want an argument and here it is.
+            this->optarg = ++s;
+          else
+            {
+              // Whoops, we've got what looks like an argument, but we
+              // don't want one.
+              if (this->opterr)
+                  ACE_ERROR
+                    ((LM_ERROR,
+                      ACE_LIB_TEXT ("%s: long option `--%s' doesn't allow ")
+                      ACE_LIB_TEXT ("an argument\n"),
+                      this->argv_[0], pfound->name_));
+              // The spec doesn't cover this, so we keep going and the program
+              // doesn't know we ignored an argument if opt_err is off!!!
+            }
+        }
+      else if (pfound->has_arg_ == ARG_REQUIRED)
+        {
+          // s didn't help us, but we need an argument. Note that
+          // optional arguments for long options must use the "=" syntax,
+          // so we won't get here in that case.
+          if (this->optind < this->argc_)
+            // We still have some elements left, so use the next one.
+            this->optarg = this->argv_[this->optind++];
+          else
+            {
+              // All out of elements, so we have to punt...
+              if (this->opterr)
+                ACE_ERROR ((LM_ERROR,
+                            ACE_LIB_TEXT ("%s: long option '--%s' requires ")
+                            ACE_LIB_TEXT ("an argument\n"),
+                            this->argv_[0], pfound->name_));
+              this->nextchar_ = 0;
+              this->optopt_ = pfound->val_;   // Remember matching short equiv
+              return this->has_colon_ ? ACE_LIB_TEXT(':') : ACE_LIB_TEXT('?');
+            }
+        }
+      this->nextchar_ = 0;
+      this->long_option_ = pfound;
+      // Since val_ has to be either a valid short option or 0, this works
+      // great.  If the user really wants to know if a long option was passed.
+      this->optopt_ = pfound->val_;
+      return pfound->val_;
+    }
+  if (!this->long_only_ || this->argv_[this->optind][1] == ACE_LIB_TEXT('-')
+      || this->optstring_->find (*this->nextchar_) == String::npos)
+    {
+      // Okay, we couldn't find a long option.  If it isn't long_only (which
+      // means try the long first, and if not found try the short) or a long
+      // signature was passed, e.g. "--", or it's not a short (not sure when
+      // this could happen) it's an error.
+      if (this->opterr)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_LIB_TEXT ("%s: illegal long option '--%s'\n"),
+                    this->argv_[0], this->nextchar_));
+      this->nextchar_ = 0;
+      this->optind++;
+      return ACE_LIB_TEXT('?');
+    }
+  return this->short_option_i ();
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_Get_Arg_Opt<CHAR_TYPE>::short_option_i (void)
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::short_option_i");
+
+  /* Look at and handle the next option-character.  */
+  Char opt = *this->nextchar_++;
+  // Set last_option_ to opt
+  this->last_option (opt);
+
+  Char *oli = 0;
+  oli =
+    const_cast<Char*> (ACE_OS::strchr (this->optstring_->c_str (), opt));
+
+  /* Increment `optind' when we start to process its last character.  */
+  if (*this->nextchar_ == ACE_LIB_TEXT('\0'))
+    ++this->optind;
+
+  if (oli == 0 || opt == ACE_LIB_TEXT(':'))
+    {
+      if (this->opterr)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_LIB_TEXT ("%s: illegal short option -- %c\n"),
+                    this->argv_[0], opt));
+      return ACE_LIB_TEXT('?');
+    }
+  if (opt == ACE_LIB_TEXT('W') && oli[1] == ACE_LIB_TEXT(';'))
+    {
+      if (this->nextchar_[0] == 0)
+        this->nextchar_ = this->argv_[this->optind];
+      return long_option_i ();
+    }
+  this->optopt_ = oli[0];      // Remember the option that matched
+  if (oli[1] == ACE_LIB_TEXT(':'))
+    {
+      if (oli[2] == ACE_LIB_TEXT(':'))
+        {
+          // Takes an optional argument, and since short option args must
+          // must follow directly in the same argument, a NULL nextchar_
+          // means we didn't get one.
+          if (*this->nextchar_ != ACE_LIB_TEXT('\0'))
+            {
+              this->optarg = this->nextchar_;
+              this->optind++;
+            }
+          else
+            this->optarg = 0;
+          this->nextchar_ = 0;
+        }
+      else
+        {
+          // Takes a required argument.
+          if (*this->nextchar_ != ACE_LIB_TEXT('\0'))
+            {
+              // Found argument in same argv-element.
+              this->optarg = this->nextchar_;
+              this->optind++;
+            }
+          else if (this->optind == this->argc_)
+            {
+              // Ran out of arguments before finding required argument.
+              if (this->opterr)
+                ACE_ERROR ((LM_ERROR,
+                            ACE_LIB_TEXT ("%s: short option requires ")
+                            ACE_LIB_TEXT ("an argument -- %c\n"),
+                            this->argv_[0], opt));
+              opt = this->has_colon_ ? ACE_LIB_TEXT(':') : ACE_LIB_TEXT('?');
+            }
+          else
+            // Use the next argv-element as the argument.
+            this->optarg = this->argv_[this->optind++];
+          this->nextchar_ = 0;
+        }
+    }
+  return opt;
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_Get_Arg_Opt<CHAR_TYPE>::operator () (void)
+{
+  ACE_TRACE ("ACE_Get_Opt_Long::operator");
+
+  // First of all, make sure we reinitialize any pointers..
+  this->optarg = 0;
+  this->long_option_ = 0;
+
+  if (this->argv_ == 0)
+    {
+      // It can happen, e.g., on VxWorks.
+      this->optind = 0;
+      return -1;
+    }
+
+  // We check this because we can string short options together if the
+  // preceding one doesn't take an argument.
+  if (this->nextchar_ == 0 || *this->nextchar_ == ACE_LIB_TEXT('\0'))
+    {
+      int retval = this->nextchar_i ();
+      if (retval != 0)
+        return retval;
+    }
+
+  if (((this->argv_[this->optind][0] == ACE_LIB_TEXT('-'))
+       && (this->argv_[this->optind][1] == ACE_LIB_TEXT('-'))) || this->long_only_)
+    return this->long_option_i ();
+
+  return this->short_option_i ();
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_Get_Arg_Opt<CHAR_TYPE>::long_option (const Char *name,
+                          OPTION_ARG_MODE has_arg)
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::long_option (const Char *name, OPTION_ARG_MODE has_arg)");
+  return this->long_option (name, 0, has_arg);
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_Get_Arg_Opt<CHAR_TYPE>::long_option (const Char *name,
+                          int short_option,
+                          OPTION_ARG_MODE has_arg)
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::long_option (const Char *name, int short_option, OPTION_ARG_MODE has_arg)");
+
+  // We only allow valid alpha-numeric characters as short options.
+  // If short_options is not a valid alpha-numeric, we can still return it
+  // when the long option is found, but won't allow the caller to pass it on
+  // the command line (how could they?).  The special case is 0, but since
+  // we always return it, we let the caller worry about that.
+#if defined (_MSC_VER) && (_MSC_VER >= 1300)
+  // For MSVC 7.x, we need to prevent "illegal" character getting into
+  // isalnum, otherwise, it will crash the program.
+  if (short_option > 0 &&
+      short_option < 256 &&
+      ACE_OS::ace_isalnum (short_option) != 0)
+#else
+  if (ACE_OS::ace_isalnum (short_option) != 0)
+#endif /* _MSC_VER && _MSC_VER >= 1300 */
+    {
+      // If the short_option already exists, make sure it matches, otherwise
+      // add it.
+      Char *s = 0;
+      if ((s = const_cast<Char*> (
+                 ACE_OS::strchr (this->optstring_->c_str (),
+                                 short_option))) != 0)
+        {
+          // Short option exists, so verify the argument options
+          if (s[1] == ACE_LIB_TEXT(':'))
+            {
+              if (s[2] == ACE_LIB_TEXT(':'))
+                {
+                  if (has_arg != ARG_OPTIONAL)
+                    {
+                      if (this->opterr)
+                        ACE_ERROR
+                          ((LM_ERROR,
+                            ACE_LIB_TEXT ("Existing short option '%c' takes ")
+                            ACE_LIB_TEXT ("optional argument; adding %s ")
+                            ACE_LIB_TEXT ("requires ARG_OPTIONAL\n"),
+                            short_option, name));
+                      return -1;
+                    }
+                }
+              else
+                if (has_arg != ARG_REQUIRED)
+                  {
+                    if (this->opterr)
+                      ACE_ERROR
+                        ((LM_ERROR,
+                          ACE_LIB_TEXT ("Existing short option '%c' requires ")
+                          ACE_LIB_TEXT ("an argument; adding %s ")
+                          ACE_LIB_TEXT ("requires ARG_REQUIRED\n"),
+                          short_option, name));
+                    return -1;
+                  }
+            }
+          else if (has_arg != NO_ARG)
+            {
+              if (this->opterr)
+                ACE_ERROR
+                  ((LM_ERROR,
+                    ACE_LIB_TEXT ("Existing short option '%c' does not ")
+                    ACE_LIB_TEXT ("accept an argument; adding %s ")
+                    ACE_LIB_TEXT ("requires NO_ARG\n"),
+                    short_option, name));
+              return -1;
+            }
+        }
+      else
+        {
+          // Didn't find short option, so add it...
+          *this->optstring_ += (Char) short_option;
+          if (has_arg == ARG_REQUIRED)
+          {
+            Char delim[3] = { ':', '\0' };
+            *this->optstring_ += delim;
+          }
+          else if (has_arg == ARG_OPTIONAL)
+          {
+            Char delim[3] = { ':', ':', '\0' };
+            *this->optstring_ += delim;
+          }
+        }
+    }
+
+  ACE_Get_Opt_Long_Option *option =
+    new ACE_Get_Opt_Long_Option (name, has_arg, short_option);
+
+  if (!option)
+    return -1;
+
+  // Add to array
+  size_t size = this->long_opts_.size ();
+  if (this->long_opts_.size (size + 1) != 0
+      || this->long_opts_.set (option, size) != 0)
+    {
+      delete option;
+      ACE_ERROR_RETURN
+        ((LM_ERROR, ACE_LIB_TEXT ("Could not add long option to array.\n")),
+         -1);
+    }
+  return 0;
+}
+
+template < typename CHAR_TYPE >
+const typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char*
+ACE_Get_Arg_Opt<CHAR_TYPE>::long_option (void) const
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::long_option (void)");
+  if (this->long_option_)
+    return this->long_option_->name_;
+  return 0;
+}
+
+template < typename CHAR_TYPE >
+const typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char*
+ACE_Get_Arg_Opt<CHAR_TYPE>::last_option (void) const
+{
+  return this->last_option_->c_str ();
+}
+
+template < typename CHAR_TYPE >
+void
+ACE_Get_Arg_Opt<CHAR_TYPE>::last_option (const typename ACE_Get_Arg_Opt<CHAR_TYPE>::String &last_option)
+{
+  *this->last_option_ = last_option;
+}
+
+template < typename CHAR_TYPE >
+void
+ACE_Get_Arg_Opt<CHAR_TYPE>::dump (void) const
+{
+#if defined (ACE_HAS_DUMP)
+  ACE_TRACE ("ACE_Get_Arg_Opt::dump");
+
+  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")
+              ACE_LIB_TEXT ("opstring_ = %s\n")
+              ACE_LIB_TEXT ("long_only_ = %d\n")
+              ACE_LIB_TEXT ("has_colon_ = %d\n")
+              ACE_LIB_TEXT ("last_option_ = %s\n")
+              ACE_LIB_TEXT ("nextchar_ = %s\n")
+              ACE_LIB_TEXT ("optopt_ = %c\n")
+              ACE_LIB_TEXT ("ordering_ = %d\n"),
+              this->optstring_->c_str (),
+              this->long_only_,
+              this->has_colon_,
+              this->last_option_->c_str (),
+              this->nextchar_,
+              this->optopt_,
+              this->ordering_));
+
+  // now loop through the
+  size_t size = this->long_opts_.size ();
+  for (u_int i = 0; i < size ; ++i)
+    {
+      ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")
+                  ACE_LIB_TEXT ("long_option name_ = %s\n")
+                  ACE_LIB_TEXT ("has_arg_ = %d\n")
+                  ACE_LIB_TEXT ("val_ = %d\n"),
+                  this->long_opts_[i]->name_,
+                  this->long_opts_[i]->has_arg_,
+                  this->long_opts_[i]->val_));
+    }
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+#endif /* ACE_HAS_DUMP */
+}
+
+template < typename CHAR_TYPE >
+void
+ACE_Get_Arg_Opt<CHAR_TYPE>::permute_args (void)
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::permute_args");
+
+  int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+  Char *swap;
+  int opt_end = this->optind;
+
+  nnonopts = this->nonopt_end_ - this->nonopt_start_;
+  nopts = opt_end - this->nonopt_end_;
+  ncycle = ACE::gcd (nnonopts, nopts);
+  cyclelen = (opt_end - this->nonopt_start_) / ncycle;
+
+  this->optind = this->optind - nnonopts;
+
+  for (i = 0; i < ncycle; i++)
+    {
+      cstart = this->nonopt_end_ + i;
+      pos = cstart;
+      for (j = 0; j < cyclelen; j++)
+        {
+          if (pos >= this->nonopt_end_)
+            pos -= nnonopts;
+          else
+            pos += nopts;
+          swap = this->argv_[pos];
+
+          ((Char **)this->argv_)[pos] = argv_[cstart];
+
+          ((Char **)this->argv_)[cstart] = swap;
+        }
+    }
+}
+
+template < typename CHAR_TYPE >
+int
+ACE_Get_Arg_Opt<CHAR_TYPE>::permute (void)
+{
+  ACE_TRACE ("ACE_Get_Arg_Opt::permute");
+
+  if (this->nonopt_start_ != this->nonopt_end_
+      && this->nonopt_start_ != this->optind)
+    this->permute_args ();
+
+  this->nonopt_start_ = this->optind;
+
+  // Skip over args untill we find the next option.
+  while (this->optind < this->argc_
+         && (this->argv_[this->optind][0] != ACE_LIB_TEXT('-')
+             || this->argv_[this->optind][1] == ACE_LIB_TEXT('\0')))
+    this->optind++;
+
+  // Got an option, so mark this as the end of the non options.
+  this->nonopt_end_ = this->optind;
+
+  const Char doubleDash[] = { '-', '-', 0 };
+  if (this->optind != this->argc_
+      && ACE_OS::strcmp (this->argv_[this->optind],
+                         doubleDash) == 0)
+    {
+      // We found the marker for the end of the options.
+      this->optind++;
+
+      if (this->nonopt_start_ != this->nonopt_end_
+          && this->nonopt_end_ != this->optind)
+        this->permute_args ();
+    }
+
+  if (this->optind == this->argc_)
+    {
+      if (this->nonopt_start_ != this->nonopt_end_)
+        this->optind = this->nonopt_start_;
+      return eof();
+    }
+  return 0;
+}
+
+template < typename CHAR_TYPE >
+const typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char *
+ACE_Get_Arg_Opt<CHAR_TYPE>::optstring (void) const
+{
+  return this->optstring_->c_str ();
+}
+
+template < typename CHAR_TYPE >
+ACE_Get_Arg_Opt<CHAR_TYPE>::ACE_Get_Opt_Long_Option::ACE_Get_Opt_Long_Option (
+  const Char *name,
+  int has_arg,
+  int val)
+  :  name_ (ACE::strnew (name)),
+     has_arg_ (has_arg),
+     val_ (val)
+{}
+
+template < typename CHAR_TYPE >
+ACE_Get_Arg_Opt<CHAR_TYPE>::ACE_Get_Opt_Long_Option::~ACE_Get_Opt_Long_Option (void)
+{
+  // MSVC++ 6 can't deal with deleting a const Char *.
+#if defined (_MSC_VER) && _MSC_VER < 1300
+  delete [] const_cast <Char *> (this->name_);
+#else
+  delete [] this->name_;
+#endif  /* _MSC_VER < 1300 */
+}
+template < typename CHAR_TYPE >
+int
+ACE_Get_Arg_Opt<CHAR_TYPE>::eof()
+{
+  // Since EOF may or may not be -1,
+  // we have to use EOF to maintain
+  // backwards compatibility.
+  return EOF;
+}
+
+// Accessors
+
+template < typename CHAR_TYPE >
+bool
+ACE_Get_Arg_Opt<CHAR_TYPE>::ACE_Get_Opt_Long_Option::operator < (const ACE_Get_Opt_Long_Option &rhs)
 {
   return this->name_ < rhs.name_;
 }
 
-ACE_INLINE int
-ACE_Get_Opt::argc (void) const
+template < typename CHAR_TYPE >
+int
+ACE_Get_Arg_Opt<CHAR_TYPE>::argc (void) const
 {
   return this->argc_;
 }
 
-ACE_INLINE ACE_TCHAR **
-ACE_Get_Opt::argv (void) const
+template < typename CHAR_TYPE >
+typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char **
+ACE_Get_Arg_Opt<CHAR_TYPE>::argv (void) const
 {
   return this->argv_;
 }
 
-ACE_INLINE ACE_TCHAR*
-ACE_Get_Opt::opt_arg (void) const
+template < typename CHAR_TYPE >
+typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char*
+ACE_Get_Arg_Opt<CHAR_TYPE>::opt_arg (void) const
 {
   return this->optarg;
 }
 
-ACE_INLINE int
-ACE_Get_Opt::opt_opt (void)
+template < typename CHAR_TYPE >
+typename ACE_Get_Arg_Opt<CHAR_TYPE>::Char
+ACE_Get_Arg_Opt<CHAR_TYPE>::opt_opt (void)
 {
   return this->optopt_;
 }
 
-ACE_INLINE int &
-ACE_Get_Opt::opt_ind (void)
+template < typename CHAR_TYPE >
+int &
+ACE_Get_Arg_Opt<CHAR_TYPE>::opt_ind (void)
 {
   return this->optind;
 }
diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h
index b09aadfe072..8487880e797 100644
--- a/ace/Global_Macros.h
+++ b/ace/Global_Macros.h
@@ -78,7 +78,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 # define ACE_ITOA(X) #X
 
 // Create a string of a server address with a "host:port" format.
-# define ACE_SERVER_ADDRESS(H,P) H ACE_TEXT(":") P
+# define ACE_SERVER_ADDRESS(H,P) H ACE_LIB_TEXT(":") P
 
 // A couple useful inline functions for checking whether bits are
 // enabled or disabled.
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index 7bfd15db279..e83c6573c9c 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -521,12 +521,12 @@ ACE_High_Res_Timer::print_total (const ACE_TCHAR *str,
 #endif /* !ACE_HAS_WINCE */
 
 int
-ACE_High_Res_Timer::get_env_global_scale_factor (const ACE_TCHAR *env)
+ACE_High_Res_Timer::get_env_global_scale_factor (const char *env)
 {
 #if !defined (ACE_HAS_WINCE)
   if (env != 0)
     {
-      const char *env_value = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (env));
+      const char *env_value = ACE_OS::getenv (env);
       if (env_value != 0)
         {
           int value = ACE_OS::atoi (env_value);
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 4e1bd89cf43..5359ddc70d3 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -138,8 +138,7 @@ public:
    * This is basically a no-op on CE because there is no concept of
    * environment variable on CE.
    */
-  static int get_env_global_scale_factor (const ACE_TCHAR *env
-                                          = ACE_LIB_TEXT ("ACE_SCALE_FACTOR"));
+  static int get_env_global_scale_factor (const char *env = "ACE_SCALE_FACTOR");
 
   /**
    * Set (and return, for info) the global scale factor by sleeping
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 78e0557c9a5..bde2a17ae8e 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -51,7 +51,7 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
     {
       ACE_OS::sprintf (s,
                        ACE_LIB_TEXT ("%s:%d"),
-                       ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
+                       ACE_TEXT_TO_TCHAR_IN (ipaddr_format == 0
                                                ? this->get_host_name ()
                                                : this->get_host_addr ()),
                        this->get_port_number ());
@@ -220,7 +220,6 @@ ACE_INET_Addr::ACE_INET_Addr (const char address[])
   this->set (address);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[])
   : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
 {
@@ -229,8 +228,6 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t address[])
   this->set (address);
 }
 
-#endif /* ACE_HAS_WCHAR */
-
 // Copy constructor.
 
 ACE_INET_Addr::ACE_INET_Addr (const ACE_INET_Addr &sa)
@@ -411,7 +408,7 @@ ACE_INET_Addr::set (const char port_name[],
 
   int address_family = PF_UNSPEC;
 #  if defined (ACE_HAS_IPV6)
-  if (ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(protocol), ACE_LIB_TEXT ("tcp6")) == 0)
+  if (ACE_OS::strcmp (ACE_TEXT_TO_TCHAR_IN(protocol), ACE_LIB_TEXT ("tcp6")) == 0)
     address_family = AF_INET6;
 #  endif /* ACE_HAS_IPV6 */
 
@@ -463,12 +460,11 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
 #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"),
-                ACE_TEXT_CHAR_TO_TCHAR ((host_name == 0) ?
+                ACE_TEXT_TO_TCHAR_IN ((host_name == 0) ?
                                         "<unknown>" : host_name)));
 #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                               const wchar_t host_name[],
                               int address_family)
@@ -489,12 +485,11 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
 #else /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"),
-                ACE_TEXT_WCHAR_TO_TCHAR ((host_name == 0) ?
+                ACE_TEXT_TO_TCHAR_IN ((host_name == 0) ?
                                          ACE_TEXT_WIDE ("<unknown>") :
                                          host_name)));
 #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
 }
-#endif /* ACE_HAS_WCHAR */
 
 // Creates a ACE_INET_Addr from a sockaddr_in structure.
 
@@ -617,7 +612,6 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
                               const wchar_t host_name[],
                               const wchar_t protocol[])
@@ -631,7 +625,6 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
 }
-#endif /* ACE_HAS_WCHAR */
 
 // Creates a ACE_INET_Addr from a PORT_NAME and an Internet address.
 
@@ -649,7 +642,6 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[],
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
                               ACE_UINT32 inet_address,
                               const wchar_t protocol[])
@@ -663,7 +655,6 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr")));
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INET_Addr::~ACE_INET_Addr (void)
 {
@@ -702,7 +693,6 @@ ACE_INET_Addr::get_host_name (char hostname[],
   return result;
 }
 
-#if defined (ACE_HAS_WCHAR)
 int
 ACE_INET_Addr::get_host_name (wchar_t hostname[],
                               size_t len) const
@@ -720,12 +710,10 @@ ACE_INET_Addr::get_host_name (wchar_t hostname[],
 
   // And copy it over, if successful
   if (result == 0)
-    ACE_OS::strcpy (hostname,
-                    ACE_Ascii_To_Wide (char_hostname).wchar_rep ());
+    ACE_OS::string_copy( hostname, char_hostname, MAXHOSTNAMELEN + 1 );
 
   return result;
 }
-#endif /* ACE_HAS_WCHAR */
 
 // Return the character representation of the hostname.
 
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index 5dbc2e2274c..ab74a1bb276 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -90,7 +90,6 @@ public:
                  ACE_UINT32 ip_addr,
                  const char protocol[] = "tcp");
 
-#if defined (ACE_HAS_WCHAR)
   ACE_INET_Addr (u_short port_number,
                  const wchar_t host_name[],
                  int address_family = AF_UNSPEC);
@@ -104,7 +103,6 @@ public:
   ACE_INET_Addr (const wchar_t port_name[],
                  ACE_UINT32 ip_addr,
                  const wchar_t protocol[] = ACE_TEXT_WIDE ("tcp"));
-#endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
   ~ACE_INET_Addr (void);
@@ -172,7 +170,6 @@ public:
   int set (const sockaddr_in *,
            int len);
 
-#if defined (ACE_HAS_WCHAR)
   int set (u_short port_number,
            const wchar_t host_name[],
            int encode = 1,
@@ -187,7 +184,6 @@ public:
            const wchar_t protocol[] = ACE_TEXT_WIDE ("tcp"));
 
   int set (const wchar_t addr[]);
-#endif /* ACE_HAS_WCHAR */
 
   /// Return a pointer to the underlying network address.
   virtual void *get_addr (void) const;
@@ -222,12 +218,6 @@ public:
    */
   virtual int string_to_addr (const char address[]);
 
-#if defined (ACE_HAS_WCHAR)
-  /*
-  virtual int string_to_addr (const char address[]);
-  */
-#endif /* ACE_HAS_WCHAR */
-
   /**
    * Sets the port number without affecting the host name.  If
    * <encode> is enabled then <port_number> is converted into network
@@ -273,10 +263,8 @@ public:
   int get_host_name (char hostname[],
                      size_t hostnamelen) const;
 
-#if defined (ACE_HAS_WCHAR)
   int get_host_name (wchar_t hostname[],
                      size_t hostnamelen) const;
-#endif /* ACE_HAS_WCHAR */
 
   /**
    * Return the character representation of the hostname (this version
diff --git a/ace/INET_Addr.inl b/ace/INET_Addr.inl
index 583f3a8747e..3fa5c778e5a 100644
--- a/ace/INET_Addr.inl
+++ b/ace/INET_Addr.inl
@@ -120,7 +120,6 @@ ACE_INET_Addr::operator < (const ACE_INET_Addr &rhs) const
         && this->get_port_number () < rhs.get_port_number ());
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_INET_Addr::set (u_short port_number,
                     const wchar_t host_name[],
@@ -128,7 +127,7 @@ ACE_INET_Addr::set (u_short port_number,
                     int address_family)
 {
   return this->set (port_number,
-                    ACE_Wide_To_Ascii (host_name).char_rep (),
+                    ACE_TEXT_TO_CHAR_IN (host_name),
                     encode,
                     address_family);
 }
@@ -138,9 +137,9 @@ ACE_INET_Addr::set (const wchar_t port_name[],
                     const wchar_t host_name[],
                     const wchar_t protocol[])
 {
-  return this->set (ACE_Wide_To_Ascii (port_name).char_rep (),
-                    ACE_Wide_To_Ascii (host_name).char_rep (),
-                    ACE_Wide_To_Ascii (protocol).char_rep ());
+  return this->set (ACE_TEXT_TO_CHAR_IN (port_name),
+                    ACE_TEXT_TO_CHAR_IN (host_name),
+                    ACE_TEXT_TO_CHAR_IN (protocol));
 }
 
 ACE_INLINE int
@@ -148,19 +147,17 @@ ACE_INET_Addr::set (const wchar_t port_name[],
                     ACE_UINT32 ip_addr,
                     const wchar_t protocol[])
 {
-  return this->set (ACE_Wide_To_Ascii (port_name).char_rep (),
+  return this->set (ACE_TEXT_TO_CHAR_IN (port_name),
                     ip_addr,
-                    ACE_Wide_To_Ascii (protocol).char_rep ());
+                    ACE_TEXT_TO_CHAR_IN (protocol));
 }
 
 ACE_INLINE int
 ACE_INET_Addr::set (const wchar_t addr[])
 {
-  return this->set (ACE_Wide_To_Ascii (addr).char_rep ());
+  return this->set (ACE_TEXT_TO_CHAR_IN (addr));
 }
 
-#endif /* ACE_HAS_WCHAR */
-
 // Return @c true if the IP address is INADDR_ANY or IN6ADDR_ANY.
 ACE_INLINE bool
 ACE_INET_Addr::is_any (void) const
diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp
index 546b1469f8d..c95c29aab17 100644
--- a/ace/Lib_Find.cpp
+++ b/ace/Lib_Find.cpp
@@ -320,9 +320,8 @@ ACE::ldfind (const ACE_TCHAR* filename,
 #    else
           // Wide-char, non-Windows only offers char * getenv. So capture
           // it, translate to wide-char, and continue.
-          ACE_Ascii_To_Wide wide_ldpath
-            (ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (ACE_LD_SEARCH_PATH)));
-          ld_path = wide_ldpath.wchar_rep ();
+          ACE::String_Conversion::Convert_In< ACE_TCHAR, ACE_ANTI_TCHAR > wide_ldpath(ACE_OS::getenv (ACE_LD_SEARCH_PATH_A));
+          ld_path = const_cast<ACE_TCHAR*>(wide_ldpath.c_str ());
 #    endif /* ACE_WIN32 || !ACE_USES_WCHAR */
 #  endif /* ACE_DEFAULT_LD_SEARCH_PATH */
 
@@ -563,7 +562,7 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len)
     }
   else
     {
-      ACE_OS::strcpy (buffer, ACE_TEXT_CHAR_TO_TCHAR (tmpdir));
+      ACE_OS::string_copy (buffer, tmpdir, buffer_len);
 
       // Add a trailing slash because we cannot assume there is already one
       // at the end.  And having an extra one should not cause problems.
@@ -654,7 +653,6 @@ ACE::strsplit_r (char *str,
   return result;
 }
 
-#if defined (ACE_HAS_WCHAR)
 wchar_t *
 ACE::strsplit_r (wchar_t *str,
                  const wchar_t *token,
@@ -704,6 +702,6 @@ ACE::strrepl (wchar_t *s, wchar_t search, wchar_t replace)
 
   return replaced;
 }
-#endif /* ACE_HAS_WCHAR */
+
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h
index 418de3751de..8ca34d44367 100644
--- a/ace/Lib_Find.h
+++ b/ace/Lib_Find.h
@@ -88,7 +88,6 @@ namespace ACE
                                       const char *token,
                                       char *&next_start);
 
-#if defined (ACE_HAS_WCHAR)
   /// As strrepl, but for wide characters.
   extern ACE_Export size_t strrepl (wchar_t *s,
                                     wchar_t search,
@@ -98,7 +97,6 @@ namespace ACE
   extern ACE_Export wchar_t *strsplit_r (wchar_t *s,
                                          const wchar_t *token,
                                          wchar_t *&next_start);
-#endif /* ACE_HAS_WCHAR */
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp
index 2263d90cb46..1c58e14ae19 100644
--- a/ace/Local_Name_Space.cpp
+++ b/ace/Local_Name_Space.cpp
@@ -16,7 +16,7 @@ ACE_NS_String::~ACE_NS_String (void)
     delete [] this->rep_;
 }
 
-ACE_WCHAR_T *
+wchar_t *
 ACE_NS_String::fast_rep (void) const
 {
   ACE_TRACE ("ACE_NS_String::fast_rep");
@@ -27,7 +27,7 @@ ACE_NS_String::operator ACE_NS_WString () const
 {
   ACE_TRACE ("ACE_NS_String::operator ACE_NS_WString");
   return ACE_NS_WString (this->rep_,
-                         (this->len_ / sizeof (ACE_WCHAR_T)) - 1);
+                         (this->len_ / sizeof (wchar_t)) - 1);
 }
 
 size_t
@@ -42,7 +42,7 @@ ACE_NS_String::char_rep (void) const
 {
   ACE_TRACE ("ACE_NS_String::char_rep");
   ACE_NS_WString w_string (this->rep_,
-                           (this->len_ / sizeof (ACE_WCHAR_T)) - 1);
+                           (this->len_ / sizeof (wchar_t)) - 1);
   return w_string.char_rep ();
 }
 
@@ -55,7 +55,7 @@ ACE_NS_String::ACE_NS_String (void)
 }
 
 ACE_NS_String::ACE_NS_String (const ACE_NS_WString &s)
-  : len_ ((s.length () + 1) * sizeof (ACE_WCHAR_T)),
+  : len_ ((s.length () + 1) * sizeof (wchar_t)),
     rep_ (s.rep ()),
     delete_rep_ (1)
 {
@@ -76,8 +76,8 @@ ACE_NS_String::strstr (const ACE_NS_String &s) const
   else
     {
       // They're smaller than we are...
-      const size_t len = (this->len_ - s.len_) / sizeof (ACE_WCHAR_T);
-      const size_t pat_len = s.len_ / sizeof (ACE_WCHAR_T) - 1;
+      const size_t len = (this->len_ - s.len_) / sizeof (wchar_t);
+      const size_t pat_len = s.len_ / sizeof (wchar_t) - 1;
 
       for (size_t i = 0; i <= len; ++i)
         {
@@ -112,8 +112,8 @@ ACE_NS_String::operator != (const ACE_NS_String &s) const
   return !this->operator == (s);
 }
 
-ACE_NS_String::ACE_NS_String (ACE_WCHAR_T *dst,
-                              const ACE_WCHAR_T *src,
+ACE_NS_String::ACE_NS_String (wchar_t *dst,
+                              const wchar_t *src,
                               size_t bytes)
   : len_ (bytes),
     rep_ (dst),
@@ -127,7 +127,7 @@ u_long
 ACE_NS_String::hash (void) const
 {
   return ACE::hash_pjw
-    (reinterpret_cast<char *> (const_cast<ACE_WCHAR_T *> (this->rep_)),
+    (reinterpret_cast<char *> (const_cast<wchar_t *> (this->rep_)),
      this->len_);
 }
 
diff --git a/ace/Local_Name_Space.h b/ace/Local_Name_Space.h
index 728ac8afb1c..fbb837824c8 100644
--- a/ace/Local_Name_Space.h
+++ b/ace/Local_Name_Space.h
@@ -44,8 +44,8 @@ public:
   ACE_NS_String (void);
 
   /// Initialization method.
-  ACE_NS_String (ACE_WCHAR_T *dst,
-                 const ACE_WCHAR_T *src,
+  ACE_NS_String (wchar_t *dst,
+                 const wchar_t *src,
                  size_t len);
 
   /// Converts an ACE_NS_WString to an ACE_NS_String;
@@ -73,7 +73,7 @@ public:
   size_t len (void) const;
 
   /// Returns the underlying representation.
-  ACE_WCHAR_T *fast_rep (void) const;
+  wchar_t *fast_rep (void) const;
 
   /// Returns a hash value for this string.
   u_long hash (void) const;
@@ -83,7 +83,7 @@ private:
   size_t len_;
 
   /// This actually points into shared/persistent memory.
-  ACE_WCHAR_T *rep_;
+  wchar_t *rep_;
 
   /// Should rep_ be deleted when destructed (only used
   /// for WString conversions)
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index b626f990dbb..87f5e51362e 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -138,8 +138,8 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind_i (
 {
 
   ACE_TRACE ("ACE_Local_Name_Space::shared_bind_i");
-  const size_t name_len = (name.length () + 1) * sizeof (ACE_WCHAR_T);
-  const size_t value_len = (value.length () + 1) * sizeof (ACE_WCHAR_T);
+  const size_t name_len = (name.length () + 1) * sizeof (wchar_t);
+  const size_t value_len = (value.length () + 1) * sizeof (wchar_t);
   const size_t type_len = ACE_OS::strlen (type) + 1;
   const size_t total_len = name_len + value_len + type_len;
   char *ptr = (char *) this->allocator_->malloc (total_len);
@@ -150,12 +150,12 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind_i (
     {
       // Note that the value_rep *must* come first to make sure we can
       // retrieve this pointer later on in unbind().
-      ACE_WCHAR_T *value_rep = (ACE_WCHAR_T *) (ptr);
-      ACE_WCHAR_T *name_rep = (ACE_WCHAR_T *) (ptr + value_len);
+      wchar_t *value_rep = (wchar_t *) (ptr);
+      wchar_t *name_rep = (wchar_t *) (ptr + value_len);
       char *new_type = (char *) (ptr + value_len + name_len);
 
-      ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
-      ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
+      ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ());
+      ACE_Auto_Basic_Array_Ptr<wchar_t> value_urep (value.rep ());
       ACE_NS_String new_name (name_rep, name_urep.get (), name_len);
       ACE_NS_String new_value (value_rep, value_urep.get (), value_len);
 
@@ -324,7 +324,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::resolve_i (
   value = nbc_string;
 
   // Gets type and then the actual reprsentation which is a
-  // ACE_WCHAR_T
+  // wchar_t
   const char *temp = ns_internal.type ();
 
   size_t len = ACE_OS::strlen (ns_internal.type ());
@@ -817,7 +817,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const
 #endif /* ! ACE_NLOGGING */
 
       ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("key=%s\nvalue=%s\ntype=%s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (key), ACE_TEXT_CHAR_TO_TCHAR (value), ACE_TEXT_CHAR_TO_TCHAR (type)));
+                  ACE_TEXT_TO_TCHAR_IN (key), ACE_TEXT_TO_TCHAR_IN (value), ACE_TEXT_TO_TCHAR_IN (type)));
       // We need to delete key and value since char_rep allocates
       // memory for them
       delete [] key;
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 6939a455acc..31d32bb6ca4 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -919,8 +919,8 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
  *   'X': print as a hex number
  *   'w': print a wide character
  *   'W': print out a wide character string.
- *   'z': print an ACE_OS::WChar character
- *   'Z': print an ACE_OS::WChar character string
+ *   'z': print an wchar_t character
+ *   'Z': print an wchar_t character string
  *   '%': format a single percent sign, '%'
  */
 ssize_t
@@ -942,7 +942,6 @@ ACE_Log_Msg::log (ACE_Log_Priority log_priority,
   return result;
 }
 
-#if defined (ACE_HAS_WCHAR)
 /**
  * Since this is the ANTI_TCHAR version, we need to convert
  * the format string over.
@@ -958,14 +957,13 @@ ACE_Log_Msg::log (ACE_Log_Priority log_priority,
 
   va_start (argp, format_str);
 
-  ssize_t result = this->log (ACE_TEXT_ANTI_TO_TCHAR (format_str),
+  ssize_t result = this->log (ACE_TEXT_TO_TCHAR_IN (format_str),
                               log_priority,
                               argp);
   va_end (argp);
 
   return result;
 }
-#endif /* ACE_HAS_WCHAR */
 
 ssize_t
 ACE_Log_Msg::log (const ACE_TCHAR *format_str,
@@ -1200,12 +1198,12 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   if (can_check)
                     this_len = ACE_OS::snprintf (bp, bspace, format,
                                                  this->file () ?
-                                                 ACE_TEXT_CHAR_TO_TCHAR (this->file ())
+                                                 ACE_TEXT_TO_TCHAR_IN (this->file ())
                                                  : ACE_LIB_TEXT ("<unknown file>"));
                   else
                     this_len = ACE_OS::sprintf (bp, format,
                                                 this->file () ?
-                                                ACE_TEXT_CHAR_TO_TCHAR (this->file ())
+                                                ACE_TEXT_TO_TCHAR_IN (this->file ())
                                                 : ACE_LIB_TEXT ("<unknown file>"));
                   ACE_UPDATE_COUNT (bspace, this_len);
                   break;
@@ -1261,11 +1259,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                         if (can_check)
                           this_len = ACE_OS::snprintf
                             (bp, bspace, format, va_arg (argp, ACE_TCHAR *),
-                             ACE_TEXT_CHAR_TO_TCHAR (msg));
+                             ACE_TEXT_TO_TCHAR_IN (msg));
                         else
                           this_len = ACE_OS::sprintf
                             (bp, format, va_arg (argp, ACE_TCHAR *),
-                             ACE_TEXT_CHAR_TO_TCHAR (msg));
+                             ACE_TEXT_TO_TCHAR_IN (msg));
 #if defined (ACE_WIN32)
                       }
                     else
@@ -1369,10 +1367,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 #endif
                         if (can_check)
                           this_len = ACE_OS::snprintf
-                            (bp, bspace, format, ACE_TEXT_CHAR_TO_TCHAR (msg));
+                            (bp, bspace, format, ACE_TEXT_TO_TCHAR_IN (msg));
                         else
                           this_len = ACE_OS::sprintf
-                            (bp, format, ACE_TEXT_CHAR_TO_TCHAR (msg));
+                            (bp, format, ACE_TEXT_TO_TCHAR_IN (msg));
 #if defined (ACE_WIN32)
                       }
                     else
@@ -1716,26 +1714,30 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 # else /* ACE_USES_WCHAR */
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
 # endif /* ACE_USES_WCHAR */
+
                     if (can_check)
                       this_len = ACE_OS::snprintf
                         (bp, bspace, format, wstr ? wstr : ACE_LIB_TEXT ("(null)"));
                     else
                       this_len = ACE_OS::sprintf
                         (bp, format, wstr ? wstr : ACE_LIB_TEXT ("(null)"));
-#elif defined (ACE_HAS_WCHAR)
+
+#else
                     wchar_t *wchar_str = va_arg (argp, wchar_t *);
+
 # if defined (HPUX)
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
 # else
                     ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
 # endif /* HPUX */
+
                     if (can_check)
                       this_len = ACE_OS::snprintf
                         (bp, bspace, format, wchar_str);
                     else
                       this_len = ACE_OS::sprintf
                         (bp, format, wchar_str);
-#endif /* ACE_WIN32 / ACE_HAS_WCHAR */
+#endif /* ACE_WIN32 */
                     ACE_UPDATE_COUNT (bspace, this_len);
                   }
                   break;
@@ -1777,7 +1779,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   ACE_UPDATE_COUNT (bspace, this_len);
                   break;
 
-                case 'z':              // ACE_OS::WChar character
+                case 'z':              // wchar_t character
                   {
                     // On some platforms sizeof (wchar_t) can be 2
                     // on the others 4 ...
@@ -1806,14 +1808,14 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                     break;
                   }
 
-                 case 'Z':              // ACE_OS::WChar character string
+                 case 'Z':              // wchar_t character string
                   {
-                    ACE_OS::WChar *wchar_str = va_arg (argp, ACE_OS::WChar*);
+                    wchar_t *wchar_str = va_arg (argp, wchar_t*);
                     if (wchar_str == 0)
                       break;
 
                     wchar_t *wchar_t_str = 0;
-                    if (sizeof (ACE_OS::WChar) != sizeof (wchar_t))
+                    if (sizeof (wchar_t) != sizeof (wchar_t))
                       {
                         size_t len = ACE_OS::wslen (wchar_str) + 1;
                         ACE_NEW_NORETURN(wchar_t_str, wchar_t[len]);
@@ -1836,19 +1838,19 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 # else /* ACE_USES_WCHAR */
                   ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
 # endif /* ACE_USES_WCHAR */
-#elif defined (ACE_HAS_WCHAR)
+#else
 # if defined (HPUX)
                   ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S"));
 # else
                   ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls"));
 # endif /* HPUX */
-#endif /* ACE_WIN32 / ACE_HAS_WCHAR */
+#endif /* ACE_WIN32 */
                   if (can_check)
                     this_len = ACE_OS::snprintf
                       (bp, bspace, format, wchar_t_str);
                   else
                     this_len = ACE_OS::sprintf (bp, format, wchar_t_str);
-                  if(sizeof(ACE_OS::WChar) != sizeof(wchar_t))
+                  if(sizeof(wchar_t) != sizeof(wchar_t))
                     {
                       delete wchar_t_str;
                     }
@@ -2581,7 +2583,6 @@ ACE_Log_Msg::log_priority_enabled (ACE_Log_Priority log_priority,
   return this->log_priority_enabled (log_priority);
 }
 
-#if defined (ACE_USES_WCHAR)
 int
 ACE_Log_Msg::log_priority_enabled (ACE_Log_Priority log_priority,
                                    const wchar_t *,
@@ -2589,7 +2590,6 @@ ACE_Log_Msg::log_priority_enabled (ACE_Log_Priority log_priority,
 {
   return this->log_priority_enabled (log_priority);
 }
-#endif /* ACE_USES_WCHAR */
 
 // ****************************************************************
 
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index d1adb4cdc20..bc890417445 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -425,7 +425,6 @@ public:
                             const char *,
                             ...);
 
-#if defined (ACE_USES_WCHAR)
   // We are not using ACE_TCHAR for this since ACE_HEX_DUMP
   // doesn't take in a ACE_TCHAR.  log_hexdump takes in a char
   // string, so this must be able to take in a char string even
@@ -434,7 +433,6 @@ public:
   int log_priority_enabled (ACE_Log_Priority log_priority,
                             const wchar_t *,
                             ...);
-#endif /* ACE_USES_WCHAR */
 
   /// Optimize reading of the pid (avoids a system call if the value is
   /// cached...).
@@ -504,15 +502,13 @@ public:
    *  - 'W': print a wide character string
    *  - 'x': print as a hex number
    *  - 'X': print as a hex number
-   *  - 'z': print an ACE_OS::WChar character
-   *  - 'Z': print an ACE_OS::WChar character string
+   *  - 'z': print an wchar_t character
+   *  - 'Z': print an wchar_t character string
    *  - '%': print out a single percent sign, '%'
    */
-  ssize_t log (ACE_Log_Priority priority, const ACE_TCHAR *format, ...);
+  ssize_t log (ACE_Log_Priority priority, const char *format, ...);
 
-#if defined (ACE_HAS_WCHAR)
-  ssize_t log (ACE_Log_Priority priority, const ACE_ANTI_TCHAR *format, ...);
-#endif /* ACE_HAS_WCHAR */
+  ssize_t log (ACE_Log_Priority priority, const wchar_t *format, ...);
 
   /**
    * An alternative logging mechanism that makes it possible to
@@ -706,8 +702,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
 # define ACE_TSS_CLEANUP_NAME ACE_PREPROC_CONCATENATE(ACE_,ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _TSS_cleanup))
-#else
-# define ACE_TSS_CLEANUP_NAME ACE_TSS_cleanup
 #endif  /* ACE_HAS_VERSIONED_NAMESPACE == 1 */
 
 
diff --git a/ace/Log_Msg_UNIX_Syslog.cpp b/ace/Log_Msg_UNIX_Syslog.cpp
index 23b90ef3c34..55adf75791b 100644
--- a/ace/Log_Msg_UNIX_Syslog.cpp
+++ b/ace/Log_Msg_UNIX_Syslog.cpp
@@ -43,15 +43,10 @@ ACE_Log_Msg_UNIX_Syslog::open (const ACE_TCHAR * logger_key)
   // options LOG_CONS and LOG_PID to be set.  There really should be a
   // logging strategy option to control the syslog log options,
   // however, we'll take the easy way out for now.
-#if defined (ACE_USES_WCHAR)
-  openlog (ACE_TEXT_ALWAYS_CHAR (logger_key),
+  // const_cast?
+  ::openlog (const_cast<char *>(ACE_TEXT_TO_CHAR_IN(logger_key)),
            LOG_CONS|LOG_PID,
            ACE_DEFAULT_SYSLOG_FACILITY);
-#else
-  openlog (const_cast<char *> (logger_key),
-           LOG_CONS|LOG_PID,
-           ACE_DEFAULT_SYSLOG_FACILITY);
-#endif /* ACE_USES_WCHAR */
 
   // Enable logging of all syslog priorities.  If logging of all
   // priorities is not desired, use the ACE_Log_Msg::priority_mask()
@@ -117,12 +112,12 @@ ACE_Log_Msg_UNIX_Syslog::log (ACE_Log_Record &log_record)
             ACE_Log_Record::priority_name(ACE_Log_Priority(log_record.type()));
           syslog (syslog_priority,
                   "%s: %s: %s",
-                  ACE_TEXT_ALWAYS_CHAR (date_and_time),
-                  ACE_TEXT_ALWAYS_CHAR (prio_name),
-                  ACE_TEXT_ALWAYS_CHAR (line));
+                  ACE_TEXT_TO_CHAR_IN (date_and_time),
+                  ACE_TEXT_TO_CHAR_IN (prio_name),
+                  ACE_TEXT_TO_CHAR_IN (line));
         }
       else // No formatting required.
-        syslog (syslog_priority, "%s", ACE_TEXT_ALWAYS_CHAR (line));
+        syslog (syslog_priority, "%s", ACE_TEXT_TO_CHAR_IN (line));
     }
 
   return 0;
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index 3239252a00e..2fed56760da 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -299,7 +299,7 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[],
   if (result == 0)
     {
       // Since ostream expects only chars, we cannot pass wchar_t's
-      s << ACE_TEXT_ALWAYS_CHAR (verbose_msg);
+      s << ACE_TEXT_TO_CHAR_IN (verbose_msg);
       s.flush ();
     }
 
diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp
index 8e393a81e31..36033e2d60e 100644
--- a/ace/Logging_Strategy.cpp
+++ b/ace/Logging_Strategy.cpp
@@ -154,7 +154,7 @@ ACE_Logging_Strategy::parse_args (int argc, ACE_TCHAR *argv[])
   this->interval_ = ACE_DEFAULT_LOGFILE_POLL_INTERVAL;
   this->max_size_ = 0;
 
-  ACE_Get_Opt get_opt (argc, argv,
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv,
                        ACE_LIB_TEXT ("f:i:k:m:n:N:op:s:t:w"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
@@ -346,7 +346,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[])
             {
               ACE_NEW_RETURN
                 (output_file,
-                 ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_)),
+                 ofstream (ACE_TEXT_TO_CHAR_IN (this->filename_)),
                  -1);
               delete_ostream = 1;
             }
@@ -354,7 +354,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[])
             {
               ACE_NEW_RETURN
                 (output_file,
-                 ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_),
+                 ofstream (ACE_TEXT_TO_CHAR_IN (this->filename_),
                            ios::app | ios::out),
                  -1);
               delete_ostream = 1;
@@ -439,7 +439,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &,
 
               this->log_msg_->msg_ostream (output_file);
 #else
-              output_file->open (ACE_TEXT_ALWAYS_CHAR (this->filename_),
+              output_file->open (ACE_TEXT_TO_CHAR_IN (this->filename_),
                                  ios::out);
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
@@ -532,7 +532,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &,
 
       this->log_msg_->msg_ostream (output_file);
 #else
-      output_file->open (ACE_TEXT_ALWAYS_CHAR (this->filename_),
+      output_file->open (ACE_TEXT_TO_CHAR_IN (this->filename_),
                          ios::out);
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
diff --git a/ace/MEM_Connector.cpp b/ace/MEM_Connector.cpp
index a2e33cedc81..f5155b9d961 100644
--- a/ace/MEM_Connector.cpp
+++ b/ace/MEM_Connector.cpp
@@ -73,9 +73,9 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream,
                        ACE_LIB_TEXT ("(%P|%t) MEM_Connector can't connect ")
                        ACE_LIB_TEXT ("to %s:%d which is not a local endpoint ")
                        ACE_LIB_TEXT ("(local address is %s:%d)\n"),
-                       ACE_TEXT_CHAR_TO_TCHAR (remote_sap.get_host_name ()),
+                       ACE_TEXT_TO_TCHAR_IN (remote_sap.get_host_name ()),
                        remote_sap.get_port_number (),
-                       ACE_TEXT_CHAR_TO_TCHAR (this->address_.get_host_name ()),
+                       ACE_TEXT_TO_TCHAR_IN (this->address_.get_host_name ()),
                        this->address_.get_port_number ()),
                       -1);
   else
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 66c05ebc6ef..6aa2ec7e49a 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -42,7 +42,6 @@ libACE_la_SOURCES = \
   ACE.cpp \
   ACE_crc32.cpp \
   ACE_crc_ccitt.cpp \
-  ARGV.cpp \
   ATM_Acceptor.cpp \
   ATM_Addr.cpp \
   ATM_Connector.cpp \
diff --git a/ace/Malloc_Instantiations.cpp b/ace/Malloc_Instantiations.cpp
new file mode 100644
index 00000000000..5eea274f6bb
--- /dev/null
+++ b/ace/Malloc_Instantiations.cpp
@@ -0,0 +1,41 @@
+// $Id$
+
+#include "ace/Local_Memory_Pool.h"
+#include "ace/Malloc_T.h"
+#include "ace/Null_Mutex.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>;
+template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX> >;
+
+// Explicitly instantiate these templates in the multithreaded case
+// since some classes need them.
+# if defined (ACE_HAS_THREADS)
+template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>;
+template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >;
+# endif  /* ACE_HAS_THREADS */
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>
+#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >
+
+// Explicitly instantiate these templates in the multithreaded case
+// since some classes need them.
+# if defined (ACE_HAS_THREADS)
+#  pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>
+#  pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>
+#  pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >
+# endif  /* ACE_HAS_THREADS */
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index d59436ac2b6..86560f5cea8 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -294,19 +294,17 @@ ACE_Allocator_Adapter<MALLOC>::protect (void *addr, size_t len, int flags)
 
 template <class MALLOC>
 ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const char *pool_name)
-  : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name))
+  : allocator_ (ACE_TEXT_TO_TCHAR_IN (pool_name))
 {
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
 }
 
-#if defined (ACE_HAS_WCHAR)
 template <class MALLOC>
 ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const wchar_t *pool_name)
-  : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name))
+  : allocator_ (ACE_TEXT_TO_TCHAR_IN (pool_name))
 {
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
 }
-#endif /* ACE_HAS_WCHAR */
 
 template <class MALLOC>
 ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter (void)
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h
index 021a13c2e58..79c92dfe99e 100644
--- a/ace/Malloc_T.h
+++ b/ace/Malloc_T.h
@@ -238,14 +238,13 @@ public:
   ACE_Allocator_Adapter (const char *pool_name,
                          const char *lock_name,
                          MEMORY_POOL_OPTIONS options = 0)
-      : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name),
-                    ACE_TEXT_CHAR_TO_TCHAR (lock_name),
+      : allocator_ (ACE_TEXT_TO_TCHAR_IN (pool_name),
+                    ACE_TEXT_TO_TCHAR_IN (lock_name),
                     options)
     {
       ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
     }
 
-#if defined (ACE_HAS_WCHAR)
   /**
    * Note that @a pool_name should be located in
    * a directory with the appropriate visibility and protection so
@@ -261,13 +260,12 @@ public:
   ACE_Allocator_Adapter (const wchar_t *pool_name,
                          const wchar_t *lock_name,
                          MEMORY_POOL_OPTIONS options = 0)
-      : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name),
-                    ACE_TEXT_WCHAR_TO_TCHAR (lock_name),
+      : allocator_ (ACE_TEXT_TO_TCHAR_IN (pool_name),
+                    ACE_TEXT_TO_TCHAR_IN (lock_name),
                     options)
     {
       ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
     }
-#endif /* ACE_HAS_WCHAR */
 
   /// Destructor.
   virtual ~ACE_Allocator_Adapter (void);
diff --git a/ace/Manual_Event.cpp b/ace/Manual_Event.cpp
index 57543a6d840..5acefac1109 100644
--- a/ace/Manual_Event.cpp
+++ b/ace/Manual_Event.cpp
@@ -18,12 +18,11 @@ ACE_Manual_Event::ACE_Manual_Event (int initial_state,
   : ACE_Event (1,
                initial_state,
                type,
-               ACE_TEXT_CHAR_TO_TCHAR (name),
+               ACE_TEXT_TO_TCHAR_IN (name),
                arg)
 {
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_Manual_Event::ACE_Manual_Event (int initial_state,
                                     int type,
                                     const wchar_t *name,
@@ -31,11 +30,10 @@ ACE_Manual_Event::ACE_Manual_Event (int initial_state,
   : ACE_Event (1,
                initial_state,
                type,
-               ACE_TEXT_WCHAR_TO_TCHAR (name),
+               ACE_TEXT_TO_TCHAR_IN (name),
                arg)
 {
 }
-#endif /* ACE_HAS_WCHAR */
 
 void
 ACE_Manual_Event::dump (void) const
diff --git a/ace/Manual_Event.h b/ace/Manual_Event.h
index 77de173788e..fd3b5743188 100644
--- a/ace/Manual_Event.h
+++ b/ace/Manual_Event.h
@@ -45,13 +45,11 @@ public:
                     const char *name = 0,
                     void *arg = 0);
 
-#if defined (ACE_HAS_WCHAR)
   /// constructor which will create manual event (wchar_t version)
   ACE_Manual_Event (int initial_state,
                     int type,
                     const wchar_t *name,
                     void *arg = 0);
-#endif /* ACE_HAS_WCHAR */
 
   /// Default dtor.
   ~ACE_Manual_Event (void);
diff --git a/ace/Multihomed_INET_Addr.cpp b/ace/Multihomed_INET_Addr.cpp
index 152127daeb4..a24f98957e3 100644
--- a/ace/Multihomed_INET_Addr.cpp
+++ b/ace/Multihomed_INET_Addr.cpp
@@ -55,7 +55,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
       if (ret) {
         ACE_DEBUG ((LM_DEBUG,
                     ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (secondary_host_names[i]), port_number));
+                    ACE_TEXT_TO_TCHAR_IN (secondary_host_names[i]), port_number));
         this->secondaries_.size(this->secondaries_.size() - 1);
       }
       else
@@ -66,7 +66,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
   return;
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
                                                    const wchar_t host_name[],
                                                    int encode,
@@ -91,7 +90,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
       if (ret) {
         ACE_DEBUG ((LM_DEBUG,
                     ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"),
-                    ACE_TEXT_WCHAR_TO_TCHAR (secondary_host_names[i]), port_number));
+                    ACE_TEXT_TO_TCHAR_IN (secondary_host_names[i]), port_number));
         this->secondaries_.size(this->secondaries_.size() - 1);
       }
       else
@@ -101,7 +100,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
 
   return;
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number,
                                                    ACE_UINT32 primary_ip_addr,
@@ -162,7 +160,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number,
   return ACE_INET_Addr::set(port_number, host_name, encode, address_family);
 }
 
-#if defined (ACE_HAS_WCHAR)
 //
 // WCHAR version of ::set
 //
@@ -189,7 +186,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number,
 
   return ACE_INET_Addr::set(port_number, host_name, encode, address_family);
 }
-#endif /* ACE_HAS_WCHAR */
 
 int
 ACE_Multihomed_INET_Addr::set (u_short port_number,
diff --git a/ace/Multihomed_INET_Addr.h b/ace/Multihomed_INET_Addr.h
index a7a838395db..75799cf0077 100644
--- a/ace/Multihomed_INET_Addr.h
+++ b/ace/Multihomed_INET_Addr.h
@@ -81,7 +81,6 @@ public:
                            const ACE_UINT32 *secondary_ip_addrs = 0,
                            size_t size = 0);
 
-#if defined (ACE_HAS_WCHAR)
     /**
      * WCHAR versions of the methods that take char's as arguments.
      */
@@ -98,8 +97,6 @@ public:
            const wchar_t *(secondary_host_names[]) = 0,
            size_t size = 0);
 
-#endif /* ACE_HAS_WCHAR */
-
   /// Use compiler-generated copy constructor.
 
   /// Use compiler-generated assignment operator.
diff --git a/ace/Mutex.h b/ace/Mutex.h
index 278e0a9ab9d..61d4db02491 100644
--- a/ace/Mutex.h
+++ b/ace/Mutex.h
@@ -29,10 +29,7 @@
 #   define ACE_DEFAULT_MUTEX_A "ACE_MUTEX"
 # endif /* ACE_DEFAULT_MUTEX_A */
 
-# if defined (ACE_HAS_WCHAR)
-#   define ACE_DEFAULT_MUTEX_W ACE_TEXT_WIDE(ACE_DEFAULT_MUTEX_A)
-# endif /* ACE_HAS_WCHAR */
-
+# define ACE_DEFAULT_MUTEX_W ACE_TEXT_WIDE(ACE_DEFAULT_MUTEX_A)
 # define ACE_DEFAULT_MUTEX ACE_LIB_TEXT (ACE_DEFAULT_MUTEX_A)
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index 6eba99986a4..99fc0f1f2ec 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -420,7 +420,7 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc,                \
 #define ACE_NT_SERVICE_RUN(SVCNAME, SVCINSTANCE, RET)                      \
   ACE_TEXT_SERVICE_TABLE_ENTRY _ace_nt_svc_table[2] =                      \
   {                                                                        \
-    ACE_NT_SERVICE_ENTRY(ACE_TEXT (#SVCNAME), SVCNAME),                    \
+    ACE_NT_SERVICE_ENTRY(ACE_LIB_TEXT (#SVCNAME), SVCNAME),                    \
     { 0, 0 }                                                               \
   };                                                                       \
   _ace_nt_svc_obj_##SVCNAME = SVCINSTANCE;                                 \
diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp
index f92bbf3c15d..7cee855d644 100644
--- a/ace/Name_Request_Reply.cpp
+++ b/ace/Name_Request_Reply.cpp
@@ -21,9 +21,9 @@ ACE_Name_Request::ACE_Name_Request (void)
 
 ACE_Name_Request::ACE_Name_Request (
   ACE_INT32 t, // Type of request.
-  const ACE_WCHAR_T name[], // Name
+  const wchar_t name[], // Name
   const ACE_UINT32 name_length, // size in bytes
-  const ACE_WCHAR_T value[], //
+  const wchar_t value[], //
   const ACE_UINT32 value_length, // size in bytes
   const char type[], //
   const ACE_UINT32 type_length, // size in bytes
@@ -52,8 +52,8 @@ ACE_Name_Request::ACE_Name_Request (
 
   // Set up pointers and copy name value and type into request.
   this->name_ = this->transfer_.data_;
-  this->value_  = &this->name_[name_length / sizeof (ACE_WCHAR_T) ];
-  this->type_  = (char *)(&this->value_[value_length / sizeof (ACE_WCHAR_T)]); //
+  this->value_  = &this->name_[name_length / sizeof (wchar_t) ];
+  this->type_  = (char *)(&this->value_[value_length / sizeof (wchar_t)]); //
 
   (void) ACE_OS::memcpy (this->name_,
                          name,
@@ -199,7 +199,7 @@ ACE_Name_Request::timeout (const ACE_Time_Value timeout)
 
 // = Set/get the name
 
-const ACE_WCHAR_T *
+const wchar_t *
 ACE_Name_Request::name (void) const
 {
   ACE_TRACE ("ACE_Name_Request::name");
@@ -207,7 +207,7 @@ ACE_Name_Request::name (void) const
 }
 
 void
-ACE_Name_Request::name (const ACE_WCHAR_T *t)
+ACE_Name_Request::name (const wchar_t *t)
 {
   ACE_TRACE ("ACE_Name_Request::name");
   (void) ACE_OS::memcpy (this->name_,
@@ -217,7 +217,7 @@ ACE_Name_Request::name (const ACE_WCHAR_T *t)
 
 // = Set/get the value
 
-const ACE_WCHAR_T *
+const wchar_t *
 ACE_Name_Request::value (void) const
 {
   ACE_TRACE ("ACE_Name_Request::value");
@@ -225,7 +225,7 @@ ACE_Name_Request::value (void) const
 }
 
 void
-ACE_Name_Request::value (const ACE_WCHAR_T *c)
+ACE_Name_Request::value (const wchar_t *c)
 {
   ACE_TRACE ("ACE_Name_Request::value");
 
@@ -265,7 +265,7 @@ ACE_Name_Request::encode (void *&buf)
 
   size_t nv_data_len =
     (this->transfer_.name_len_ + this->transfer_.value_len_)
-    / sizeof (ACE_WCHAR_T);
+    / sizeof (wchar_t);
 
   for (size_t i = 0; i < nv_data_len; i++)
     this->transfer_.data_[i] =
@@ -303,15 +303,15 @@ ACE_Name_Request::decode (void)
 
   size_t nv_data_len =
     (this->transfer_.name_len_ + this->transfer_.value_len_)
-    / sizeof (ACE_WCHAR_T);
+    / sizeof (wchar_t);
 
   for (size_t i = 0; i < nv_data_len; i++)
     this->transfer_.data_[i] =
       ntohs (this->transfer_.data_[i]);
 
   this->name_ = this->transfer_.data_;
-  this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (ACE_WCHAR_T)];
-  this->type_ = (char *)(&this->value_[this->transfer_.value_len_ / sizeof (ACE_WCHAR_T)]);
+  this->value_ = &this->name_[this->transfer_.name_len_ / sizeof (wchar_t)];
+  this->type_ = (char *)(&this->value_[this->transfer_.value_len_ / sizeof (wchar_t)]);
   this->type_[this->transfer_.type_len_] = '\0';
 
   // Decode the variable-sized portion.
diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h
index 07e4b61d95b..cb9173cd7bc 100644
--- a/ace/Name_Request_Reply.h
+++ b/ace/Name_Request_Reply.h
@@ -73,9 +73,9 @@ public:
 
   /// Create a ACE_Name_Request message.
   ACE_Name_Request (ACE_INT32 msg_type, // Type of request.
-                    const ACE_WCHAR_T name[], //
+                    const wchar_t name[], //
                     const ACE_UINT32 name_length,
-                    const ACE_WCHAR_T value[],
+                    const wchar_t value[],
                     const ACE_UINT32 value_length,
                     const char type[],
                     const ACE_UINT32 type_length,
@@ -102,12 +102,12 @@ public:
   void timeout (const ACE_Time_Value timeout);
 
   // = Set/get the name
-  const ACE_WCHAR_T *name (void) const;
-  void name (const ACE_WCHAR_T *);
+  const wchar_t *name (void) const;
+  void name (const wchar_t *);
 
   // = Set/get the value
-  const ACE_WCHAR_T *value (void) const;
-  void value (const ACE_WCHAR_T *);
+  const wchar_t *value (void) const;
+  void value (const wchar_t *);
 
   // = Set/get the type
   const char *type (void) const;
@@ -169,17 +169,17 @@ private:
     /// The data portion contains the <name_>
     /// followed by the <value_>
     /// followed by the <type_>.
-    ACE_WCHAR_T data_[MAX_NAME_LENGTH + MAXPATHLEN + MAXPATHLEN + 2];
+    wchar_t data_[MAX_NAME_LENGTH + MAXPATHLEN + MAXPATHLEN + 2];
   };
 
   /// Transfer buffer.
   Transfer transfer_;
 
   /// Pointer to the beginning of the name in this->data_.
-  ACE_WCHAR_T *name_;
+  wchar_t *name_;
 
   /// Pointer to the beginning of the value in this->data_;
-  ACE_WCHAR_T *value_;
+  wchar_t *value_;
 
   /// Pointer to the beginning of the type in this->data_;
   char *type_;
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index 596d4aa3aed..b7ad702ac54 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -600,7 +600,7 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[])
   // clean it up in the destructor).
   this->database (this->process_name ());
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT ("b:c:dh:l:P:p:s:T:vr"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_LIB_TEXT ("b:c:dh:l:P:p:s:T:vr"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp
index c855adb7729..e3452744928 100644
--- a/ace/OS_NS_Thread.cpp
+++ b/ace/OS_NS_Thread.cpp
@@ -1318,7 +1318,6 @@ ACE_OS::cond_init (ACE_cond_t *cv,
     ACE_OS::cond_init (cv, static_cast<short> (attributes.type), name, arg);
 }
 
-# if defined (ACE_HAS_WCHAR)
 int
 ACE_OS::cond_init (ACE_cond_t *cv,
                    ACE_condattr_t &attributes,
@@ -1327,7 +1326,6 @@ ACE_OS::cond_init (ACE_cond_t *cv,
   return
     ACE_OS::cond_init (cv, static_cast<short> (attributes.type), name, arg);
 }
-# endif /* ACE_HAS_WCHAR */
 
 int
 ACE_OS::cond_init (ACE_cond_t *cv, short type, const char *name, void *arg)
@@ -1358,7 +1356,6 @@ ACE_OS::cond_init (ACE_cond_t *cv, short type, const char *name, void *arg)
 # endif /* ACE_HAS_THREADS */
 }
 
-# if defined (ACE_HAS_WCHAR)
 int
 ACE_OS::cond_init (ACE_cond_t *cv, short type, const wchar_t *name, void *arg)
 {
@@ -1387,7 +1384,6 @@ ACE_OS::cond_init (ACE_cond_t *cv, short type, const wchar_t *name, void *arg)
   ACE_NOTSUP_RETURN (-1);
 #   endif /* ACE_HAS_THREADS */
 }
-# endif /* ACE_HAS_WCHAR */
 
 int
 ACE_OS::cond_signal (ACE_cond_t *cv)
@@ -1999,7 +1995,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
   ::CreateMutexW (ACE_OS::default_win32_security_attributes_r
                           (sa, &sa_buffer, &sd_buffer),
                         FALSE,
-                        ACE_Ascii_To_Wide (name).wchar_rep ());
+                        ACE_TEXT_TO_WCHAR_IN (name));
 #   else /* ACE_HAS_WINCE */
       m->proc_mutex_ =
   ::CreateMutexA (ACE_OS::default_win32_security_attributes_r
@@ -2152,7 +2148,6 @@ ACE_OS::mutex_destroy (ACE_mutex_t *m)
 #endif /* ACE_HAS_THREADS */
 }
 
-#if defined (ACE_HAS_WCHAR)
 int
 ACE_OS::mutex_init (ACE_mutex_t *m,
                     int lock_scope,
@@ -2189,13 +2184,12 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
 #else /* ACE_HAS_THREADS && ACE_HAS_WTHREADS */
   return ACE_OS::mutex_init (m,
                              lock_scope,
-                             ACE_Wide_To_Ascii (name).char_rep (),
+                             ACE_TEXT_TO_CHAR_IN (name),
                              attributes,
                              sa,
                              lock_type);
 #endif /* ACE_HAS_THREADS && ACE_HAS_WTHREADS */
 }
-#endif /* ACE_HAS_WCHAR */
 
 int
 ACE_OS::mutex_lock (ACE_mutex_t *m)
@@ -2663,7 +2657,7 @@ ACE_OS::event_destroy (ACE_event_t *event)
 # endif
       ACE_OS::munmap (event->eventdata_,
                       sizeof (ACE_eventdata_t));
-      ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR(event->name_));
+      ACE_OS::shm_unlink (ACE_TEXT_TO_TCHAR_IN(event->name_));
       ACE_OS::free (event->name_);
       return r1 != 0 || r2 != 0 ? -1 : 0;
     }
@@ -2752,7 +2746,7 @@ ACE_OS::event_init (ACE_event_t *event,
                              (sa, &sa_buffer, &sd_buffer),
                            manual_reset,
                            initial_state,
-                           ACE_Ascii_To_Wide (name).wchar_rep ());
+                           ACE_TEXT_TO_WCHAR_IN (name));
 # else /* ACE_HAS_WINCE */
   *event = ::CreateEventA (ACE_OS::default_win32_security_attributes_r
                              (sa, &sa_buffer, &sd_buffer),
@@ -2773,13 +2767,13 @@ ACE_OS::event_init (ACE_event_t *event,
     {
       int owner = 0;
       // Let's see if the shared memory entity already exists.
-      ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name),
+      ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_TO_TCHAR_IN (name),
                                         O_RDWR | O_CREAT | O_EXCL,
                                         ACE_DEFAULT_FILE_PERMS);
       if (fd == ACE_INVALID_HANDLE)
         {
           if (errno == EEXIST)
-            fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name),
+            fd = ACE_OS::shm_open (ACE_TEXT_TO_TCHAR_IN (name),
                                    O_RDWR | O_CREAT,
                                    ACE_DEFAULT_FILE_PERMS);
           if (fd == ACE_INVALID_HANDLE)   // Still can't get it.
@@ -2807,7 +2801,7 @@ ACE_OS::event_init (ACE_event_t *event,
       if (evtdata == MAP_FAILED)
         {
           if (owner)
-            ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name));
+            ACE_OS::shm_unlink (ACE_TEXT_TO_TCHAR_IN (name));
           return -1;
         }
 
@@ -2816,7 +2810,7 @@ ACE_OS::event_init (ACE_event_t *event,
           event->name_ = ACE_OS::strdup (name);
           if (event->name_ == 0)
             {
-              ACE_OS::shm_unlink (ACE_TEXT_CHAR_TO_TCHAR (name));
+              ACE_OS::shm_unlink (ACE_TEXT_TO_TCHAR_IN (name));
               return -1;
             }
           event->eventdata_ = evtdata;
@@ -5540,7 +5534,6 @@ ACE_OS::unique_name (const void *object,
                     length);
 }
 
-#if defined (ACE_USES_WCHAR)
 void
 ACE_OS::unique_name (const void *object,
                      wchar_t *name,
@@ -5553,14 +5546,13 @@ ACE_OS::unique_name (const void *object,
   // <object>.
   wchar_t temp_name[ACE_UNIQUE_NAME_LEN];
   ACE_OS::sprintf (temp_name,
-                   ACE_LIB_TEXT ("%p%d"),
+                   ACE_TEXT_WIDE ("%p%d"),
                    object,
                    static_cast <int> (ACE_OS::getpid ()));
   ACE_OS::strsncpy (name,
                     temp_name,
                     length);
 }
-#endif
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ace/OS_NS_Thread.h b/ace/OS_NS_Thread.h
index db28de9ae00..9274b5212a7 100644
--- a/ace/OS_NS_Thread.h
+++ b/ace/OS_NS_Thread.h
@@ -1272,7 +1272,6 @@ namespace ACE_OS {
                  const char *name = 0,
                  void *arg = 0);
 
-# if defined (ACE_HAS_WCHAR)
 #   if defined (ACE_LACKS_COND_T) && ! defined (ACE_PSOS_DIAB_MIPS)
   extern ACE_Export
 #   else
@@ -1292,7 +1291,6 @@ namespace ACE_OS {
                  ACE_condattr_t &attributes,
                  const wchar_t *name,
                  void *arg = 0);
-# endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_LACKS_COND_T) && ! defined (ACE_PSOS_DIAB_MIPS)
   extern ACE_Export
@@ -1351,7 +1349,6 @@ namespace ACE_OS {
                   void *arg = 0,
                   LPSECURITY_ATTRIBUTES sa = 0);
 
-# if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int event_init (ACE_event_t *event,
                   int manual_reset,
@@ -1360,7 +1357,6 @@ namespace ACE_OS {
                   const wchar_t *name,
                   void *arg = 0,
                   LPSECURITY_ATTRIBUTES sa = 0);
-# endif /* ACE_HAS_WCHAR */
 
   extern ACE_Export
   int event_pulse (ACE_event_t *event);
@@ -1401,7 +1397,6 @@ namespace ACE_OS {
                   LPSECURITY_ATTRIBUTES sa = 0,
                   int lock_type = 0);
 
-#if defined (ACE_HAS_WCHAR)
   extern ACE_Export
   int mutex_init (ACE_mutex_t *m,
                   int lock_scope,
@@ -1409,7 +1404,6 @@ namespace ACE_OS {
                   ACE_mutexattr_t *arg = 0,
                   LPSECURITY_ATTRIBUTES sa = 0,
                   int lock_type = 0);
-#endif /* ACE_HAS_WCHAR */
 
   /// Win32 note: Abandoned mutexes are not treated differently. 0 is
   /// returned since the calling thread does get the ownership.
@@ -1566,7 +1560,6 @@ namespace ACE_OS {
                  int max = 0x7fffffff,
                  LPSECURITY_ATTRIBUTES sa = 0);
 
-# if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int sema_init (ACE_sema_t *s,
                  u_int count,
@@ -1575,7 +1568,6 @@ namespace ACE_OS {
                  void *arg = 0,
                  int max = 0x7fffffff,
                  LPSECURITY_ATTRIBUTES sa = 0);
-# endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int sema_post (ACE_sema_t *s);
@@ -1887,13 +1879,11 @@ namespace ACE_OS {
                          const char *name = 0,
                          ACE_mutexattr_t *arg = 0);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int thread_mutex_init (ACE_thread_mutex_t *m,
                          int lock_type,
                          const wchar_t *name,
                          ACE_mutexattr_t *arg = 0);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int thread_mutex_lock (ACE_thread_mutex_t *m);
@@ -1926,12 +1916,12 @@ namespace ACE_OS {
   void unique_name (const void *object,
                     char *name,
                     size_t length);
-#if defined (ACE_USES_WCHAR)
+
   extern ACE_Export
   void unique_name (const void *object,
                     wchar_t *name,
                     size_t length);
-#endif /* ACE_USES_WCHAR */
+
 } /* namespace ACE_OS */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl
index b839a53ce94..581e5166ee5 100644
--- a/ace/OS_NS_Thread.inl
+++ b/ace/OS_NS_Thread.inl
@@ -331,24 +331,20 @@ ACE_OS::cond_init (ACE_cond_t *cv,
 # endif /* ACE_HAS_THREADS */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::cond_init (ACE_cond_t *cv,
                    ACE_condattr_t &attributes,
                    const wchar_t *name,
                    void *arg)
 {
-  return ACE_OS::cond_init (cv, attributes, ACE_Wide_To_Ascii (name).char_rep (), arg);
+  return ACE_OS::cond_init (cv, attributes, ACE_TEXT_TO_CHAR_IN (name), arg);
 }
-#endif /* ACE_HAS_WCHAR */
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::cond_init (ACE_cond_t *cv, short type, const wchar_t *name, void *arg)
 {
-  return ACE_OS::cond_init (cv, type, ACE_Wide_To_Ascii (name).char_rep (), arg);
+  return ACE_OS::cond_init (cv, type, ACE_TEXT_TO_CHAR_IN (name), arg);
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_OS::cond_signal (ACE_cond_t *cv)
@@ -525,7 +521,6 @@ ACE_OS::mutex_lock (ACE_mutex_t *m,
   return timeout == 0 ? ACE_OS::mutex_lock (m) : ACE_OS::mutex_lock (m, *timeout);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::event_init (ACE_event_t *event,
                     int manual_reset,
@@ -554,12 +549,11 @@ ACE_OS::event_init (ACE_event_t *event,
                              manual_reset,
                              initial_state,
                              type,
-                             ACE_Wide_To_Ascii (name).char_rep (),
+                             ACE_TEXT_TO_CHAR_IN (name),
                              arg,
                              sa);
 #endif /* ACE_WIN32 */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE long
 ACE_OS::priority_control (ACE_idtype_t idtype, ACE_id_t identifier, int cmd, void *arg)
@@ -1466,13 +1460,13 @@ ACE_OS::sema_init (ACE_sema_t *s,
   if (type == USYNC_PROCESS)
     {
       // Let's see if it already exists.
-      ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name),
+      ACE_HANDLE fd = ACE_OS::shm_open (ACE_TEXT_TO_TCHAR_IN(name),
                                         O_RDWR | O_CREAT | O_EXCL,
                                         ACE_DEFAULT_FILE_PERMS);
       if (fd == ACE_INVALID_HANDLE)
         {
           if (errno == EEXIST)
-            fd = ACE_OS::shm_open (ACE_TEXT_CHAR_TO_TCHAR (name),
+            fd = ACE_OS::shm_open (ACE_TEXT_TO_TCHAR_IN(name),
                                    O_RDWR | O_CREAT,
                                    ACE_DEFAULT_FILE_PERMS);
           else
@@ -1581,7 +1575,7 @@ ACE_OS::sema_init (ACE_sema_t *s,
   s->fd_[0] = s->fd_[1] = ACE_INVALID_HANDLE;
   bool creator = false;
 
-  if (ACE_OS::mkfifo (ACE_TEXT_CHAR_TO_TCHAR (name), mode) < 0)
+  if (ACE_OS::mkfifo (ACE_TEXT_TO_TCHAR_IN(name), mode) < 0)
     {
       if (errno != EEXIST)    /* already exists OK else ERR */
         return -1;
@@ -1759,7 +1753,6 @@ ACE_OS::sema_init (ACE_sema_t *s,
 #endif /* ACE_HAS_POSIX_SEM */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::sema_init (ACE_sema_t *s,
                    u_int count,
@@ -1824,10 +1817,9 @@ ACE_OS::sema_init (ACE_sema_t *s,
 #   endif /* ACE_USES_WINCE_SEMA_SIMULATION */
 # else /* ACE_HAS_WTHREADS */
   // Just call the normal char version.
-  return ACE_OS::sema_init (s, count, type, ACE_Wide_To_Ascii (name).char_rep (), arg, max, sa);
+  return ACE_OS::sema_init (s, count, type, ACE_TEXT_TO_CHAR_IN (name), arg, max, sa);
 # endif /* ACE_HAS_WTHREADS */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_OS::sema_post (ACE_sema_t *s)
@@ -3603,7 +3595,6 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m,
 #endif /* ACE_HAS_THREADS */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m,
                            int lock_type,
@@ -3637,7 +3628,6 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m,
 
 #endif /* ACE_HAS_THREADS */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_OS::thread_mutex_lock (ACE_thread_mutex_t *m)
diff --git a/ace/OS_NS_ctype.h b/ace/OS_NS_ctype.h
index 32abbe0e053..cb1719ee9c6 100644
--- a/ace/OS_NS_ctype.h
+++ b/ace/OS_NS_ctype.h
@@ -49,68 +49,64 @@ namespace ACE_OS {
   //@{
 
   /// Returns true if the character is an alphanumeric character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isalnum (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_isalnum (CHAR_TYPE c);
 
   /// Returns true if the character is an alphabetic character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isalpha (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_isalpha (CHAR_TYPE c);
 
   /// Returns true if the character is a control character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_iscntrl (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_iscntrl (CHAR_TYPE c);
 
   /// Returns true if the character is a decimal-digit character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isdigit (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_isdigit (CHAR_TYPE c);
 
   /// Returns true if the character is a printable character other than a space.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isgraph (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_isgraph (CHAR_TYPE c);
 
   /// Returns true if the character is a lowercase character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_islower (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_islower (CHAR_TYPE c);
 
   /// Returns true if the character is a printable character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isprint (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_isprint (CHAR_TYPE c);
 
   /// Returns true if the character is a punctuation character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_ispunct (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_ispunct (CHAR_TYPE c);
 
   /// Returns true if the character is a space character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isspace (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_isspace (CHAR_TYPE c);
 
   /// Returns true if the character is an uppercase character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isupper (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_isupper (CHAR_TYPE c);
 
   /// Returns true if the character is a hexadecimal-digit character.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int ace_isxdigit (ACE_TCHAR c);
+  template <typename CHAR_TYPE> inline
+  int ace_isxdigit (CHAR_TYPE c);
 
   /// Converts a character to lower case (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   int ace_tolower (int c);
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWLOWER)
   /// Converts a character to lower case (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wint_t ace_towlower (wint_t c);
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWLOWER */
 
   /// Converts a character to upper case (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   int ace_toupper (int c);
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWUPPER)
   /// Converts a character to upper case (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wint_t ace_towupper (wint_t c);
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWUPPER */
 
   //@}
 
@@ -126,5 +122,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #   include "ace/OS_NS_ctype.inl"
 # endif /* ACE_HAS_INLINED_OSCALLS */
 
+#include "ace/OS_NS_ctype_T.inl"
+
 # include /**/ "ace/post.h"
 #endif /* ACE_OS_NS_CTYPE_H */
diff --git a/ace/OS_NS_ctype.inl b/ace/OS_NS_ctype.inl
index e7199338653..dbda1f48c2b 100644
--- a/ace/OS_NS_ctype.inl
+++ b/ace/OS_NS_ctype.inl
@@ -3,121 +3,10 @@
 // $Id$
 
 #include "ace/os_include/os_ctype.h"
-#if defined ACE_HAS_WCHAR
-# include "ace/os_include/os_wctype.h"
-#endif /* ACE_HAS_WCHAR */
+#include "ace/os_include/os_wctype.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_INLINE int
-ACE_OS::ace_isalnum (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswalnum (c);
-#else /* ACE_USES_WCHAR */
-  return isalnum ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_isalpha (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswalpha (c);
-#else /* ACE_USES_WCHAR */
-  return isalpha ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_iscntrl (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswcntrl (c);
-#else /* ACE_USES_WCHAR */
-  return iscntrl ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_isdigit (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswdigit (c);
-#else /* ACE_USES_WCHAR */
-  return isdigit ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_isgraph (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswgraph (c);
-#else /* ACE_USES_WCHAR */
-  return isgraph ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_islower (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswlower (c);
-#else /* ACE_USES_WCHAR */
-  return islower ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_isprint (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswprint (c);
-#else /* ACE_USES_WCHAR */
-  return isprint ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_ispunct (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswpunct (c);
-#else /* ACE_USES_WCHAR */
-  return ispunct ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_isspace (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswspace (c);
-#else /* ACE_USES_WCHAR */
-  return isspace ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_isupper (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswupper (c);
-#else /* ACE_USES_WCHAR */
-  return isupper ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
-
-ACE_INLINE int
-ACE_OS::ace_isxdigit (ACE_TCHAR c)
-{
-#if defined (ACE_USES_WCHAR)
-  return iswxdigit (c);
-#else /* ACE_USES_WCHAR */
-  return isxdigit ((unsigned char) c);
-#endif /* ACE_USES_WCHAR */
-}
 
 ACE_INLINE int
 ACE_OS::ace_tolower (int c)
@@ -125,13 +14,16 @@ ACE_OS::ace_tolower (int c)
   return tolower (c);
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWLOWER)
 ACE_INLINE wint_t
 ACE_OS::ace_towlower (wint_t c)
 {
-  return towlower (c);
+  #if !defined (ACE_LACKS_TOWLOWER)
+    return towlower (c);
+  #else
+    ACE_UNUSED_ARG( c );
+    ACE_NOTSUP_RETURN (0);
+  #endif
 }
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWLOWER */
 
 ACE_INLINE int
 ACE_OS::ace_toupper (int c)
@@ -139,12 +31,16 @@ ACE_OS::ace_toupper (int c)
   return toupper (c);
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_TOWUPPER)
 ACE_INLINE wint_t
 ACE_OS::ace_towupper (wint_t c)
 {
-  return towupper (c);
+  #if !defined (ACE_LACKS_TOWUPPER)
+    return towupper (c);
+  #else
+    ACE_UNUSED_ARG( c );
+    ACE_NOTSUP_RETURN (0);
+  #endif
 }
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_TOWUPPER */
+
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_ctype_T.inl b/ace/OS_NS_ctype_T.inl
new file mode 100644
index 00000000000..69e56ca5005
--- /dev/null
+++ b/ace/OS_NS_ctype_T.inl
@@ -0,0 +1,169 @@
+// -*- C++ -*-
+// $Id$
+
+#include "ace/os_include/os_ctype.h"
+#include "ace/os_include/os_wctype.h"
+
+namespace ACE_OS
+{
+
+// For the time being we are safe lumping the wchar specializations
+// with ACE_USES_WCHAR. When the time comes that they are needed
+// outside of a "wide" build, then we will need to us appropriate
+// ACE_LACKS_XXXX.
+
+template <typename CHAR_TYPE> inline int
+ace_isalnum (CHAR_TYPE c)
+{
+  return isalnum (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_isalnum (wchar_t c)
+{
+  return iswalnum (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_isalpha (CHAR_TYPE c)
+{
+  return isalpha (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_isalpha (wchar_t c)
+{
+  return iswalpha (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_iscntrl (CHAR_TYPE c)
+{
+  return iscntrl (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_iscntrl (wchar_t c)
+{
+  return iswcntrl (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_isdigit (CHAR_TYPE c)
+{
+  return isdigit (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_isdigit (wchar_t c)
+{
+  return iswdigit (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_isgraph (CHAR_TYPE c)
+{
+  return isgraph (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_isgraph (wchar_t c)
+{
+  return iswgraph (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_islower (CHAR_TYPE c)
+{
+  return islower (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_islower (wchar_t c)
+{
+  return iswlower (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_isprint (CHAR_TYPE c)
+{
+  return isprint (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_isprint (wchar_t c)
+{
+  return iswprint (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_ispunct (CHAR_TYPE c)
+{
+  return ispunct (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_ispunct (wchar_t c)
+{
+  return iswpunct (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_isspace (CHAR_TYPE c)
+{
+  return isspace (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_isspace (wchar_t c)
+{
+  return iswspace (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_isupper (CHAR_TYPE c)
+{
+  return isupper (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_isupper (wchar_t c)
+{
+  return iswupper (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+template <typename CHAR_TYPE> inline int
+ace_isxdigit (CHAR_TYPE c)
+{
+  return isxdigit (static_cast<unsigned char> (c));
+}
+
+#if defined (ACE_USES_WCHAR)
+template <> inline int
+ace_isxdigit (wchar_t c)
+{
+  return iswxdigit (c);
+}
+#endif /* ACE_USES_WCHAR */
+
+}
diff --git a/ace/OS_NS_dirent.inl b/ace/OS_NS_dirent.inl
index ff562717cb9..6864e7a949d 100644
--- a/ace/OS_NS_dirent.inl
+++ b/ace/OS_NS_dirent.inl
@@ -64,7 +64,7 @@ opendir (const ACE_TCHAR *filename)
 #    elif defined (ACE_HAS_NONCONST_OPENDIR)
   return ::opendir (const_cast<char *> (filename));
 #    else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */
-  return ::opendir (ACE_TEXT_ALWAYS_CHAR (filename));
+  return ::opendir (ACE_TEXT_TO_CHAR_IN (filename));
 #    endif /* ACE_WIN32 && ACE_LACKS_OPENDIR */
 #  endif /* ACE_PSOS */
 #else
@@ -182,7 +182,7 @@ scandir (const ACE_TCHAR *dirname,
                                     const struct ACE_DIRENT **f2))
 {
 #if defined (ACE_HAS_SCANDIR)
-  return ::scandir (ACE_TEXT_ALWAYS_CHAR (dirname),
+  return ::scandir (ACE_TEXT_TO_CHAR_IN (dirname),
                     namelist,
                     selector,
 #  if defined (ACE_SCANDIR_CMP_USES_VOIDPTR)
diff --git a/ace/OS_NS_dlfcn.inl b/ace/OS_NS_dlfcn.inl
index 6c4caeaf3e8..74a2159107c 100644
--- a/ace/OS_NS_dlfcn.inl
+++ b/ace/OS_NS_dlfcn.inl
@@ -89,7 +89,7 @@ ACE_OS::dlerror (void)
 #   if defined (ACE_USES_WCHAR)
   const size_t BufLen = 256;
   static wchar_t buf[BufLen];
-  ACE_OS::strncpy (buf, ACE_TEXT_CHAR_TO_TCHAR (err), BufLen);
+  ACE_OS::string_copy (buf, err, BufLen);
   return buf;
 #   else
   return const_cast <char *> (err);
@@ -125,13 +125,13 @@ ACE_OS::dlopen (const ACE_TCHAR *fname,
   void *handle;
 #   if defined (ACE_HAS_SGIDLADD)
   ACE_OSCALL
-    (::sgidladd (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle);
+    (::sgidladd (ACE_TEXT_TO_CHAR_IN (fname), mode), void *, 0, handle);
 #   elif defined (_M_UNIX)
   ACE_OSCALL
-    (::_dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle);
+    (::_dlopen (ACE_TEXT_TO_CHAR_IN (fname), mode), void *, 0, handle);
 #   else
   ACE_OSCALL
-    (::dlopen (ACE_TEXT_ALWAYS_CHAR (fname), mode), void *, 0, handle);
+    (::dlopen (ACE_TEXT_TO_CHAR_IN (fname), mode), void *, 0, handle);
 #   endif /* ACE_HAS_SGIDLADD */
 #   if !defined (ACE_HAS_AUTOMATIC_INIT_FINI)
   if (handle != 0)
@@ -210,24 +210,15 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
 #endif /* ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE */
 
   // Get the correct OS type.
+  // Define symbolname
 #if defined (ACE_HAS_WINCE)
-  // CE (at least thru Pocket PC 2003) offers GetProcAddressW, not ...A, so
-  // we always need a wide-char string.
-  const wchar_t *symbolname = 0;
-#  if defined (ACE_USES_WCHAR)
-  symbolname = sname;
-#  else
-  ACE_Ascii_To_Wide sname_xlate (sname);
-  symbolname = sname_xlate.wchar_rep ();
-#  endif /* ACE_USES_WCHAR */
-#elif defined (ACE_USES_WCHAR)
-  // WinCE is WCHAR always; other platforms need a char * symbol name
-  ACE_Wide_To_Ascii w_sname (sname);
-  char *symbolname = w_sname.char_rep ();
-#elif defined (ACE_VXWORKS)
-  char *symbolname = const_cast<char *> (sname);
+  // WinCE expects a wchar
+  ACE::String_Conversion::Convert_In< wchar_t, char > convert (sname);
+  const wchar_t *symbolname = convert.c_str();
 #else
-  const char *symbolname = sname;
+  // Otherwise we make certain we have an ANSI char version
+  ACE::String_Conversion::Convert_In< char, wchar_t > convert (sname);
+  const char *symbolname = convert.c_str();
 #endif /* ACE_HAS_WINCE */
 
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
diff --git a/ace/OS_NS_fcntl.cpp b/ace/OS_NS_fcntl.cpp
index 1d9d5bf2bcc..d0b9e018776 100644
--- a/ace/OS_NS_fcntl.cpp
+++ b/ace/OS_NS_fcntl.cpp
@@ -81,7 +81,7 @@ ACE_OS::open (const char *filename,
   SECURITY_DESCRIPTOR sd_buffer;
 
 #if defined (ACE_HAS_WINCE)
-  ACE_HANDLE h = ::CreateFileW (ACE_Ascii_To_Wide (filename).wchar_rep (),
+  ACE_HANDLE h = ::CreateFileW (ACE_TEXT_TO_WCHAR_IN (filename),
                                 access,
                                 shared_mode,
                                 ACE_OS::default_win32_security_attributes_r
@@ -168,7 +168,6 @@ ACE_OS::open (const char *filename,
 #endif /* ACE_WIN32 */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_HANDLE
 ACE_OS::open (const wchar_t *filename,
               int mode,
@@ -260,12 +259,11 @@ ACE_OS::open (const wchar_t *filename,
     return h;
 #else /* ACE_WIN32 */
   // Just emulate with ascii version
-  return ACE_OS::open (ACE_Wide_To_Ascii (filename).char_rep (),
+  return ACE_OS::open (ACE_TEXT_TO_CHAR_IN (filename),
                        mode,
                        perms,
                        sa);
 #endif /* ACE_WIN32 */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_fcntl.h b/ace/OS_NS_fcntl.h
index 9334a1a075e..ac48e0e13e1 100644
--- a/ace/OS_NS_fcntl.h
+++ b/ace/OS_NS_fcntl.h
@@ -71,14 +71,12 @@ namespace ACE_OS {
                    int mode,
                    int perms = ACE_DEFAULT_OPEN_PERMS,
                    LPSECURITY_ATTRIBUTES sa = 0);
-#if defined (ACE_HAS_WCHAR)
+
   extern ACE_Export
   ACE_HANDLE open (const wchar_t *filename,
                    int mode,
                    int perms = ACE_DEFAULT_OPEN_PERMS,
                    LPSECURITY_ATTRIBUTES sa = 0);
-#endif /* ACE_HAS_WCHAR */
-
 } /* namespace ACE_OS */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp
index 46b30ef5fdb..475abea4487 100644
--- a/ace/OS_NS_stdio.cpp
+++ b/ace/OS_NS_stdio.cpp
@@ -159,7 +159,6 @@ ACE_OS::fopen (const char *filename,
   return 0;
 }
 
-#if defined (ACE_HAS_WCHAR)
 FILE *
 ACE_OS::fopen (const wchar_t *filename,
                const ACE_TCHAR *mode)
@@ -206,7 +205,6 @@ ACE_OS::fopen (const wchar_t *filename,
     }
   return 0;
 }
-#endif /* ACE_HAS_WCHAR */
 
 #endif /* ACE_WIN32 */
 
@@ -222,7 +220,6 @@ ACE_OS::fprintf (FILE *fp, const char *format, ...)
   return result;
 }
 
-#if defined (ACE_HAS_WCHAR)
 int
 ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...)
 {
@@ -243,7 +240,6 @@ ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...)
 
 # endif /* ACE_HAS_VFWPRINTF */
 }
-#endif /* ACE_HAS_WCHAR */
 
 
 // The following *printf functions aren't inline because
@@ -302,8 +298,6 @@ ACE_OS::snprintf (char *buf, size_t maxlen, const char *format, ...)
 #endif /* ACE_HAS_SNPRINTF */
 }
 
-#if defined (ACE_HAS_WCHAR)
-
 int
 ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...)
 {
@@ -347,7 +341,6 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...)
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_SNPRINTF */
 }
-#endif /* ACE_HAS_WCHAR */
 
 int
 ACE_OS::sprintf (char *buf, const char *format, ...)
@@ -362,7 +355,6 @@ ACE_OS::sprintf (char *buf, const char *format, ...)
   return result;
 }
 
-#if defined (ACE_HAS_WCHAR)
 int
 ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
 {
@@ -401,6 +393,6 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
 
 # endif /* XPG5 || ACE_HAS_DINKUM_STL */
 }
-#endif /* ACE_HAS_WCHAR */
+
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_stdio.h b/ace/OS_NS_stdio.h
index c2ad103bc5c..450b7ce2ced 100644
--- a/ace/OS_NS_stdio.h
+++ b/ace/OS_NS_stdio.h
@@ -151,11 +151,10 @@ namespace ACE_OS {
   char *cuserid (char *user,
                  size_t maxlen = ACE_MAX_USERID);
 
-#   if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *cuserid (wchar_t *user,
                     size_t maxlen = ACE_MAX_USERID);
-#   endif /* ACE_HAS_WCHAR */
+
 # endif /* ACE_LACKS_CUSERID */
   //@}
 
@@ -181,10 +180,8 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   char *fgets (char *buf, int size, FILE *fp);
 
-# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FGETWS)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *fgets (wchar_t *buf, int size, FILE *fp);
-# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */
 
   //@{ @name A set of wrappers for file locks.
 
@@ -245,14 +242,12 @@ namespace ACE_OS {
 #endif /* ACE_WIN32 */
   FILE *fopen (const char *filename, const ACE_TCHAR *mode);
 
-#if defined (ACE_HAS_WCHAR)
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   extern ACE_Export
 #else
   ACE_NAMESPACE_INLINE_FUNCTION
 #endif /* ACE_WIN32 */
   FILE *fopen (const wchar_t *filename, const ACE_TCHAR *mode);
-#endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_WIN32)
   /// Default Win32 Security Attributes definition.
@@ -295,20 +290,16 @@ namespace ACE_OS {
   extern ACE_Export
   int fprintf (FILE *fp, const char *format, ...);
 
-# if defined (ACE_HAS_WCHAR)
   extern ACE_Export
   int fprintf (FILE *fp, const wchar_t *format, ...);
-# endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int fputs (const char *s,
              FILE *stream);
 
-# if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FPUTWS)
   ACE_NAMESPACE_INLINE_FUNCTION
   int fputs (const wchar_t *s,
              FILE *stream);
-# endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t fread (void *ptr,
@@ -341,10 +332,8 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   void perror (const char *s);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   void perror (const wchar_t *s);
-#endif /* ACE_HAS_WCHAR */
 
   extern ACE_Export
   int printf (const char *format, ...);
@@ -352,22 +341,18 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   int puts (const char *s);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int puts (const wchar_t *s);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int rename (const char *old_name,
               const char *new_name,
               int flags = -1);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int rename (const wchar_t *old_name,
               const wchar_t *new_name,
               int flags = -1);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   void rewind (FILE *fp);
@@ -375,28 +360,22 @@ namespace ACE_OS {
   extern ACE_Export
   int snprintf (char *buf, size_t maxlen, const char *format, ...);
 
-# if defined (ACE_HAS_WCHAR)
   extern ACE_Export
   int snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format,...);
-# endif /* ACE_HAS_WCHAR */
 
   extern ACE_Export
   int sprintf (char *buf, const char *format, ...);
 
-# if defined (ACE_HAS_WCHAR)
   extern ACE_Export
   int sprintf (wchar_t *buf, const wchar_t *format, ...);
-# endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   char *tempnam (const char *dir = 0,
                  const char *pfx = 0);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *tempnam (const wchar_t *dir,
                     const wchar_t *pfx = 0);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int vsprintf (char *buffer, const char *format, va_list argptr);
@@ -404,13 +383,11 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   int vsnprintf (char *buffer, size_t maxlen, const char *format, va_list argptr);
 
-# if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr);
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_list argptr);
-# endif /* ACE_HAS_WCHAR */
 
 } /* namespace ACE_OS */
 
diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl
index d3f2c08c99e..0f4a460723b 100644
--- a/ace/OS_NS_stdio.inl
+++ b/ace/OS_NS_stdio.inl
@@ -589,7 +589,6 @@ ACE_OS::cuserid (char *user, size_t maxlen)
 #endif /* VXWORKS */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::cuserid (wchar_t *user, size_t maxlen)
 {
@@ -600,14 +599,14 @@ ACE_OS::cuserid (wchar_t *user, size_t maxlen)
   else
     return user;
 # else /* ACE_WIN32 */
-  char *char_user;
+  char *char_user = 0;
   wchar_t *result = 0;
 
   ACE_NEW_RETURN (char_user, char[maxlen + 1], 0);
 
   if (ACE_OS::cuserid (char_user, maxlen))
     {
-      ACE_OS::strcpy (user, ACE_Ascii_To_Wide (char_user).wchar_rep ());
+      ACE_OS::string_copy (user, char_user, maxlen + 1);
       result = user;
     }
 
@@ -616,7 +615,6 @@ ACE_OS::cuserid (wchar_t *user, size_t maxlen)
   return result;
 # endif /* ACE_WIN32 */
 }
-#endif /* ACE_HAS_WCHAR  */
 #endif /* ACE_LACKS_CUSERID */
 
 ACE_INLINE int
@@ -631,9 +629,9 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
 {
   ACE_OS_TRACE ("ACE_OS::fdopen");
 # if defined (ACE_HAS_WINCE)
-  ACE_OSCALL_RETURN (::_wfdopen (handle, ACE_TEXT_ALWAYS_WCHAR (mode)),
-                     FILE*,
-                     0);
+  ACE_OSCALL_RETURN (::_wfdopen (handle, ACE_TEXT_TO_WCHAR_IN (mode)),
+		     FILE*,
+		     0);
 # elif defined (ACE_WIN32)
   // kernel file handle -> FILE* conversion...
   // Options: _O_APPEND, _O_RDONLY and _O_TEXT are lost
@@ -678,7 +676,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode)
   ACE_NOTSUP_RETURN (0);
 # else
   ACE_OSCALL_RETURN
-    (::fdopen (handle, ACE_TEXT_ALWAYS_CHAR (mode)), FILE *, 0);
+    (::fdopen (handle, ACE_TEXT_TO_CHAR_IN (mode)), FILE *, 0);
 # endif /* ACE_HAS_WINCE */
 }
 
@@ -716,14 +714,19 @@ ACE_OS::fgets (char *buf, int size, FILE *fp)
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgets (buf, size, fp), char *, 0);
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FGETWS)
 ACE_INLINE wchar_t *
 ACE_OS::fgets (wchar_t *buf, int size, FILE *fp)
 {
+#if !defined(ACE_LACKS_FGETWS)
   ACE_OS_TRACE ("ACE_OS::fgets");
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetws (buf, size, fp), wchar_t *, 0);
+#else
+  ACE_UNUSED_ARG( buf );
+  ACE_UNUSED_ARG( size );
+  ACE_UNUSED_ARG( fp );
+  ACE_NOTSUP_RETURN (0);
+#endif
 }
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_FGETWS */
 
 #if !(defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 // Win32 PC implementation of fopen () is in OS_NS_stdio.cpp.
@@ -732,25 +735,23 @@ ACE_OS::fopen (const char *filename, const ACE_TCHAR *mode)
 {
   ACE_OS_TRACE ("ACE_OS::fopen");
   ACE_OSCALL_RETURN
-    (::fopen (filename, ACE_TEXT_ALWAYS_CHAR (mode)), FILE *, 0);
+    (::fopen (filename, ACE_TEXT_TO_CHAR_IN (mode)), FILE *, 0);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE FILE *
 ACE_OS::fopen (const wchar_t *filename, const ACE_TCHAR *mode)
 {
   ACE_OS_TRACE ("ACE_OS::fopen");
 #if defined (ACE_HAS_WINCE)
   ACE_OSCALL_RETURN
-    (::_wfopen (filename, ACE_TEXT_ALWAYS_WCHAR (mode)), FILE *, 0);
+    (::_wfopen (filename, ACE_TEXT_TO_WCHAR_IN (mode)), FILE *, 0);
 #else
   // Non-Windows doesn't use wchar_t file systems.
-  ACE_Wide_To_Ascii n_filename (filename);
   ACE_OSCALL_RETURN
-    (::fopen (n_filename.char_rep (), ACE_TEXT_ALWAYS_CHAR (mode)), FILE*, 0);
+    (::fopen (ACE_TEXT_TO_CHAR_IN (filename),
+              ACE_TEXT_TO_CHAR_IN (mode)), FILE*, 0);
 #endif /* ACE_HAS_WINCE */
 }
-#endif /* ACE_HAS_WCHAR */
 
 #endif /* ACE_WIN32 */
 
@@ -761,14 +762,18 @@ ACE_OS::fputs (const char *s, FILE *stream)
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputs (s, stream), int, -1);
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined(ACE_LACKS_FPUTWS)
 ACE_INLINE int
 ACE_OS::fputs (const wchar_t *s, FILE *stream)
 {
+#if !defined(ACE_LACKS_FPUTWS)
   ACE_OS_TRACE ("ACE_OS::fputs");
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fputws (s, stream), int, -1);
+#else
+  ACE_UNUSED_ARG( s );
+  ACE_UNUSED_ARG( stream );
+  ACE_NOTSUP_RETURN (-1);
+#endif
 }
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_FPUTWS */
 
 ACE_INLINE size_t
 ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp)
@@ -784,14 +789,14 @@ ACE_OS::freopen (const ACE_TCHAR *filename, const ACE_TCHAR *mode, FILE* stream)
 {
   ACE_OS_TRACE ("ACE_OS::freopen");
 #if defined (ACE_WIN32) && (defined(ACE_USES_WCHAR) || defined(ACE_HAS_WINCE))
-  ACE_OSCALL_RETURN (::_wfreopen (ACE_TEXT_ALWAYS_WCHAR (filename),
-                                  ACE_TEXT_ALWAYS_WCHAR (mode),
-                                  stream),
-                     FILE *, 0);
+  ACE_OSCALL_RETURN (::_wfreopen (ACE_TEXT_TO_WCHAR_IN (filename),
+				  ACE_TEXT_TO_WCHAR_IN (mode),
+				  stream),
+		     FILE *, 0);
 #else
   ACE_OSCALL_RETURN
-    (ACE_STD_NAMESPACE::freopen (ACE_TEXT_ALWAYS_CHAR (filename),
-                                 ACE_TEXT_ALWAYS_CHAR (mode),
+    (ACE_STD_NAMESPACE::freopen (ACE_TEXT_TO_CHAR_IN (filename),
+                                 ACE_TEXT_TO_CHAR_IN (mode),
                                  stream),
      FILE *, 0);
 #endif /* ACE_WIN32 && ACE_USES_WCHAR */
@@ -856,7 +861,6 @@ ACE_OS::perror (const char *s)
 #endif /* ACE_HAS_WINCE */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE void
 ACE_OS::perror (const wchar_t *s)
 {
@@ -867,11 +871,9 @@ ACE_OS::perror (const wchar_t *s)
 #elif defined (ACE_WIN32)
   ::_wperror (s);
 #else
-  ACE_Wide_To_Ascii n_s (s);
-  ::perror (n_s.char_rep ());
+  ::perror (ACE_TEXT_TO_CHAR_IN (s));
 #endif /* ACE_HAS_WINCE */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_OS::puts (const char *s)
@@ -880,7 +882,6 @@ ACE_OS::puts (const char *s)
   ACE_OSCALL_RETURN (::puts (s), int, -1);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::puts (const wchar_t *s)
 {
@@ -889,11 +890,9 @@ ACE_OS::puts (const wchar_t *s)
   ACE_OSCALL_RETURN (::_putws (s), int, -1);
 #else /* ACE_WIN32 */
   // There's no putws()...
-  ACE_Wide_To_Ascii n_s (s);
-  ACE_OSCALL_RETURN (::puts (n_s.char_rep ()), int, -1);
+  ACE_OSCALL_RETURN (::puts (ACE_TEXT_TO_CHAR_IN (s)), int, -1);
 #endif /* ACE_WIN32 */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_OS::rename (const char *old_name,
@@ -908,8 +907,8 @@ ACE_OS::rename (const char *old_name,
 # elif defined (ACE_HAS_WINCE)
   // Win CE is always wide-char.
   ACE_UNUSED_ARG (flags);
-  if (0 != MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name),
-                     ACE_TEXT_CHAR_TO_TCHAR (new_name)))
+  if (0 != MoveFile (ACE_TEXT_TO_TCHAR_IN (old_name),
+                     ACE_TEXT_TO_TCHAR_IN (new_name)))
     ACE_FAIL_RETURN (-1);
   return 0;
 # elif defined (ACE_WIN32) && defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 == 1)
@@ -928,7 +927,6 @@ ACE_OS::rename (const char *old_name,
 # endif /* ACE_LACKS_RENAME */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::rename (const wchar_t *old_name,
                 const wchar_t *new_name,
@@ -958,12 +956,10 @@ ACE_OS::rename (const wchar_t *old_name,
   ACE_UNUSED_ARG (flags);
   ACE_OSCALL_RETURN (::_wrename (old_name, new_name), int, -1);
 # else /* ACE_LACKS_RENAME */
-  ACE_Wide_To_Ascii nold_name (old_name);
-  ACE_Wide_To_Ascii nnew_name (new_name);
-  return ACE_OS::rename (nold_name.char_rep (), nnew_name.char_rep (), flags);
+  return ACE_OS::rename (ACE_TEXT_TO_CHAR_IN (old_name),
+                         ACE_TEXT_TO_CHAR_IN (new_name), flags);
 # endif /* ACE_LACKS_RENAME */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE void
 ACE_OS::rewind (FILE *fp)
@@ -973,7 +969,7 @@ ACE_OS::rewind (FILE *fp)
   ::rewind (fp);
 #else
   // This isn't perfect since it doesn't reset EOF, but it's probably
-  // the closest we can get on WINCE. 
+  // the closest we can get on WINCE.
   (void) fseek (fp, 0L, SEEK_SET);
 #endif /* ACE_HAS_WINCE */
 }
@@ -997,7 +993,6 @@ ACE_OS::tempnam (const char *dir, const char *pfx)
 #endif /* ACE_LACKS_TEMPNAM */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
 {
@@ -1011,28 +1006,21 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx)
   ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *, 0);
 #  else
   ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0);
-#  endif /* __BORLANDC__ */
-#else /* ACE_LACKS_TEMPNAM */
+#  endif // __BORLANDC__
+#else // ACE_LACKS_TEMPNAM
   // No native wide-char support; convert to narrow and call the char* variant.
-  char *ndir = ACE_Wide_To_Ascii (dir).char_rep ();
-  char *npfx = ACE_Wide_To_Ascii (pfx).char_rep ();
-  char *name = ACE_OS::tempnam (ndir, npfx);
+  char *name = ACE_OS::tempnam (ACE_TEXT_TO_CHAR_IN (dir),
+                                ACE_TEXT_TO_CHAR_IN (pfx));
   // ACE_OS::tempnam returns a pointer to a malloc()-allocated space.
   // Convert that string to wide-char and free() the original.
-  wchar_t *wname = 0;
   if (name != 0)
     {
-      size_t namelen = ACE_OS::strlen (name) + 1;
-      wname = reinterpret_cast<wchar_t *>
-        (ACE_OS::malloc (namelen * sizeof (wchar_t)));
-      if (wname != 0)
-        ACE_OS::strcpy (wname, ACE_Ascii_To_Wide (name).wchar_rep ());
-      ACE_OS::free (name);
+      ::free( name );
+      return ACE_TEXT_TO_MALLOC_WCHAR_OUT( name );
     }
-  return wname;
+  return 0;
 #endif /* ACE_LACKS_TEMPNAM */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_OS::vsprintf (char *buffer, const char *format, va_list argptr)
@@ -1074,7 +1062,6 @@ ACE_OS::vsnprintf (char *buffer, size_t maxlen, const char *format, va_list ap)
 #endif /* ACE_HAS_SNPRINTF */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
 {
@@ -1103,9 +1090,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
 
 # endif /* XPG5 || ACE_HAS_DINKUM_STL */
 }
-#endif /* ACE_HAS_WCHAR */
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_list ap)
 {
@@ -1141,7 +1126,6 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis
 
 # endif /* platforms with a variant of vswprintf */
 }
-#endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 #if defined (ACE_WIN32)
diff --git a/ace/OS_NS_stdlib.cpp b/ace/OS_NS_stdlib.cpp
index 9a0370921f5..0da4241875c 100644
--- a/ace/OS_NS_stdlib.cpp
+++ b/ace/OS_NS_stdlib.cpp
@@ -159,7 +159,7 @@ ACE_OS::itoa_emulation (int value, char *string, int radix)
 }
 #endif /* !ACE_HAS_ITOA */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_ITOW)
+#if defined (ACE_LACKS_ITOW)
 wchar_t *
 ACE_OS::itow_emulation (int value, wchar_t *string, int radix)
 {
@@ -209,7 +209,7 @@ ACE_OS::itow_emulation (int value, wchar_t *string, int radix)
 
   return string;
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_ITOW */
+#endif /* ACE_LACKS_ITOW */
 
 void *
 ACE_OS::malloc (size_t nbytes)
diff --git a/ace/OS_NS_stdlib.h b/ace/OS_NS_stdlib.h
index 8e0747b7ffd..1209dce8cf4 100644
--- a/ace/OS_NS_stdlib.h
+++ b/ace/OS_NS_stdlib.h
@@ -74,10 +74,8 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   int atoi (const char *s);
 
-# if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int atoi (const wchar_t *s);
-# endif /* ACE_HAS_WCHAR */
 
   // atop not in spec
 # if defined (atop)
@@ -87,10 +85,8 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   void *atop (const char *s);
 
-# if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   void *atop (const wchar_t *s);
-# endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   void *bsearch (const void *key,
@@ -111,10 +107,8 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   char *getenv (const char *symbol);
 
-#   if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *getenv (const wchar_t *symbol);
-#   endif /* ACE_HAS_WCHAR && ACE_WIN32 */
 
   // not in spec
   extern ACE_Export
@@ -125,11 +119,9 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   char *itoa (int value, char *string, int radix);
 
-#if defined (ACE_HAS_WCHAR)
   /// Converts an integer to a string.
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *itoa (int value, wchar_t *string, int radix);
-#endif /* ACE_HAS_WCHAR */
 
 #if !defined (ACE_HAS_ITOA)
   /// Emulated itoa - Converts an integer to a string.
@@ -137,11 +129,11 @@ namespace ACE_OS {
   char *itoa_emulation (int value, char *string, int radix);
 #endif /* !ACE_HAS_ITOA */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_ITOW)
+#if defined (ACE_LACKS_ITOW)
   /// Emulated itow - Converts an integer to a string.
   extern ACE_Export
   wchar_t *itow_emulation (int value, wchar_t *string, int radix);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_ITOW */
+#endif /* ACE_LACKS_ITOW */
 
   extern ACE_Export
   void *malloc (size_t);
@@ -149,40 +141,31 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_HANDLE mkstemp (char *s);
 
-#  if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_HANDLE mkstemp (wchar_t *s);
-#  endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_LACKS_MKSTEMP)
   extern ACE_Export
   ACE_HANDLE mkstemp_emulation (ACE_TCHAR * s);
 #endif /* ACE_LACKS_MKSTEMP */
 
-#if !defined (ACE_LACKS_MKTEMP)
   ACE_NAMESPACE_INLINE_FUNCTION
   char *mktemp (char *s);
 
-#  if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *mktemp (wchar_t *s);
-#  endif /* ACE_HAS_WCHAR */
-#else
-  extern ACE_Export
-  ACE_TCHAR *mktemp (ACE_TCHAR *s);
-#endif /* !ACE_LACKS_MSTEMP */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int putenv (const char *string);
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32)
+#if defined (ACE_WIN32)
   // Windows is the only platform that supports a wchar_t environment.
   // Since other platforms make @a string part of the environment, it's
   // a certain memory leak to copy and transform wchar_t to char for
   // emulating this, so it's not attempted.
   ACE_NAMESPACE_INLINE_FUNCTION
   int putenv (const wchar_t *string);
-#endif /* ACE_HAS_WCHAR && ACE_WIN32 */
+#endif /* ACE_WIN32 */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   void qsort (void *base,
@@ -207,10 +190,8 @@ namespace ACE_OS {
 #  endif /* !ACE_LACKS_REALPATH */
   char *realpath (const char *file_name, char *resolved_name);
 
-#  if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *realpath (const wchar_t *file_name, wchar_t *resolved_name);
-#  endif /* ACE_HAS_WCHAR */
 #endif /* ACE_HAS_WINCE */
 
   // exit_hook and set_exit_hook not in spec
@@ -234,21 +215,17 @@ namespace ACE_OS {
   double strtod (const char *s, char **endptr);
 #endif /* !ACE_LACKS_STRTOD */
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOD)
   /// Converts a string to a double value (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   double strtod (const wchar_t *s, wchar_t **endptr);
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOD */
 
   /// Converts a string to a long value (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   long strtol (const char *s, char **ptr, int base);
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOL)
   /// Converts a string to a long value (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   long strtol (const wchar_t *s, wchar_t **ptr, int base);
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOL */
 
 #if defined (ACE_LACKS_STRTOL)
   extern ACE_Export
@@ -259,11 +236,9 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   unsigned long strtoul (const char *s, char **ptr, int base);
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOUL)
   /// Converts a string to an unsigned long value (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   unsigned long strtoul (const wchar_t *s, wchar_t **ptr, int base);
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */
 
 #if defined (ACE_LACKS_STRTOUL)
   extern ACE_Export
@@ -279,6 +254,8 @@ namespace ACE_OS {
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+#include "ace/OS_NS_stdlib_base.inl"
+
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl
index 0762d7443f5..6f6ca83c71f 100644
--- a/ace/OS_NS_stdlib.inl
+++ b/ace/OS_NS_stdlib.inl
@@ -8,6 +8,8 @@
 #include "ace/Global_Macros.h"
 #include "ace/os_include/os_errno.h"
 #include "ace/os_include/os_search.h"
+#include "ace/os_include/os_limits.h"
+//#include "ace/TSS_T.h"
 
 #if defined(ACE_WCHAR_IN_STD_NAMESPACE)
 # define ACE_WCHAR_STD_NAMESPACE std
@@ -65,17 +67,15 @@ ACE_OS::atoi (const char *s)
   ACE_OSCALL_RETURN (::atoi (s), int, -1);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::atoi (const wchar_t *s)
 {
 #if defined (ACE_WIN32)
   ACE_OSCALL_RETURN (::_wtoi (s), int, -1);
 #else /* ACE_WIN32 */
-  return ACE_OS::atoi (ACE_Wide_To_Ascii(s).char_rep());
+  return ACE_OS::atoi (ACE_TEXT_TO_CHAR_IN (s));
 #endif /* ACE_WIN32 */
 }
-#endif /* ACE_HAS_WCHAR */
 
 #if defined (atop)
 #  undef atop
@@ -98,7 +98,6 @@ ACE_OS::atop (const char *s)
   return p;
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE void *
 ACE_OS::atop (const wchar_t *s)
 {
@@ -110,7 +109,6 @@ ACE_OS::atop (const wchar_t *s)
   void *p = reinterpret_cast<void *> (ip);
   return p;
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE void *
 ACE_OS::bsearch (const void *key,
@@ -143,18 +141,31 @@ ACE_OS::getenv (const char *symbol)
 #endif /* ACE_LACKS_ENV */
 }
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32)
 ACE_INLINE wchar_t *
 ACE_OS::getenv (const wchar_t *symbol)
 {
 #if defined (ACE_LACKS_ENV)
   ACE_UNUSED_ARG (symbol);
   ACE_NOTSUP_RETURN (0);
-#else
+#elif defined (ACE_WIN32)
   ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *, 0);
+#else
+// Including ACE_TSS_T.h causes error!
+/*
+  wchar_t* init = 0;
+  static ACE_TSS< wchar_t* > wvalue (&init);
+  ACE::String_Conversion::Allocator_malloc<wchar_t>().free(*wvalue);
+  *wvalue.ts_object() = ACE_TEXT_TO_MALLOC_WCHAR_OUT (
+                ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (symbol)));
+  return *wvalue;
+*/
+  static wchar_t* wvalue = 0;
+  ACE::String_Conversion::Allocator_malloc<wchar_t>().free(wvalue);
+  wvalue = ACE_TEXT_TO_MALLOC_WCHAR_OUT (
+                ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (symbol)));
+  return wvalue;
 #endif /* ACE_LACKS_ENV */
 }
-#endif /* ACE_HAS_WCHAR && ACE_WIN32 */
 
 ACE_INLINE char *
 ACE_OS::itoa (int value, char *string, int radix)
@@ -168,7 +179,6 @@ ACE_OS::itoa (int value, char *string, int radix)
 #endif /* !ACE_HAS_ITOA */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::itoa (int value, wchar_t *string, int radix)
 {
@@ -178,7 +188,6 @@ ACE_OS::itoa (int value, wchar_t *string, int radix)
   return ::_itow (value, string, radix);
 #endif /* ACE_LACKS_ITOW */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE ACE_HANDLE
 ACE_OS::mkstemp (char *s)
@@ -186,54 +195,56 @@ ACE_OS::mkstemp (char *s)
 #if !defined (ACE_LACKS_MKSTEMP)
   return ::mkstemp (s);
 #else
-  return ACE_OS::mkstemp_emulation (ACE_TEXT_CHAR_TO_TCHAR (s));
+  return ACE_OS::mkstemp_emulation (ACE_TEXT_TO_TCHAR_INOUT (s) );
 #endif  /* !ACE_LACKS_MKSTEMP */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE ACE_HANDLE
 ACE_OS::mkstemp (wchar_t *s)
 {
+  s[0] = 0;
 #  if !defined (ACE_LACKS_MKSTEMP)
-  return ::mkstemp (ACE_TEXT_WCHAR_TO_TCHAR (ACE_TEXT_ALWAYS_CHAR (s)));
+  ACE::String_Conversion::Convert_InOut<char, wchar_t> convert( s, PATH_MAX );
+  return ::mkstemp (convert.c_str());
 #  else
-  return ACE_OS::mkstemp_emulation (ACE_TEXT_WCHAR_TO_TCHAR (s));
+  ACE::String_Conversion::Convert_InOut<ACE_TCHAR, ACE_ANTI_TCHAR> convert( s, PATH_MAX );
+  return ACE_OS::mkstemp_emulation (convert.c_str());
 #  endif  /* !ACE_LACKS_MKSTEMP */
 }
-#endif /* ACE_HAS_WCHAR */
 
-#if !defined (ACE_LACKS_MKTEMP)
+
 ACE_INLINE char *
 ACE_OS::mktemp (char *s)
 {
 # if defined (ACE_WIN32)
   return ::_mktemp (s);
-# else /* ACE_WIN32 */
+# elif !defined (ACE_LACKS_MKTEMP)
   return ::mktemp (s);
-# endif /* ACE_WIN32 */
+# else
+  ACE_UNUSED_ARG( s );
+  ACE_NOTSUP_RETURN (0);
+# endif
 }
 
-#  if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::mktemp (wchar_t *s)
 {
-#    if defined (ACE_WIN32)
+#if defined (ACE_LACKS_MKTEMP)
+  ACE_UNUSED_ARG( s );
+  ACE_NOTSUP_RETURN (0);
+#elif defined (ACE_WIN32)
   return ::_wmktemp (s);
-#    else
+#else
   // For narrow-char filesystems, we must convert the wide-char input to
   // a narrow-char string for mktemp(), then convert the name back to
   // wide-char for the caller.
-  ACE_Wide_To_Ascii narrow_s (s);
-  if (::mktemp (narrow_s.char_rep ()) == 0)
+  s[0] = 0;
+  ACE::String_Conversion::Convert_InOut<char, wchar_t> convert( s, PATH_MAX );
+  if (::mktemp (convert.c_str()) == 0)
     return 0;
-  ACE_Ascii_To_Wide wide_s (narrow_s.char_rep ());
-  ACE_OS::strcpy (s, wide_s.wchar_rep ());
   return s;
-#    endif
+#endif
 }
-#  endif /* ACE_HAS_WCHAR */
-
-#endif /* !ACE_LACKS_MKTEMP */
 
 #if defined(INTEGRITY)
 extern "C" {
@@ -257,7 +268,7 @@ ACE_OS::putenv (const char *string)
 #endif /* ACE_HAS_WINCE */
 }
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32)
+#if defined (ACE_WIN32)
 ACE_INLINE int
 ACE_OS::putenv (const wchar_t *string)
 {
@@ -270,7 +281,7 @@ ACE_OS::putenv (const wchar_t *string)
   ACE_OSCALL_RETURN (::_wputenv (string), int, -1);
 #endif /* ACE_HAS_WINCE */
 }
-#endif /* ACE_HAS_WCHAR && ACE_WIN32 */
+#endif /* ACE_WIN32 */
 
 ACE_INLINE void
 ACE_OS::qsort (void *base,
@@ -357,7 +368,6 @@ ACE_OS::realpath (const char *file_name,
 }
 #  endif /* !ACE_LACKS_REALPATH */
 
-#  if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::realpath (const wchar_t *file_name,
                   wchar_t *resolved_name)
@@ -365,18 +375,15 @@ ACE_OS::realpath (const wchar_t *file_name,
 #    if defined (ACE_WIN32)
   return ::_wfullpath (resolved_name, file_name, PATH_MAX);
 #    else /* ACE_WIN32 */
-  ACE_Wide_To_Ascii n_file_name (file_name);
   char n_resolved[PATH_MAX];
-  if (0 != ACE_OS::realpath (n_file_name.char_rep (), n_resolved))
+  if (0 != ACE_OS::realpath ( ACE_TEXT_TO_CHAR_IN (file_name), n_resolved))
     {
-      ACE_Ascii_To_Wide w_resolved (n_resolved);
-      ACE_OS::strcpy (resolved_name, w_resolved.wchar_rep ());
+      ACE_OS::string_copy (resolved_name, n_resolved, PATH_MAX);
       return resolved_name;
     }
   return 0;
 #    endif /* ! ACE_WIN32 */
 }
-#  endif /* ACE_HAS_WCHAR */
 #endif /* ACE_HAS_WINCE */
 
 ACE_INLINE ACE_EXIT_HOOK
@@ -419,8 +426,8 @@ ACE_OS::strenvdup (const ACE_TCHAR *str)
 #  else
       // Use char * for environment on non-Windows.
       char *temp = 0;
-      if ((temp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&str[1]))) != 0)
-        return ACE_OS::strdup (ACE_TEXT_CHAR_TO_TCHAR (temp));
+      if ((temp = ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN(&str[1]))) != 0)
+        return ACE_OS::strdup (ACE_TEXT_TO_TCHAR_IN (temp));
 #  endif /* ACE_WIN32 */
       return ACE_OS::strdup (str);
     }
@@ -437,13 +444,16 @@ ACE_OS::strtod (const char *s, char **endptr)
 }
 #endif /* !ACE_LACKS_STRTOD */
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOD)
 ACE_INLINE double
 ACE_OS::strtod (const wchar_t *s, wchar_t **endptr)
 {
-  return ACE_WCHAR_STD_NAMESPACE::wcstod (s, endptr);
+  #if !defined (ACE_LACKS_WCSTOD)
+    return ACE_WCHAR_STD_NAMESPACE::wcstod (s, endptr);
+  #else
+    ACE_UNUSED_ARG( s );
+    ACE_NOTSUP_RETURN (0);
+  #endif
 }
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOD */
 
 ACE_INLINE long
 ACE_OS::strtol (const char *s, char **ptr, int base)
@@ -455,13 +465,18 @@ ACE_OS::strtol (const char *s, char **ptr, int base)
 #endif /* ACE_LACKS_STRTOL */
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOL)
 ACE_INLINE long
 ACE_OS::strtol (const wchar_t *s, wchar_t **ptr, int base)
 {
+#if !defined (ACE_LACKS_WCSTOL)
   return ACE_WCHAR_STD_NAMESPACE::wcstol (s, ptr, base);
+#else
+    ACE_UNUSED_ARG( s );
+    ACE_UNUSED_ARG( ptr );
+    ACE_UNUSED_ARG( base );
+    ACE_NOTSUP_RETURN (0);
+#endif
 }
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOL */
 
 ACE_INLINE unsigned long
 ACE_OS::strtoul (const char *s, char **ptr, int base)
@@ -473,13 +488,18 @@ ACE_OS::strtoul (const char *s, char **ptr, int base)
 #endif /* ACE_LACKS_STRTOUL */
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOUL)
 ACE_INLINE unsigned long
 ACE_OS::strtoul (const wchar_t *s, wchar_t **ptr, int base)
 {
+#if !defined (ACE_LACKS_WCSTOUL)
   return ACE_WCHAR_STD_NAMESPACE::wcstoul (s, ptr, base);
+#else
+  ACE_UNUSED_ARG( s );
+  ACE_UNUSED_ARG( ptr );
+  ACE_UNUSED_ARG( base );
+  ACE_NOTSUP_RETURN (0);
+#endif
 }
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */
 
 ACE_INLINE int
 ACE_OS::system (const ACE_TCHAR *s)
@@ -493,7 +513,7 @@ ACE_OS::system (const ACE_TCHAR *s)
 #elif defined(ACE_TANDEM_T1248_PTHREADS)
   ACE_OSCALL_RETURN (::spt_system (s), int, -1);
 #else
-  ACE_OSCALL_RETURN (::system (ACE_TEXT_ALWAYS_CHAR (s)), int, -1);
+  ACE_OSCALL_RETURN (::system (ACE_TEXT_TO_CHAR_IN (s)), int, -1);
 #endif /* ACE_LACKS_SYSTEM */
 }
 
diff --git a/ace/OS_NS_stdlib_base.cpp b/ace/OS_NS_stdlib_base.cpp
new file mode 100644
index 00000000000..a0c8a6de8a0
--- /dev/null
+++ b/ace/OS_NS_stdlib_base.cpp
@@ -0,0 +1,12 @@
+/* -*- C++ -*- */
+// $Id$
+
+// We must include this before "ace/OS_NS_stdlib_base.h", so that
+// "ace/OS_NS_stdlib_base.h" gets the ACE_LACKS* #defines
+#include "ace/config-all.h"
+
+#include "ace/OS_NS_stdlib_base.h"
+
+namespace ACE_OS
+{
+}
diff --git a/ace/OS_NS_stdlib_base.h b/ace/OS_NS_stdlib_base.h
new file mode 100644
index 00000000000..85cdefe0b17
--- /dev/null
+++ b/ace/OS_NS_stdlib_base.h
@@ -0,0 +1,40 @@
+/* -*- C++ -*- */
+// $Id$
+#ifndef OS_NS_STDLIB_BASE_H
+#define OS_NS_STDLIB_BASE_H
+
+#include <stdlib.h>
+// Standard library includes for wide functions declared in ace_wchar.h
+// Do not include any ACE header files because this file is included from
+// ace_wchar.h which is included at the config.h level.
+
+namespace ACE_OS
+{
+
+/// Finds the contents of the strings (emulated version).
+template <typename DCHAR, typename SCHAR> inline
+size_t string_copy (DCHAR* s, const SCHAR* t, size_t len);
+
+/// Finds the contents of the strings (wide to char version).
+#if !defined(ACE_LACKS_WCSTOMBS)
+template <> inline
+size_t string_copy (char* s, const wchar_t* t, size_t len);
+#endif
+
+/// Finds the contents of the strings (char to wide version).
+#if !defined(ACE_LACKS_MBSTOWCS)
+template <> inline
+size_t string_copy (wchar_t* s, const char* t, size_t len);
+#endif
+
+inline size_t mbstowcs (wchar_t* dest, const char* src, size_t size)
+  { return ACE_OS::string_copy( dest, src, size ); }
+
+inline size_t wcstombs (char* dest, const wchar_t* src, size_t size)
+  { return ACE_OS::string_copy( dest, src, size ); }
+
+}
+
+#include "ace/OS_NS_stdlib_base.inl"
+
+#endif
diff --git a/ace/OS_NS_stdlib_base.inl b/ace/OS_NS_stdlib_base.inl
new file mode 100644
index 00000000000..5ee64c03421
--- /dev/null
+++ b/ace/OS_NS_stdlib_base.inl
@@ -0,0 +1,90 @@
+/* -*- C++ -*- */
+// $Id$
+
+// Standard library includes for wide functions declared in ace_wchar.h
+
+#ifndef OS_NS_STDLIB_BASE_INL
+#define OS_NS_STDLIB_BASE_INL
+
+#include "OS_NS_string_base.h"
+
+namespace ACE_OS
+{
+
+template <typename DCHAR, typename SCHAR> inline
+size_t string_copy (DCHAR* dest, const SCHAR* src, size_t len)
+{
+  // We must have a source and a valid length with a dest
+  if ( src == 0 || ( dest != 0 && static_cast<signed int>(len) < 0 ) )
+  {
+    return -1;
+  }
+  // If we perform a copy
+  if ( dest != 0 )
+  {
+    if (len != 0)
+    {
+      DCHAR* d = dest;
+      const SCHAR* s = src;
+      do
+      {
+        if ((*d++ = static_cast<DCHAR>(*s++)) == 0)
+        {
+          // NUL pad the remaining n-1 bytes
+          while (--len != 0)
+            *d++ = 0;
+          break;
+        }
+      } while (--len != 0);
+      return static_cast<size_t>( d - dest );
+    }
+    return 0;
+  }
+  // Otherwise just calc length
+  return ACE_OS::strlen( src );
+}
+
+#if !defined(ACE_LACKS_WCSTOMBS)
+template <> inline
+size_t string_copy (char* s, const wchar_t* t, size_t len)
+{
+#if defined(ACE_WIN32)
+   // When VC6 support is dropped use wcstombs
+  if ( t == 0 )
+    return -1;
+  int size = ::WideCharToMultiByte(
+              CP_OEMCP, 0,
+              t, -1,
+              s, (s ? len : 0),
+              0, 0 );
+  // wcstombs returns len NOT size when dest == 0
+  return ( s == 0 ? size - 1 : size );
+#else
+  return ::wcstombs( s, t, len );
+#endif
+}
+#endif /* !ACE_LACKS_WCSTOMBS */
+
+#if !defined(ACE_LACKS_MBSTOWCS)
+template <> inline
+size_t string_copy (wchar_t* s, const char* t, size_t len)
+{
+#if defined(ACE_WIN32)
+   // When VC6 support is dropped use mbstowcs
+  if ( t == 0 )
+    return -1;
+  int size = ::MultiByteToWideChar(
+                CP_OEMCP, 0,
+                t, -1,
+                s, (s ? len : 0) );
+  // mbstowcs returns len NOT size when dest == 0
+  return ( s == 0 ? size - 1 : size );
+#else
+  return ::mbstowcs( s, t, len );
+#endif
+}
+#endif
+
+}
+
+#endif
diff --git a/ace/OS_NS_string.cpp b/ace/OS_NS_string.cpp
index a5c1a822774..e3ef64988b3 100644
--- a/ace/OS_NS_string.cpp
+++ b/ace/OS_NS_string.cpp
@@ -12,9 +12,7 @@ ACE_RCSID (ace,
 # include "ace/OS_NS_string.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
-#if defined (ACE_HAS_WCHAR)
 #  include "ace/OS_NS_stdlib.h"
-#endif /* ACE_HAS_WCHAR */
 
 #if !defined (ACE_LACKS_STRERROR)
 #  include "ace/OS_NS_stdio.h"
@@ -39,25 +37,24 @@ ACE_OS::memchr_emulation (const void *s, int c, size_t len)
 }
 #endif /*ACE_HAS_MEMCHR*/
 
-#if (defined (ACE_LACKS_STRDUP) && !defined (ACE_STRDUP_EQUIVALENT)) \
-  || defined (ACE_HAS_STRDUP_EMULATION)
 char *
-ACE_OS::strdup_emulation (const char *s)
+ACE_OS::strdup (const char *s)
 {
+#if defined (ACE_HAS_STRDUP_EMULATION)
   char *t = (char *) ACE_OS::malloc (ACE_OS::strlen (s) + 1);
   if (t == 0)
     return 0;
 
   return ACE_OS::strcpy (t, s);
+#else
+  return ACE_STD_NAMESPACE::strdup (s);
+#endif /* ACE_HAS_STRDUP_EMULATION */
 }
-#endif /* (ACE_LACKS_STRDUP && !ACE_STRDUP_EQUIVALENT) || ... */
 
-#if defined (ACE_HAS_WCHAR)
-#if (defined (ACE_LACKS_WCSDUP) && !defined (ACE_WCSDUP_EQUIVALENT)) \
-  || defined (ACE_HAS_WCSDUP_EMULATION)
 wchar_t *
-ACE_OS::strdup_emulation (const wchar_t *s)
+ACE_OS::strdup (const wchar_t *s)
 {
+#   if defined (ACE_LACKS_WCSDUP)
   wchar_t *buffer =
     (wchar_t *) ACE_OS::malloc ((ACE_OS::strlen (s) + 1)
                                 * sizeof (wchar_t));
@@ -65,9 +62,16 @@ ACE_OS::strdup_emulation (const wchar_t *s)
     return 0;
 
   return ACE_OS::strcpy (buffer, s);
+#   elif defined (ACE_WCSDUP_EQUIVALENT)
+  return ACE_WCSDUP_EQUIVALENT (s);
+#   else /* ACE_LACKS_WCSDUP */
+#     if defined (__MINGW32__)
+  return ::wcsdup (const_cast<wchar_t*> (s));
+#     else /* __MINGW32__ */
+  return ::wcsdup (s);
+#     endif /* __MINGW32__ */
+#   endif /* ACE_LACKS_WCSDUP */
 }
-#endif /* (ACE_LACKS_WCSDUP && !ACE_WCSDUP_EQUIVALENT) || ... */
-#endif /* ACE_HAS_WCHAR */
 
 char *
 ACE_OS::strecpy (char *s, const char *t)
@@ -81,7 +85,6 @@ ACE_OS::strecpy (char *s, const char *t)
   return dscan;
 }
 
-#if defined (ACE_HAS_WCHAR)
 wchar_t *
 ACE_OS::strecpy (wchar_t *s, const wchar_t *t)
 {
@@ -93,7 +96,6 @@ ACE_OS::strecpy (wchar_t *s, const wchar_t *t)
 
   return dscan;
 }
-#endif /* ACE_HAS_WCHAR */
 
 char *
 ACE_OS::strerror (int errnum)
@@ -103,9 +105,7 @@ ACE_OS::strerror (int errnum)
   if (ACE::is_sock_error (errnum))
     {
       const ACE_TCHAR *errortext = ACE::sock_error (errnum);
-      ACE_OS::strncpy (ret_errortext,
-                       ACE_TEXT_ALWAYS_CHAR (errortext),
-                       sizeof (ret_errortext));
+      ACE_OS::string_copy (ret_errortext, errortext, sizeof (ret_errortext));
       return ret_errortext;
     }
 #if defined (ACE_LACKS_STRERROR)
@@ -151,11 +151,11 @@ ACE_OS::strnchr (const char *s, int c, size_t len)
   return 0;
 }
 
-const ACE_WCHAR_T *
-ACE_OS::strnchr (const ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len)
+const wchar_t *
+ACE_OS::strnchr (const wchar_t *s, wint_t c, size_t len)
 {
   for (size_t i = 0; i < len; ++i)
-    if (s[i] == c)
+    if (s[i] == static_cast<wchar_t> (c))
       return s + i;
 
   return 0;
@@ -184,8 +184,8 @@ ACE_OS::strnstr (const char *s1, const char *s2, size_t len2)
   return 0;
 }
 
-const ACE_WCHAR_T *
-ACE_OS::strnstr (const ACE_WCHAR_T *s1, const ACE_WCHAR_T *s2, size_t len2)
+const wchar_t *
+ACE_OS::strnstr (const wchar_t *s1, const wchar_t *s2, size_t len2)
 {
   // Substring length
   const size_t len1 = ACE_OS::strlen (s1);
@@ -199,7 +199,7 @@ ACE_OS::strnstr (const ACE_WCHAR_T *s1, const ACE_WCHAR_T *s2, size_t len2)
 
   for (size_t i = 0; i <= len; i++)
     {
-      if (ACE_OS::memcmp (s1 + i, s2, len2 * sizeof (ACE_WCHAR_T)) == 0)
+      if (ACE_OS::memcmp (s1 + i, s2, len2 * sizeof (wchar_t)) == 0)
         // Found a match!  Return the index.
         return s1 + i;
     }
@@ -311,11 +311,11 @@ ACE_OS::strsncpy (char *dst, const char *src, size_t maxlen)
   return dst;
 }
 
-ACE_WCHAR_T *
-ACE_OS::strsncpy (ACE_WCHAR_T *dst, const ACE_WCHAR_T *src, size_t maxlen)
+wchar_t *
+ACE_OS::strsncpy (wchar_t *dst, const wchar_t *src, size_t maxlen)
 {
-  register ACE_WCHAR_T *rdst = dst;
-  register const ACE_WCHAR_T *rsrc = src;
+  register wchar_t *rdst = dst;
+  register const wchar_t *rsrc = src;
   register size_t rmaxlen = maxlen;
 
   if (rmaxlen > 0)
@@ -377,11 +377,11 @@ ACE_OS::strtok_r_emulation (char *s, const char *tokens, char **lasts)
 }
 #endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
 
-# if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSTOK)
+# if defined (ACE_LACKS_WCSTOK)
 wchar_t*
-ACE_OS::strtok_r_emulation (ACE_WCHAR_T *s,
-                            const ACE_WCHAR_T *tokens,
-                            ACE_WCHAR_T **lasts)
+ACE_OS::strtok_r_emulation (wchar_t *s,
+                            const wchar_t *tokens,
+                            wchar_t **lasts)
 {
   if (s == 0)
     s = *lasts;
@@ -400,6 +400,7 @@ ACE_OS::strtok_r_emulation (ACE_WCHAR_T *s,
     *lasts = s + l_sub;
   return s ;
 }
-# endif  /* ACE_HAS_WCHAR && ACE_LACKS_WCSTOK */
+# endif  /* ACE_LACKS_WCSTOK */
+
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h
index 5e4da3db673..8751b39b89a 100644
--- a/ace/OS_NS_string.h
+++ b/ace/OS_NS_string.h
@@ -24,9 +24,6 @@
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Basic_Types.h" // to get ACE_WCHAR_T,
-                            // should be in os_stddef.h or not used like this.
 #include "ace/ACE_export.h"
 
 #if defined (ACE_EXPORT_MACRO)
@@ -91,97 +88,74 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strcat (char *s, const char *t);
 
-#if defined (ACE_HAS_WCHAR)
   /// Appends a string to another string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *strcat (wchar_t *s, const wchar_t *t);
-#endif /* ACE_HAS_WCHAR */
 
   /// Finds the first occurance of a character in a string (const char
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const char *strchr (const char *s, int c);
 
-#if defined (ACE_HAS_WCHAR)
   /// Finds the first occurance of a character in a string (const wchar_t
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
+
   const wchar_t *strchr (const wchar_t *s, wchar_t c);
-#endif /* ACE_HAS_WCHAR */
 
   /// Finds the first occurance of a character in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strchr (char *s, int c);
 
-#if defined (ACE_HAS_WCHAR)
   /// Finds the first occurance of a character in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *strchr (wchar_t *s, wchar_t c);
-#endif /* ACE_HAS_WCHAR */
-
-  /// Compares two strings (char version).
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int strcmp (const char *s, const char *t);
 
-  /// Compares two strings (wchar_t version).
-  ACE_NAMESPACE_INLINE_FUNCTION
-  int strcmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t);
+  wchar_t *strchr (wchar_t *s, wchar_t c);
 
   /// Copies a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strcpy (char *s, const char *t);
 
-#if defined (ACE_HAS_WCHAR)
   /// Copies a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *strcpy (wchar_t *s, const wchar_t *t);
-#endif /* ACE_HAS_WCHAR */
 
   /// Searches for the first substring without any of the specified
   /// characters and returns the size of the substring (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t strcspn (const char *s, const char *reject);
 
-#if defined (ACE_HAS_WCHAR)
   /// Searches for the first substring without any of the specified
   /// characters and returns the size of the substring (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t strcspn (const wchar_t *s, const wchar_t *reject);
-#endif /* ACE_HAS_WCHAR */
 
   /// Returns a malloced duplicated string (char version).
-  ACE_NAMESPACE_INLINE_FUNCTION
-  char *strdup (const char *s);
-
-#if (defined (ACE_LACKS_STRDUP) && !defined(ACE_STRDUP_EQUIVALENT)) \
-  || defined (ACE_HAS_STRDUP_EMULATION)
+  //ACE_NAMESPACE_INLINE_FUNCTION
   extern ACE_Export
-  char *strdup_emulation (const char *s);
-#endif
+  char *strdup (const char *s);
+  /*
+    #if (defined (ACE_LACKS_STRDUP) && !defined(ACE_STRDUP_EQUIVALENT)) \
+    || defined (ACE_HAS_STRDUP_EMULATION)
+    extern ACE_Export
+    char *strdup_emulation (const char *s);
+    #endif
+  */
 
-#if defined (ACE_HAS_WCHAR)
   /// Returns a malloced duplicated string (wchar_t version).
-  ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *strdup (const wchar_t *s);
-
-#if (defined (ACE_LACKS_WCSDUP) && !defined(ACE_WCSDUP_EQUIVALENT)) \
-  || defined (ACE_HAS_WCSDUP_EMULATION)
+  //ACE_NAMESPACE_INLINE_FUNCTION
   extern ACE_Export
-  wchar_t *strdup_emulation (const wchar_t *s);
-#endif
-#endif /* ACE_HAS_WCHAR */
+  wchar_t *strdup (const wchar_t *s);
 
   /// Copies a string, but returns a pointer to the end of the
   /// copied region (char version).
   extern ACE_Export
   char *strecpy (char *des, const char *src);
 
-#if defined (ACE_HAS_WCHAR)
   /// Copies a string, but returns a pointer to the end of the
   /// copied region (wchar_t version).
   extern ACE_Export
   wchar_t *strecpy (wchar_t *s, const wchar_t *t);
-#endif /* ACE_HAS_WCHAR */
 
   /*
   ** Returns a system error message. If the supplied errnum is out of range,
@@ -197,39 +171,33 @@ namespace ACE_OS {
   char *strerror_emulation (int errnum);
 #endif /* ACE_LACKS_STRERROR */
 
-  /// Finds the length of a string (char version).
-  ACE_NAMESPACE_INLINE_FUNCTION
-  size_t strlen (const char *s);
-
-  /// Finds the length of a string (ACE_WCHAR_T version).
-  ACE_NAMESPACE_INLINE_FUNCTION
-  size_t strlen (const ACE_WCHAR_T *s);
-
   /// Appends part of a string to another string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strncat (char *s, const char *t, size_t len);
 
   /// Appends part of a string to another string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_WCHAR_T *strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len);
+  wchar_t *strncat (wchar_t *s, const wchar_t *t, size_t len);
 
   /// Finds the first occurance of a character in an array (const char
   /// version).
   extern ACE_Export
   const char *strnchr (const char *s, int c, size_t len);
 
-  /// Finds the first occurance of a character in an array (const ACE_WCHAR_T
+  /// Finds the first occurance of a character in an array (const wchar_t
   /// version).
   extern ACE_Export
-  const ACE_WCHAR_T *strnchr (const ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len);
+
+  const wchar_t *strnchr (const wchar_t *s, wint_t c, size_t len);
 
   /// Finds the first occurance of a character in an array (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strnchr (char *s, int c, size_t len);
 
-  /// Finds the first occurance of a character in an array (ACE_WCHAR_T version).
+  /// Finds the first occurance of a character in an array (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_WCHAR_T *strnchr (ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len);
+
+  wchar_t *strnchr (wchar_t *s, wint_t c, size_t len);
 
   /// Compares two arrays (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -237,15 +205,7 @@ namespace ACE_OS {
 
   /// Compares two arrays (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  int strncmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len);
-
-  /// Copies an array (char version)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  char *strncpy (char *s, const char *t, size_t len);
-
-  /// Copies an array (ACE_WCHAR_T version)
-  ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_WCHAR_T *strncpy (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len);
+  int strncmp (const wchar_t *s, const wchar_t *t, size_t len);
 
   /// Finds the length of a limited-length string (char version).
   /**
@@ -259,7 +219,7 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t strnlen (const char *s, size_t maxlen);
 
-  /// Finds the length of a limited-length string (ACE_WCHAR_T version).
+  /// Finds the length of a limited-length string (wchar_t version).
   /**
    * @param s       The character string to find the length of.
    * @param maxlen  The maximum number of characters that will be
@@ -269,7 +229,7 @@ namespace ACE_OS {
    *         is located, else @arg maxlen.
    */
   ACE_NAMESPACE_INLINE_FUNCTION
-  size_t strnlen (const ACE_WCHAR_T *s, size_t maxlen);
+  size_t strnlen (const wchar_t *s, size_t maxlen);
 
   /// Finds the first occurance of a substring in an array (const char
   /// version).
@@ -279,8 +239,8 @@ namespace ACE_OS {
   /// Finds the first occurance of a substring in an array (const wchar_t
   /// version).
   extern ACE_Export
-  const ACE_WCHAR_T *strnstr (const ACE_WCHAR_T *s,
-                              const ACE_WCHAR_T *t,
+  const wchar_t *strnstr (const wchar_t *s,
+                              const wchar_t *t,
                               size_t len);
 
   /// Finds the first occurance of a substring in an array (char version).
@@ -289,27 +249,23 @@ namespace ACE_OS {
 
   /// Finds the first occurance of a substring in an array (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  ACE_WCHAR_T *strnstr (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len);
+  wchar_t *strnstr (wchar_t *s, const wchar_t *t, size_t len);
 
   /// Searches for characters in a string (const char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const char *strpbrk (const char *s1, const char *s2);
 
-#if defined (ACE_HAS_WCHAR)
   /// Searches for characters in a string (const wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const wchar_t *strpbrk (const wchar_t *s1, const wchar_t *s2);
-#endif /* ACE_HAS_WCHAR */
 
   /// Searches for characters in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strpbrk (char *s1, const char *s2);
 
-#if defined (ACE_HAS_WCHAR)
   /// Searches for characters in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *strpbrk (wchar_t *s1, const wchar_t *s2);
-#endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_LACKS_STRPBRK)
   /// Emulated strpbrk - Searches for characters in a string.
@@ -323,22 +279,20 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   const char *strrchr (const char *s, int c);
 
-#if defined (ACE_HAS_WCHAR)
   /// Finds the last occurance of a character in a string (const wchar_t
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
+
   const wchar_t *strrchr (const wchar_t *s, wchar_t c);
-#endif /* ACE_HAS_WCHAR */
 
   /// Finds the last occurance of a character in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strrchr (char *s, int c);
 
-#if defined (ACE_HAS_WCHAR)
   /// Finds the last occurance of a character in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
+
   wchar_t *strrchr (wchar_t *s, wchar_t c);
-#endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_LACKS_STRRCHR)
   /// Emulated strrchr (char version) - Finds the last occurance of a
@@ -390,8 +344,8 @@ namespace ACE_OS {
    * strncpy() is needed.
    */
   extern ACE_Export
-  ACE_WCHAR_T *strsncpy (ACE_WCHAR_T *dst,
-                         const ACE_WCHAR_T *src,
+  wchar_t *strsncpy (wchar_t *dst,
+                         const wchar_t *src,
                          size_t maxlen);
 
   /// Searches for the first substring containing only the specified
@@ -399,12 +353,10 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t strspn (const char *s1, const char *s2);
 
-#if defined (ACE_HAS_WCHAR)
   /// Searches for the first substring containing only the specified
   /// characters and returns the size of the substring (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   size_t strspn (const wchar_t *s1, const wchar_t *s2);
-#endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_LACKS_STRSPN)
   /// Emulated wcsspn.
@@ -418,32 +370,26 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   const char *strstr (const char *s, const char *t);
 
-#if defined (ACE_HAS_WCHAR)
   /// Finds the first occurance of a substring in a string (const wchar_t
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
   const wchar_t *strstr (const wchar_t *s, const wchar_t *t);
-#endif /* ACE_HAS_WCHAR */
 
   /// Finds the first occurance of a substring in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strstr (char *s, const char *t);
 
-#if defined (ACE_HAS_WCHAR)
   /// Finds the first occurance of a substring in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *strstr (wchar_t *s, const wchar_t *t);
-#endif /* ACE_HAS_WCHAR */
 
   /// Finds the next token in a string (char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strtok (char *s, const char *tokens);
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOK)
   /// Finds the next token in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *strtok (wchar_t *s, const wchar_t *tokens);
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOK */
 
   //@}
 
@@ -451,11 +397,9 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   char *strtok_r (char *s, const char *tokens, char **lasts);
 
-#if defined (ACE_HAS_WCHAR)
   /// Finds the next token in a string (wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
-  wchar_t *strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts);
-#endif  // ACE_HAS_WCHAR
+  wchar_t *strtok_r (wchar_t *s, const wchar_t *tokens, wchar_t **lasts);
 
 #if !defined (ACE_HAS_REENTRANT_FUNCTIONS)
   /// Emulated strtok_r.
@@ -463,14 +407,15 @@ namespace ACE_OS {
   char *strtok_r_emulation (char *s, const char *tokens, char **lasts);
 #endif /* !ACE_HAS_REENTRANT_FUNCTIONS */
 
-# if defined (ACE_HAS_WCHAR) && defined(ACE_LACKS_WCSTOK)
+# if defined(ACE_LACKS_WCSTOK)
   /// Emulated strtok_r (wchar_t version).
   extern ACE_Export
-  wchar_t *strtok_r_emulation (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts);
-# endif  // ACE_HAS_WCHAR && ACE_LACKS_WCSTOK
+  wchar_t *strtok_r_emulation (wchar_t *s, const wchar_t *tokens, wchar_t **lasts);
+# endif  // ACE_LACKS_WCSTOK
 
 } /* namespace ACE_OS */
 
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 # if defined (ACE_HAS_INLINED_OSCALLS)
diff --git a/ace/OS_NS_string.inl b/ace/OS_NS_string.inl
index 38e42378157..557dd7e0d27 100644
--- a/ace/OS_NS_string.inl
+++ b/ace/OS_NS_string.inl
@@ -61,7 +61,6 @@ ACE_OS::strcat (char *s, const char *t)
   return ::strcat (s, t);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::strcat (wchar_t *s, const wchar_t *t)
 {
@@ -71,7 +70,6 @@ ACE_OS::strcat (wchar_t *s, const wchar_t *t)
   return ::wcscat (s, t);
 #  endif /* ACE_LACKS_WCSCAT */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE const char *
 ACE_OS::strchr (const char *s, int c)
@@ -83,7 +81,6 @@ ACE_OS::strchr (const char *s, int c)
 #endif /* ACE_LACKS_STRCHR */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE const wchar_t *
 ACE_OS::strchr (const wchar_t *s, wchar_t c)
 {
@@ -93,7 +90,6 @@ ACE_OS::strchr (const wchar_t *s, wchar_t c)
   return ::wcschr (s, c);
 #  endif /* ACE_LACKS_WCSCHR */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE char *
 ACE_OS::strchr (char *s, int c)
@@ -101,7 +97,6 @@ ACE_OS::strchr (char *s, int c)
   return ::strchr (s, c);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::strchr (wchar_t *s, wchar_t c)
 {
@@ -109,23 +104,6 @@ ACE_OS::strchr (wchar_t *s, wchar_t c)
     const_cast<wchar_t *> (ACE_OS::strchr (const_cast<const wchar_t *> (s),
                                            c));
 }
-#endif /* ACE_HAS_WCHAR */
-
-ACE_INLINE int
-ACE_OS::strcmp (const char *s, const char *t)
-{
-  return ::strcmp (s, t);
-}
-
-ACE_INLINE int
-ACE_OS::strcmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t)
-{
-#  if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSCMP)
-  return ACE_OS::wcscmp_emulation (s, t);
-#  else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */
-  return ::wcscmp (s, t);
-#  endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */
-}
 
 ACE_INLINE char *
 ACE_OS::strcpy (char *s, const char *t)
@@ -133,7 +111,6 @@ ACE_OS::strcpy (char *s, const char *t)
   return ::strcpy (s, t);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::strcpy (wchar_t *s, const wchar_t *t)
 {
@@ -143,7 +120,6 @@ ACE_OS::strcpy (wchar_t *s, const wchar_t *t)
   return ::wcscpy (s, t);
 #  endif /* ACE_LACKS_WCSCPY */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE size_t
 ACE_OS::strcspn (const char *s, const char *reject)
@@ -151,7 +127,6 @@ ACE_OS::strcspn (const char *s, const char *reject)
   return ::strcspn (s, reject);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE size_t
 ACE_OS::strcspn (const wchar_t *s, const wchar_t *reject)
 {
@@ -161,55 +136,6 @@ ACE_OS::strcspn (const wchar_t *s, const wchar_t *reject)
   return ::wcscspn (s, reject);
 #  endif /* ACE_LACKS_WCSCSPN */
 }
-#endif /* ACE_HAS_WCHAR */
-
-ACE_INLINE char *
-ACE_OS::strdup (const char *s)
-{
-#  if (defined (ACE_LACKS_STRDUP) && !defined(ACE_STRDUP_EQUIVALENT)) \
-  || defined (ACE_HAS_STRDUP_EMULATION)
-  return ACE_OS::strdup_emulation (s);
-#  elif defined (ACE_STRDUP_EQUIVALENT)
-  return ACE_STRDUP_EQUIVALENT (s);
-#  elif defined (ACE_HAS_NONCONST_STRDUP)
-  return ::strdup (const_cast<char *> (s));
-#else
-  return ::strdup (s);
-#  endif /* (ACE_LACKS_STRDUP && !ACE_STRDUP_EQUIVALENT) || ... */
-}
-
-#if defined (ACE_HAS_WCHAR)
-ACE_INLINE wchar_t *
-ACE_OS::strdup (const wchar_t *s)
-{
-#  if (defined (ACE_LACKS_WCSDUP) && !defined (ACE_WCSDUP_EQUIVALENT)) \
-  || defined (ACE_HAS_WCSDUMP_EMULATION)
-  return ACE_OS::strdup_emulation (s);
-#  elif defined (ACE_WCSDUP_EQUIVALENT)
-  return ACE_WCSDUP_EQUIVALENT (s);
-#  elif defined (ACE_HAS_NONCONST_WCSDUP)
-  return ::wcsdup (const_cast<wchar_t*> (s));
-#  else
-  return ::wcsdup (s);
-#  endif /* (ACE_LACKS_WCSDUP && !ACE_WCSDUP_EQUIVALENT) || ... */
-}
-#endif /* ACE_HAS_WCHAR */
-
-ACE_INLINE size_t
-ACE_OS::strlen (const char *s)
-{
-  return ::strlen (s);
-}
-
-ACE_INLINE size_t
-ACE_OS::strlen (const ACE_WCHAR_T *s)
-{
-# if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSLEN)
-  return ACE_OS::wcslen_emulation (s);
-# else  /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */
-  return ::wcslen (s);
-# endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */
-}
 
 ACE_INLINE char *
 ACE_OS::strncat (char *s, const char *t, size_t len)
@@ -217,14 +143,14 @@ ACE_OS::strncat (char *s, const char *t, size_t len)
   return ::strncat (s, t, len);
 }
 
-ACE_INLINE ACE_WCHAR_T *
-ACE_OS::strncat (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len)
+ACE_INLINE wchar_t *
+ACE_OS::strncat (wchar_t *s, const wchar_t *t, size_t len)
 {
-#  if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT)
+#  if defined (ACE_LACKS_WCSNCAT)
   return ACE_OS::wcsncat_emulation (s, t, len);
-#  else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCAT */
+#  else /* ACE_LACKS_WCSNCAT */
   return ::wcsncat (s, t, len);
-#  endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCAT */
+#  endif /* ACE_LACKS_WCSNCAT */
 }
 
 ACE_INLINE char *
@@ -240,12 +166,12 @@ ACE_OS::strnchr (char *s, int c, size_t len)
 #endif
 }
 
-ACE_INLINE ACE_WCHAR_T *
-ACE_OS::strnchr (ACE_WCHAR_T *s, ACE_WCHAR_T c, size_t len)
+ACE_INLINE wchar_t *
+ACE_OS::strnchr (wchar_t *s, wint_t c, size_t len)
 {
   return
-    const_cast<ACE_WCHAR_T *> (ACE_OS::strnchr (
-                                 const_cast<const ACE_WCHAR_T *> (s),
+    const_cast<wchar_t *> (ACE_OS::strnchr (
+                                 static_cast<const wchar_t *> (s),
                                  c,
                                  len));
 }
@@ -257,29 +183,13 @@ ACE_OS::strncmp (const char *s, const char *t, size_t len)
 }
 
 ACE_INLINE int
-ACE_OS::strncmp (const ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len)
+ACE_OS::strncmp (const wchar_t *s, const wchar_t *t, size_t len)
 {
-#  if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCMP)
+#  if defined (ACE_LACKS_WCSNCMP)
   return ACE_OS::wcsncmp_emulation (s, t, len);
-#  else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCMP */
+#  else /* ACE_LACKS_WCSNCMP */
   return ::wcsncmp (s, t, len);
-#  endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCMP */
-}
-
-ACE_INLINE char *
-ACE_OS::strncpy (char *s, const char *t, size_t len)
-{
-  return ::strncpy (s, t, len);
-}
-
-ACE_INLINE ACE_WCHAR_T *
-ACE_OS::strncpy (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len)
-{
-#  if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCPY)
-  return ACE_OS::wcsncpy_emulation (s, t, len);
-#  else /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCPY */
-  return ::wcsncpy (s, t, len);
-#  endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCPY */
+#  endif /* ACE_LACKS_WCSNCMP */
 }
 
 ACE_INLINE size_t
@@ -297,9 +207,9 @@ ACE_OS::strnlen (const char *s, size_t maxlen)
 }
 
 ACE_INLINE size_t
-ACE_OS::strnlen (const ACE_WCHAR_T *s, size_t maxlen)
+ACE_OS::strnlen (const wchar_t *s, size_t maxlen)
 {
-#if defined (ACE_HAS_WCHAR) && defined (ACE_HAS_WCSNLEN)
+#if defined (ACE_HAS_WCSNLEN)
   return wcsnlen (s, maxlen);
 #else /* ACE_HAS_WCSNLEN */
   size_t i;
@@ -321,12 +231,12 @@ ACE_OS::strnstr (char *s, const char *t, size_t len)
 #endif
 }
 
-ACE_INLINE ACE_WCHAR_T *
-ACE_OS::strnstr (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len)
+ACE_INLINE wchar_t *
+ACE_OS::strnstr (wchar_t *s, const wchar_t *t, size_t len)
 {
   return
-    const_cast<ACE_WCHAR_T *> (ACE_OS::strnstr (
-                                 static_cast<const ACE_WCHAR_T *> (s),
+    const_cast<wchar_t *> (ACE_OS::strnstr (
+                                 static_cast<const wchar_t *> (s),
                                  t,
                                  len));
 }
@@ -341,7 +251,6 @@ ACE_OS::strpbrk (const char *s1, const char *s2)
 #endif /* ACE_LACKS_STRPBRK */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE const wchar_t *
 ACE_OS::strpbrk (const wchar_t *s, const wchar_t *t)
 {
@@ -351,7 +260,6 @@ ACE_OS::strpbrk (const wchar_t *s, const wchar_t *t)
   return ::wcspbrk (s, t);
 #  endif /* ACE_LACKS_WCSPBRK */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE char *
 ACE_OS::strpbrk (char *s1, const char *s2)
@@ -363,14 +271,12 @@ ACE_OS::strpbrk (char *s1, const char *s2)
 #endif /* ACE_LACKS_STRPBRK */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::strpbrk (wchar_t *s, const wchar_t *t)
 {
   return const_cast<wchar_t *> (ACE_OS::strpbrk (
                                   const_cast<const wchar_t *> (s), t));
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE const char *
 ACE_OS::strrchr (const char *s, int c)
@@ -382,7 +288,6 @@ ACE_OS::strrchr (const char *s, int c)
 #endif /* ! ACE_LACKS_STRRCHR */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE const wchar_t *
 ACE_OS::strrchr (const wchar_t *s, wchar_t c)
 {
@@ -392,7 +297,6 @@ ACE_OS::strrchr (const wchar_t *s, wchar_t c)
   return const_cast <const wchar_t *> (::wcsrchr (s, c));
 #endif /* ! ACE_LACKS_WCSRCHR */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE char *
 ACE_OS::strrchr (char *s, int c)
@@ -404,14 +308,12 @@ ACE_OS::strrchr (char *s, int c)
 #endif /* ! ACE_LACKS_STRRCHR */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::strrchr (wchar_t *s, wchar_t c)
 {
   return const_cast<wchar_t *> (ACE_OS::strrchr (
                      const_cast<const wchar_t *> (s), c));
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE size_t
 ACE_OS::strspn (const char *s, const char *t)
@@ -423,7 +325,6 @@ ACE_OS::strspn (const char *s, const char *t)
 #endif /* ACE_LACKS_STRSPN */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE size_t
 ACE_OS::strspn (const wchar_t *s, const wchar_t *t)
 {
@@ -433,7 +334,6 @@ ACE_OS::strspn (const wchar_t *s, const wchar_t *t)
   return ::wcsspn (s, t);
 #  endif /* ACE_LACKS_WCSSPN */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE const char *
 ACE_OS::strstr (const char *s, const char *t)
@@ -441,7 +341,6 @@ ACE_OS::strstr (const char *s, const char *t)
   return (const char *) ::strstr (s, t);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE const wchar_t *
 ACE_OS::strstr (const wchar_t *s, const wchar_t *t)
 {
@@ -453,7 +352,6 @@ ACE_OS::strstr (const wchar_t *s, const wchar_t *t)
   return const_cast <const wchar_t *> (::wcsstr (s, t));
 #  endif /* ACE_LACKS_WCSSTR */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE char *
 ACE_OS::strstr (char *s, const char *t)
@@ -461,7 +359,6 @@ ACE_OS::strstr (char *s, const char *t)
   return ::strstr (s, t);
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::strstr (wchar_t *s, const wchar_t *t)
 {
@@ -473,7 +370,6 @@ ACE_OS::strstr (wchar_t *s, const wchar_t *t)
   return ::wcsstr (s, t);
 #  endif /* ACE_LACKS_WCSSTR */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE char *
 ACE_OS::strtok (char *s, const char *tokens)
@@ -481,18 +377,20 @@ ACE_OS::strtok (char *s, const char *tokens)
   return ::strtok (s, tokens);
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_WCSTOK)
 ACE_INLINE wchar_t *
 ACE_OS::strtok (wchar_t *s, const wchar_t *tokens)
 {
 #if defined (ACE_HAS_3_PARAM_WCSTOK)
   static wchar_t *lasts;
   return ::wcstok (s, tokens, &lasts);
-#else
+#elif !defined (ACE_LACKS_WCSTOK)
   return ::wcstok (s, tokens);
+#else
+    ACE_UNUSED_ARG( s );
+    ACE_UNUSED_ARG( tokens );
+    ACE_NOTSUP_RETURN (0);
 #endif /* ACE_HAS_3_PARAM_WCSTOK */
 }
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOK */
 
 ACE_INLINE char *
 ACE_OS::strtok_r (char *s, const char *tokens, char **lasts)
@@ -504,9 +402,8 @@ ACE_OS::strtok_r (char *s, const char *tokens, char **lasts)
 #endif /* (ACE_HAS_REENTRANT_FUNCTIONS) */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t*
-ACE_OS::strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts)
+ACE_OS::strtok_r (wchar_t *s, const wchar_t *tokens, wchar_t **lasts)
 {
 #if defined (ACE_LACKS_WCSTOK)
     return ACE_OS::strtok_r_emulation (s, tokens, lasts);
@@ -519,6 +416,6 @@ ACE_OS::strtok_r (ACE_WCHAR_T *s, const ACE_WCHAR_T *tokens, ACE_WCHAR_T **lasts
 #  endif /* ACE_HAS_3_PARAM_WCSTOK */
 #endif  /* ACE_LACKS_WCSTOK */
 }
-#endif  // ACE_HAS_WCHAR
+
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_string_base.cpp b/ace/OS_NS_string_base.cpp
new file mode 100644
index 00000000000..f129f36ba61
--- /dev/null
+++ b/ace/OS_NS_string_base.cpp
@@ -0,0 +1,12 @@
+/* -*- C++ -*- */
+// $Id$
+
+// We must include this before "ace/OS_NS_string_base.h", so that
+// "ace/OS_NS_string_base.h" gets the ACE_LACKS* #defines
+#include "ace/config-all.h"
+
+#include "ace/OS_NS_string_base.h"
+
+namespace ACE_OS
+{
+}
diff --git a/ace/OS_NS_string_base.h b/ace/OS_NS_string_base.h
new file mode 100644
index 00000000000..76360ca7719
--- /dev/null
+++ b/ace/OS_NS_string_base.h
@@ -0,0 +1,89 @@
+/* -*- C++ -*- */
+// $Id$
+#ifndef OS_NS_STRING_BASE_H
+#define OS_NS_STRING_BASE_H
+
+#include "ace/config-lite.h"
+
+#include <string.h>
+// Standard library includes for wide functions declared in ace_wchar.h
+// Do not include any ACE header files because this file is included from
+// ace_wchar.h which is included at the config.h level.
+
+namespace ACE_OS
+{
+
+/// Finds the length of a string (emulated version).
+template <typename CHAR> inline
+size_t strlen (const CHAR* s);
+
+/// Finds the length of a string (char version).
+template <> inline
+size_t strlen (const char* s);
+
+/// Finds the length of a string (wchar_t version).
+#if !defined (ACE_LACKS_WCSLEN)
+template <> inline
+size_t strlen (const wchar_t* s);
+#endif /* !ACE_LACKS_WCSLEN */
+
+/// Copies an array (emulated version)
+/// This method intentionally specifies
+/// a uniform type for source and destination
+/// Use ACE_OS::string_copy if the types may
+/// not be uniform.
+template <typename CHAR> inline
+CHAR* strncpy (CHAR* dest, const CHAR* src, size_t len);
+
+/// Copies an array (char version)
+template <> inline
+char* strncpy (char* dest, const char* src, size_t len);
+
+/// Copies an array (wchar_t version)
+#if !defined (ACE_LACKS_WCSNCPY)
+template <> inline
+wchar_t* strncpy (wchar_t* dest, const wchar_t* src, size_t len);
+#endif /* !ACE_LACKS_WCSNCPY */
+
+/// Compares two strings (emulated version).
+/// This method intentionally specifies
+/// a uniform type for source and destination.
+/// The user has to specify the conversion is they differ.
+template < typename CHAR > inline
+int strcmp (const CHAR *lhs, const CHAR *rhs);
+
+/// Compares two strings (char version).
+template <> inline
+int strcmp (const char *lhs, const char *rhs);
+
+  /// Compares two strings (wchar_t version).
+#if !defined (ACE_LACKS_WCSCMP)
+template <> inline
+int strcmp (const wchar_t *lhs, const wchar_t *rhs);
+#endif /* !ACE_LACKS_WCSCMP */
+
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+// Emulation
+#if defined (ACE_LACKS_WCSLEN)
+  /// Emulated wcslen - Returns the length of a string.
+  size_t
+  wcslen_emulation (const wchar_t* string)
+    { return ACE_OS::strlen( string ); }
+#endif /* ACE_LACKS_WCSLEN */
+
+#if defined (ACE_LACKS_WCSNCPY)
+  /// Emulated wcsncpy - Copies an array.
+  wchar_t *
+  wcsncpy_emulation (wchar_t *destination,
+                     const wchar_t *source,
+                     size_t len)
+    { return ACE_OS::strncpy( destination, source, len ); }
+#endif /* ACE_LACKS_WCSNCPY */
+
+#endif
+
+}
+
+#include "ace/OS_NS_string_base.inl"
+
+#endif
diff --git a/ace/OS_NS_string_base.inl b/ace/OS_NS_string_base.inl
new file mode 100644
index 00000000000..06a6e614694
--- /dev/null
+++ b/ace/OS_NS_string_base.inl
@@ -0,0 +1,97 @@
+/* -*- C++ -*- */
+// $Id$
+
+#ifndef OS_NS_STRING_BASE_INL
+#define OS_NS_STRING_BASE_INL
+
+#include <string.h>
+
+namespace ACE_OS
+{
+
+template <typename CHAR> inline
+size_t strlen (const CHAR* s)
+{
+  const CHAR* string = s;
+  for (; *string; ++string) continue;
+  return (string - s);
+}
+
+template <> inline
+size_t strlen (const char* s)
+{
+  return ::strlen (s);
+}
+
+#if !defined (ACE_LACKS_WCSLEN)
+template <> inline
+size_t strlen (const wchar_t* s)
+{
+  return ::wcslen (s);
+}
+#endif /* !ACE_LACKS_WCSLEN */
+
+template <typename CHAR> inline
+CHAR* strncpy (CHAR* dest, const CHAR* src, size_t len)
+{
+  if (len != 0)
+  {
+    CHAR* d = dest;
+    const CHAR* s = src;
+    do
+    {
+      if ((*d++ = *s++) == 0)
+      {
+        // NUL pad the remaining n-1 bytes
+        while (--len != 0)
+          *d++ = 0;
+        break;
+      }
+    } while (--len != 0);
+  }
+  return dest;
+}
+
+template <> inline
+char* strncpy (char* dest, const char* src, size_t len)
+{
+  return ::strncpy (dest, src, len);
+}
+
+#if !defined (ACE_LACKS_WCSNCPY)
+template <> inline
+wchar_t* strncpy (wchar_t* dest, const wchar_t* src, size_t len)
+{
+  return ::wcsncpy (dest, src, len);
+}
+#endif /* !ACE_LACKS_WCSNCPY */
+
+template < typename CHAR > inline
+int strcmp (const CHAR *lhs, const CHAR *rhs)
+{
+// we need static casts!
+  while (*lhs == *rhs++)
+    if (*lhs++ == 0)
+      return (0);
+  return (*lhs - *--rhs);
+}
+
+/// Compares two strings (char version).
+template <> inline
+int strcmp (const char *lhs, const char *rhs)
+{
+  return ::strcmp (lhs, rhs);
+}
+
+/// Compares two strings (wchar_t version).
+#if !defined (ACE_LACKS_WCSCMP)
+template <> inline
+int strcmp (const wchar_t *lhs, const wchar_t *rhs)
+{
+  return ::wcscmp (lhs, rhs);
+}
+#endif /* !ACE_LACKS_WCSCMP */
+
+}
+
+#endif
diff --git a/ace/OS_NS_strings.h b/ace/OS_NS_strings.h
index 70d8e17cf5b..e834afac831 100644
--- a/ace/OS_NS_strings.h
+++ b/ace/OS_NS_strings.h
@@ -44,21 +44,17 @@ namespace ACE_OS
   ACE_NAMESPACE_INLINE_FUNCTION
   int strcasecmp (const char *s, const char *t);
 
-#if defined (ACE_HAS_WCHAR)
   /// Compares two strings (case insensitive const wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   int strcasecmp (const wchar_t *s, const wchar_t *t);
-#endif /* ACE_HAS_WCHAR */
 
   /// Compares two arrays (case insensitive const char version).
   ACE_NAMESPACE_INLINE_FUNCTION
   int strncasecmp (const char *s, const char *t, size_t len);
 
-#if defined (ACE_HAS_WCHAR)
   /// Compares two arrays (case insensitive const wchar_t version).
   ACE_NAMESPACE_INLINE_FUNCTION
   int strncasecmp (const wchar_t *s, const wchar_t *t, size_t len);
-#endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_LACKS_STRCASECMP)
   /// Emulated strcasecmp - Performs a case insensitive comparison of strings.
diff --git a/ace/OS_NS_strings.inl b/ace/OS_NS_strings.inl
index 2b2012b2f38..4e5d0f40dc0 100644
--- a/ace/OS_NS_strings.inl
+++ b/ace/OS_NS_strings.inl
@@ -2,9 +2,7 @@
 //
 // $Id$
 
-#if defined (ACE_HAS_WCHAR)
 #  include "ace/OS_NS_wchar.h"
-#endif /* ACE_HAS_WCHAR */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -20,7 +18,6 @@ ACE_OS::strcasecmp (const char *s, const char *t)
 #endif /* ACE_LACKS_STRCASECMP */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t)
 {
@@ -30,7 +27,6 @@ ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t)
   return ::_wcsicmp (s, t);
 #  endif /* ACE_LACKS_WCSICMP */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_OS::strncasecmp (const char *s, const char *t, size_t len)
@@ -44,7 +40,6 @@ ACE_OS::strncasecmp (const char *s, const char *t, size_t len)
 #endif /* ACE_LACKS_STRCASECMP */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len)
 {
@@ -54,6 +49,5 @@ ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len)
   return ::_wcsnicmp (s, t, len);
 #endif /* ACE_LACKS_WCSNICMP */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_mman.inl b/ace/OS_NS_sys_mman.inl
index eb7449779fb..0379ca02468 100644
--- a/ace/OS_NS_sys_mman.inl
+++ b/ace/OS_NS_sys_mman.inl
@@ -308,9 +308,9 @@ ACE_OS::shm_open (const ACE_TCHAR *filename,
   ACE_OS_TRACE ("ACE_OS::shm_open");
 # if defined (ACE_HAS_SHM_OPEN)
   ACE_UNUSED_ARG (sa);
-  ACE_OSCALL_RETURN (::shm_open (ACE_TEXT_ALWAYS_CHAR(filename), mode, perms), ACE_HANDLE, ACE_INVALID_HANDLE);
+  ACE_OSCALL_RETURN (::shm_open (ACE_TEXT_TO_CHAR_IN(filename), mode, perms), ACE_HANDLE, ACE_INVALID_HANDLE);
 # elif defined (ACE_OPENVMS)
-  ACE_OSCALL_RETURN (::open (filename, mode, perms, ACE_TEXT("shr=get,put,upd")), ACE_HANDLE, ACE_INVALID_HANDLE);
+  ACE_OSCALL_RETURN (::open (filename, mode, perms, ACE_LIB_TEXT("shr=get,put,upd")), ACE_HANDLE, ACE_INVALID_HANDLE);
 # else  /* ! ACE_HAS_SHM_OPEN */
   // Just use ::open.
   return ACE_OS::open (filename, mode, perms, sa);
@@ -322,7 +322,7 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path)
 {
   ACE_OS_TRACE ("ACE_OS::shm_unlink");
 # if defined (ACE_HAS_SHM_OPEN)
-  ACE_OSCALL_RETURN (::shm_unlink (ACE_TEXT_ALWAYS_CHAR(path)), int, -1);
+  ACE_OSCALL_RETURN (::shm_unlink (ACE_TEXT_TO_CHAR_IN(path)), int, -1);
 # else  /* ! ACE_HAS_SHM_OPEN */
   // Just use ::unlink.
   return ACE_OS::unlink (path);
diff --git a/ace/OS_NS_sys_stat.h b/ace/OS_NS_sys_stat.h
index 76f029245cc..dfae190203e 100644
--- a/ace/OS_NS_sys_stat.h
+++ b/ace/OS_NS_sys_stat.h
@@ -68,21 +68,17 @@ namespace ACE_OS
   int lstat (const char *,
              ACE_stat *);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int lstat (const wchar_t *,
              ACE_stat *);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int mkdir (const char *path,
              mode_t mode = ACE_DEFAULT_DIR_PERMS);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int mkdir (const wchar_t *path,
              mode_t mode = ACE_DEFAULT_DIR_PERMS);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int mkfifo (const ACE_TCHAR *file,
@@ -91,10 +87,8 @@ namespace ACE_OS
   ACE_NAMESPACE_INLINE_FUNCTION
   int stat (const char *file, ACE_stat *);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int stat (const wchar_t *file, ACE_stat *);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   mode_t umask (mode_t cmask);
diff --git a/ace/OS_NS_sys_stat.inl b/ace/OS_NS_sys_stat.inl
index 448cfcd3246..6ae9a7a435d 100644
--- a/ace/OS_NS_sys_stat.inl
+++ b/ace/OS_NS_sys_stat.inl
@@ -27,7 +27,7 @@ namespace ACE_OS
     ACE_UNUSED_ARG (mode);
     ACE_NOTSUP_RETURN (-1);
 #else
-    ACE_OSCALL_RETURN (::creat (ACE_TEXT_ALWAYS_CHAR (filename), mode),
+    ACE_OSCALL_RETURN (::creat (ACE_TEXT_TO_CHAR_IN (filename), mode),
                        ACE_HANDLE, ACE_INVALID_HANDLE);
 #endif /* ACE_WIN32 */
   }
@@ -154,7 +154,6 @@ namespace ACE_OS
 # endif /* ACE_LACKS_LSTAT */
   }
 
-#if defined (ACE_HAS_WCHAR)
   ACE_INLINE int
   lstat (const wchar_t *file, ACE_stat *stp)
   {
@@ -162,10 +161,9 @@ namespace ACE_OS
 # if defined (ACE_LACKS_LSTAT)
     return ACE_OS::stat (file, stp);
 # else
-    return ACE_OS::lstat (ACE_Wide_To_Ascii (file).char_rep (), stp);
+    return ACE_OS::lstat (ACE_TEXT_TO_CHAR_IN (file), stp);
 # endif /* ACE_LACKS_LSTAT */
   }
-#endif /* ACE_HAS_WCHAR */
 
   ACE_INLINE int
   mkdir (const char *path, mode_t mode)
@@ -214,7 +212,7 @@ namespace ACE_OS
     ACE_OSCALL_RETURN (::_mkdir (const_cast <char *> (path)), int, -1);
 #elif defined (ACE_HAS_WINCE)
     ACE_UNUSED_ARG (mode);
-    ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_CHAR_TO_TCHAR (path), 0),
+    ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreateDirectory (ACE_TEXT_TO_TCHAR_IN (path), 0),
                                             ace_result_),
                           int, -1);
 #elif defined (ACE_MKDIR_LACKS_MODE)
@@ -225,8 +223,6 @@ namespace ACE_OS
 #endif /* ACE_PSOS_LACKS_PHILE */
   }
 
-#if defined (ACE_HAS_WCHAR)
-
   ACE_INLINE int
   mkdir (const wchar_t *path, mode_t mode)
   {
@@ -239,12 +235,10 @@ namespace ACE_OS
     ACE_UNUSED_ARG (mode);
     ACE_OSCALL_RETURN (::_wmkdir (path), int, -1);
 #else
-    return ACE_OS::mkdir (ACE_Wide_To_Ascii (path).char_rep (), mode);
+    return ACE_OS::mkdir (ACE_TEXT_TO_CHAR_IN (path), mode);
 #endif /* ACE_HAS_WINCE */
   }
 
-#endif /* ACE_HAS_WCHAR */
-
   ACE_INLINE int
   mkfifo (const ACE_TCHAR *file, mode_t mode)
   {
@@ -254,7 +248,7 @@ namespace ACE_OS
     ACE_UNUSED_ARG (mode);
     ACE_NOTSUP_RETURN (-1);
 #else
-    ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_ALWAYS_CHAR (file), mode), int, -1);
+    ACE_OSCALL_RETURN (::mkfifo (ACE_TEXT_TO_CHAR_IN (file), mode), int, -1);
 #endif /* ACE_LACKS_MKFIFO */
   }
 
@@ -275,7 +269,7 @@ namespace ACE_OS
 
     HANDLE fhandle;
 
-    fhandle = ::FindFirstFile (ACE_TEXT_CHAR_TO_TCHAR (file), &fdata);
+    fhandle = ::FindFirstFile (ACE_TEXT_TO_TCHAR_IN (file), &fdata);
     if (fhandle == INVALID_HANDLE_VALUE)
       {
         ACE_OS::set_errno_to_last_error ();
@@ -309,7 +303,6 @@ namespace ACE_OS
 #endif /* ACE_HAS_NONCONST_STAT */
   }
 
-#if defined (ACE_HAS_WCHAR)
   ACE_INLINE int
   stat (const wchar_t *file, ACE_stat *stp)
   {
@@ -343,11 +336,9 @@ namespace ACE_OS
 #elif defined (ACE_WIN32)
     ACE_OSCALL_RETURN (::_wstat (file, (struct _stat *) stp), int, -1);
 #else /* ACE_HAS_WINCE */
-    ACE_Wide_To_Ascii nfile (file);
-    return ACE_OS::stat (nfile.char_rep (), stp);
+    return ACE_OS::stat (ACE_TEXT_TO_CHAR_IN (file), stp);
 #endif /* ACE_HAS_WINCE */
   }
-#endif /* ACE_HAS_WCHAR */
 
   ACE_INLINE mode_t
   umask (mode_t cmask)
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index 99ca079478c..fbce238b080 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -7,6 +7,7 @@
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_time.h"
+//#include "ace/TSS_T.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -115,24 +116,31 @@ ACE_OS::ctime (const time_t *t)
 #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
   ACE_OSCALL_RETURN (::_wctime (t), wchar_t *, 0);
 #else
-#  if defined (ACE_USES_WCHAR)   /* Not Win32, else it would do the above */
+#  if defined (ACE_USES_WCHAR) // Wide and not Win32
   char *narrow_time;
   ACE_OSCALL (::ctime (t), char *, 0, narrow_time);
   if (narrow_time == 0)
     return 0;
-  // ACE_Ascii_To_Wide::convert allocates (via new []) a wchar_t[]. If
+  // ACE_TEXT_TO_MALLOC_WCHAR_OUT allocates (via malloc) a wchar_t[]. If
   // we've done this before, free the previous one. Yes, this leaves a
   // small memory leak (26 characters) but there's no way around this
   // that I know of. (Steve Huston, 12-Feb-2003).
-  static wchar_t *wide_time = 0;
-  if (wide_time != 0)
-    delete [] wide_time;
-  wide_time = ACE_Ascii_To_Wide::convert (narrow_time);
+// Including ACE_TSS_T.h causes error!
+/*
+  wchar_t* init = 0;
+  static ACE_TSS< wchar_t* > wide_time (&init);
+  ACE::String_Conversion::Allocator_malloc<wchar_t>().free(*wide_time);
+  *wide_time.ts_object() = ACE_TEXT_TO_MALLOC_WCHAR_OUT (narrow_time);
+  return *wide_time;
+*/
+  static wchar_t* wide_time = 0;
+  ACE::String_Conversion::Allocator_malloc<wchar_t>().free(wide_time);
+  wide_time = ACE_TEXT_TO_MALLOC_WCHAR_OUT (narrow_time);
   return wide_time;
 #  else
   ACE_OSCALL_RETURN (::ctime (t), char *, 0);
-#  endif /* ACE_USES_WCHAR */
-# endif /* ACE_HAS_BROKEN_CTIME */
+#  endif // ACE_USES_WCHAR
+# endif // ACE_HAS_BROKEN_CTIME
 }
 
 #if !defined (ACE_HAS_WINCE)  /* CE version in OS.cpp */
@@ -178,8 +186,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
     return 0;
 
 #   if defined (ACE_USES_WCHAR)
-  ACE_Ascii_To_Wide wide_buf (bufp);
-  ACE_OS_String::strcpy (buf, wide_buf.wchar_rep ());
+  ACE_OS::string_copy (buf, bufp, buflen);
   return buf;
 #   else
   return bufp;
@@ -558,4 +565,5 @@ ACE_OS::tzset (void)
 # endif /* ACE_HAS_WINCE && !VXWORKS && !ACE_PSOS && !__rtems__ && !ACE_HAS_DINKUM_STL */
 }
 
+
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_unistd.cpp b/ace/OS_NS_unistd.cpp
index e23686974c7..a35c40065f7 100644
--- a/ace/OS_NS_unistd.cpp
+++ b/ace/OS_NS_unistd.cpp
@@ -54,7 +54,7 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv,
       // Account for environment variables.
       if (substitute_env_args && argv[i][0] == ACE_LIB_TEXT ('$'))
         {
-#  if defined (ACE_WIN32) || !defined (ACE_HAS_WCHAR)
+#  if defined (ACE_WIN32)
           ACE_TCHAR *temp = 0;
           // Win32 is the only platform with a wide-char ACE_OS::getenv().
           if ((temp = ACE_OS::getenv (&argv[i][1])) != 0)
@@ -62,17 +62,17 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv,
           else
             buf_len += ACE_OS::strlen (argv[i]);
 #  else
-          // This is an ACE_HAS_WCHAR platform and not ACE_WIN32.
+          // This is not ACE_WIN32.
           // Convert the env variable name for getenv(), then add
           // the length of the returned char *string. Later, when we
           // actually use the returned env variable value, convert it
           // as well.
-          char *ctemp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&argv[i][1]));
+          char *ctemp = ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (&argv[i][1]));
           if (ctemp == 0)
             buf_len += ACE_OS::strlen (argv[i]);
           else
             buf_len += ACE_OS::strlen (ctemp);
-#  endif /* ACE_WIN32 || !ACE_HAS_WCHAR */
+#  endif /* ACE_WIN32 */
         }
       else
 #endif /* ACE_LACKS_ENV */
@@ -101,7 +101,7 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv,
       // Account for environment variables.
       if (substitute_env_args && argv[j][0] == ACE_LIB_TEXT ('$'))
         {
-#  if defined (ACE_WIN32) || !defined (ACE_HAS_WCHAR)
+#  if defined (ACE_WIN32)
           // Win32 is the only platform with a wide-char ACE_OS::getenv().
           ACE_TCHAR *temp = ACE_OS::getenv (&argv[j][1]);
           if (temp != 0)
@@ -109,15 +109,15 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv,
           else
             end = ACE_OS::strecpy (end, argv[j]);
 #  else
-          // This is an ACE_HAS_WCHAR platform and not ACE_WIN32.
+          // This is not ACE_WIN32.
           // Convert the env variable name for getenv(), then convert
           // the returned char *string back to wchar_t.
-          char *ctemp = ACE_OS::getenv (ACE_TEXT_ALWAYS_CHAR (&argv[j][1]));
+          char *ctemp = ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (&argv[j][1]));
           if (ctemp == 0)
             end = ACE_OS::strecpy (end, argv[j]);
           else
-            end = ACE_OS::strecpy (end, ACE_TEXT_CHAR_TO_TCHAR (ctemp));
-#  endif /* ACE_WIN32 || !ACE_HAS_WCHAR */
+            end = ACE_OS::strecpy (end, ACE_TEXT_TO_TCHAR_IN (ctemp));
+#  endif /* ACE_WIN32 */
         }
       else
 #endif /* ACE_LACKS_ENV */
@@ -248,7 +248,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
       // narrow char strings for execv().
       char **cargv;
       int arg_count;
-#   endif /* ACE_HAS_WCHAR */
+#   endif /* ACE_USES_WCHAR */
 
       switch (result)
         {
@@ -267,7 +267,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
           --arg_count;    // Back to 0-indexed
           cargv[arg_count] = 0;
           while (--arg_count >= 0)
-            cargv[arg_count] = ACE_Wide_To_Ascii::convert (argv[arg_count]);
+            cargv[arg_count] = ACE_TEXT_TO_CHAR_OUT(argv[arg_count]); // memory allocated!
           // Don't worry about freeing the cargv or the strings it points to.
           // Either the process will be replaced, or we'll exit.
           if (ACE_OS::execv (cargv[0], cargv) == -1)
@@ -282,7 +282,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[])
               // If the execv fails, this child needs to exit.
               ACE_OS::exit (errno);
             }
-#   endif /* ACE_HAS_WCHAR */
+#   endif /* ACE_USES_WCHAR */
 
         default:
           // Server process.  The fork succeeded.
@@ -616,135 +616,6 @@ ACE_OS::pwrite (ACE_HANDLE handle,
 # endif /* ACE_HAD_P_READ_WRITE */
 }
 
-int
-ACE_OS::string_to_argv (ACE_TCHAR *buf,
-                        int &argc,
-                        ACE_TCHAR **&argv,
-                        int substitute_env_args)
-{
-  // Reset the number of arguments
-  argc = 0;
-
-  if (buf == 0)
-    return -1;
-
-  ACE_TCHAR *cp = buf;
-
-  // First pass: count arguments.
-
-  // '#' is the start-comment token..
-  while (*cp != ACE_LIB_TEXT ('\0') && *cp != ACE_LIB_TEXT ('#'))
-    {
-      // Skip whitespace..
-      while (ACE_OS::ace_isspace (*cp))
-        cp++;
-
-      // Increment count and move to next whitespace..
-      if (*cp != ACE_LIB_TEXT ('\0'))
-        argc++;
-
-      while (*cp != ACE_LIB_TEXT ('\0') && !ACE_OS::ace_isspace (*cp))
-        {
-          // Grok quotes....
-          if (*cp == ACE_LIB_TEXT ('\'') || *cp == ACE_LIB_TEXT ('"'))
-            {
-              ACE_TCHAR quote = *cp;
-
-              // Scan past the string..
-              for (cp++; *cp != ACE_LIB_TEXT ('\0') && *cp != quote; cp++)
-                continue;
-
-              // '\0' implies unmatched quote..
-              if (*cp == ACE_LIB_TEXT ('\0'))
-                {
-                  argc--;
-                  break;
-                }
-              else
-                cp++;
-            }
-          else
-            cp++;
-        }
-    }
-
-  // Second pass: copy arguments.
-  ACE_TCHAR arg[ACE_DEFAULT_ARGV_BUFSIZ];
-  ACE_TCHAR *argp = arg;
-
-  // Make sure that the buffer we're copying into is always large
-  // enough.
-  if (cp - buf >= ACE_DEFAULT_ARGV_BUFSIZ)
-    ACE_NEW_RETURN (argp,
-                    ACE_TCHAR[cp - buf + 1],
-                    -1);
-
-  // Make a new argv vector of argc + 1 elements.
-  ACE_NEW_RETURN (argv,
-                  ACE_TCHAR *[argc + 1],
-                  -1);
-
-  ACE_TCHAR *ptr = buf;
-
-  for (int i = 0; i < argc; i++)
-    {
-      // Skip whitespace..
-      while (ACE_OS::ace_isspace (*ptr))
-        ptr++;
-
-      // Copy next argument and move to next whitespace..
-      cp = argp;
-      while (*ptr != ACE_LIB_TEXT ('\0') && !ACE_OS::ace_isspace (*ptr))
-        if (*ptr == ACE_LIB_TEXT ('\'') || *ptr == ACE_LIB_TEXT ('"'))
-          {
-            ACE_TCHAR quote = *ptr++;
-
-            while (*ptr != ACE_LIB_TEXT ('\0') && *ptr != quote)
-              *cp++ = *ptr++;
-
-            if (*ptr == quote)
-              ptr++;
-          }
-        else
-          *cp++ = *ptr++;
-
-      *cp = ACE_LIB_TEXT ('\0');
-
-#if !defined (ACE_LACKS_ENV)
-      // Check for environment variable substitution here.
-      if (substitute_env_args) {
-          argv[i] = ACE_OS::strenvdup(argp);
-
-          if (argv[i] == 0)
-            {
-              if (argp != arg)
-                delete [] argp;
-              errno = ENOMEM;
-              return -1;
-            }
-      }
-      else
-#endif /* ACE_LACKS_ENV */
-        {
-          argv[i] = ACE_OS::strdup(argp);
-
-          if (argv[i] == 0)
-            {
-              if (argp != arg)
-                delete [] argp;
-              errno = ENOMEM;
-              return -1;
-            }
-        }
-    }
-
-  if (argp != arg)
-    delete [] argp;
-
-  argv[argc] = 0;
-  return 0;
-}
-
 // Write <len> bytes from <buf> to <handle> (uses the <write>
 // system call on UNIX and the <WriteFile> call on Win32).
 
diff --git a/ace/OS_NS_unistd.h b/ace/OS_NS_unistd.h
index 680c97b7aed..484b0760b28 100644
--- a/ace/OS_NS_unistd.h
+++ b/ace/OS_NS_unistd.h
@@ -49,10 +49,8 @@ namespace ACE_OS
   ACE_NAMESPACE_INLINE_FUNCTION
   int access (const char *path, int amode);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int access (const wchar_t *path, int amode);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   unsigned int alarm (u_int secs);
@@ -70,19 +68,15 @@ namespace ACE_OS
   ACE_NAMESPACE_INLINE_FUNCTION
   int chdir (const char *path);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int chdir (const wchar_t *path);
-#endif /* ACE_HAS_WCHAR */
 #endif /* ACE_LACKS_CHDIR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int rmdir (const char *path);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int rmdir (const wchar_t *path);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int close (ACE_HANDLE handle);
@@ -144,10 +138,8 @@ namespace ACE_OS
   ACE_NAMESPACE_INLINE_FUNCTION
   char *getcwd (char *, size_t);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   wchar_t *getcwd (wchar_t *, size_t);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   gid_t getgid (void);
@@ -183,11 +175,9 @@ namespace ACE_OS
   int hostname (char *name,
                 size_t maxnamelen);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int hostname (wchar_t *name,
                 size_t maxnamelen);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   int isatty (int handle);
@@ -294,10 +284,10 @@ namespace ACE_OS
   int sleep (const ACE_Time_Value &tv);
 
   // used by ARGV::string_to_argv
-  extern ACE_Export
-  int string_to_argv (ACE_TCHAR *buf,
+  template <typename CHAR_TYPE>
+  int string_to_argv (CHAR_TYPE *buf,
                       int &argc,
-                      ACE_TCHAR **&argv,
+                      CHAR_TYPE **&argv,
                       int substitute_env_args = 1);
 
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -326,10 +316,8 @@ namespace ACE_OS
   ACE_NAMESPACE_INLINE_FUNCTION
   int unlink (const char *path);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   int unlink (const wchar_t *path);
-#endif /* ACE_HAS_WCHAR */
 
   ACE_NAMESPACE_INLINE_FUNCTION
   ssize_t write (ACE_HANDLE handle,
@@ -367,5 +355,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #   include "ace/OS_NS_unistd.inl"
 # endif /* ACE_HAS_INLINED_OSCALLS */
 
+#include "ace/OS_NS_unistd_T.inl"
+
 # include /**/ "ace/post.h"
 #endif /* ACE_OS_NS_UNISTD_H */
diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl
index b961b822551..1e73cc50320 100644
--- a/ace/OS_NS_unistd.inl
+++ b/ace/OS_NS_unistd.inl
@@ -41,7 +41,7 @@ ACE_OS::access (const char *path, int amode)
   // @@ WINCE: There should be a Win32 API that can do this.
   // Hard coded read access here.
   ACE_UNUSED_ARG (amode);
-  FILE* handle = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(path),
+  FILE* handle = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(path),
                                 ACE_LIB_TEXT ("r"));
   if (handle != 0)
     {
@@ -62,18 +62,15 @@ ACE_OS::access (const char *path, int amode)
 #endif /* ACE_LACKS_ACCESS */
 }
 
-
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::access (const wchar_t *path, int amode)
 {
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   ACE_OSCALL_RETURN (::_waccess (path, amode), int, -1);
 #else /* ACE_WIN32 && !ACE_HAS_WINCE */
-  return ACE_OS::access (ACE_Wide_To_Ascii (path).char_rep (), amode);
+  return ACE_OS::access (ACE_TEXT_TO_CHAR_IN (path), amode);
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE u_int
 ACE_OS::alarm (u_int secs)
@@ -147,17 +144,15 @@ ACE_OS::chdir (const char *path)
 #endif /* ACE_HAS_NONCONST_CHDIR */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::chdir (const wchar_t *path)
 {
 #if defined (ACE_WIN32)
   ACE_OSCALL_RETURN (::_wchdir (path), int, -1);
 #else /* ACE_WIN32 */
-  return ACE_OS::chdir (ACE_Wide_To_Ascii (path).char_rep ());
+  return ACE_OS::chdir (ACE_TEXT_TO_CHAR_IN (path));
 #endif /* ACE_WIN32 */
 }
-#endif /* ACE_HAS_WCHAR */
 #endif /* ACE_LACKS_CHDIR */
 
 ACE_INLINE int
@@ -201,7 +196,7 @@ ACE_OS::rmdir (const char *path)
 #elif defined (ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
   ACE_OSCALL_RETURN (::_rmdir ((char *) path), int, -1);
 #elif defined (ACE_HAS_WINCE)
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_CHAR_TO_TCHAR (path)),
+  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::RemoveDirectory (ACE_TEXT_TO_TCHAR_IN (path)),
                                           ace_result_),
                         int, -1);
 #else
@@ -209,7 +204,6 @@ ACE_OS::rmdir (const char *path)
 #endif /* ACE_PSOS_LACKS_PHILE */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::rmdir (const wchar_t *path)
 {
@@ -220,11 +214,9 @@ ACE_OS::rmdir (const wchar_t *path)
 #elif defined (ACE_WIN32)
   ACE_OSCALL_RETURN (::_wrmdir (path), int, -1);
 #else
-  ACE_Wide_To_Ascii n_path (path);
-  return ACE_OS::rmdir (n_path.char_rep ());
+  return ACE_OS::rmdir (ACE_TEXT_TO_CHAR_IN (path));
 #endif /* ACE_HAS_WINCE */
 }
-#endif /* ACE_HAS_WCHAR */
 
 // @todo: which 4 and why???  dhinton
 // NOTE: The following four function definitions must appear before
@@ -540,7 +532,6 @@ ACE_OS::getcwd (char *buf, size_t size)
 #endif /* ACE_PSOS_LACKS_PHILE */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wchar_t *
 ACE_OS::getcwd (wchar_t *buf, size_t size)
 {
@@ -551,17 +542,12 @@ ACE_OS::getcwd (wchar_t *buf, size_t size)
 #  elif defined (ACE_WIN32)
   return ::_wgetcwd (buf, static_cast<int> (size));
 #  else
-  char *narrow_buf = new char[size];
-  char *result = 0;
-  result = ACE_OS::getcwd (narrow_buf, size);
-  ACE_Ascii_To_Wide wide_buf (result);
-  delete [] narrow_buf;
-  if (result != 0)
-    ACE_OS::strsncpy (buf, wide_buf.wchar_rep (), size);
-  return result == 0 ? 0 : buf;
+  buf[0]=0;
+  ACE::String_Conversion::Convert_InOut< char, wchar_t > convert( buf, size  );
+  char* result = ACE_OS::getcwd( convert.c_str(), convert.size() );
+  return ( result ? buf : 0 );
 #  endif /* ACE_WIN32 */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE gid_t
 ACE_OS::getgid (void)
@@ -721,7 +707,6 @@ ACE_OS::hostname (char name[], size_t maxnamelen)
 #endif /* ACE_HAS_PHARLAP */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::hostname (wchar_t name[], size_t maxnamelen)
 {
@@ -731,19 +716,11 @@ ACE_OS::hostname (wchar_t name[], size_t maxnamelen)
                                           ace_result_), int, -1);
 #else /* ACE_WIN32 && !ACE_HAS_WINCE */
   // Emulate using the char version
-  char *char_name = 0;
-  int result = 0;
-
-  ACE_NEW_RETURN (char_name, char[maxnamelen], -1);
-
-  result = ACE_OS::hostname(char_name, maxnamelen);
-  ACE_OS::strcpy (name, ACE_Ascii_To_Wide (char_name).wchar_rep ());
-
-  delete [] char_name;
-  return result;
+  name[0]=0;
+  ACE::String_Conversion::Convert_InOut< char, wchar_t > convert (name, maxnamelen);
+  return ACE_OS::hostname (convert.c_str(), convert.size());
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_OS::isatty (int handle)
@@ -1220,7 +1197,7 @@ ACE_OS::truncate (const ACE_TCHAR *filename,
   /* NOTREACHED */
 #elif !defined (ACE_LACKS_TRUNCATE)
   ACE_OSCALL_RETURN
-    (::truncate (ACE_TEXT_ALWAYS_CHAR (filename), offset), int, -1);
+    (::truncate (ACE_TEXT_TO_CHAR_IN (filename), offset), int, -1);
 #else
   ACE_UNUSED_ARG (filename);
   ACE_UNUSED_ARG (offset);
@@ -1280,7 +1257,7 @@ ACE_OS::unlink (const char *path)
                      int, -1);
 # elif defined (ACE_HAS_WINCE)
   // @@ The problem is, DeleteFile is not actually equals to unlink. ;(
-  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_CHAR_TO_TCHAR (path)), ace_result_),
+  ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::DeleteFile (ACE_TEXT_TO_TCHAR_IN (path)), ace_result_),
                         int, -1);
 # elif defined (ACE_LACKS_UNLINK)
   ACE_UNUSED_ARG (path);
@@ -1290,7 +1267,6 @@ ACE_OS::unlink (const char *path)
 # endif /* ACE_HAS_NONCONST_UNLINK */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE int
 ACE_OS::unlink (const wchar_t *path)
 {
@@ -1302,11 +1278,9 @@ ACE_OS::unlink (const wchar_t *path)
 # elif defined (ACE_WIN32)
   ACE_OSCALL_RETURN (::_wunlink (path), int, -1);
 # else
-  ACE_Wide_To_Ascii npath (path);
-  return ACE_OS::unlink (npath.char_rep ());
+  return ACE_OS::unlink (ACE_TEXT_TO_CHAR_IN (path));
 # endif /* ACE_HAS_WINCE */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE ssize_t
 ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte)
diff --git a/ace/OS_NS_unistd_T.inl b/ace/OS_NS_unistd_T.inl
new file mode 100644
index 00000000000..2b386231e29
--- /dev/null
+++ b/ace/OS_NS_unistd_T.inl
@@ -0,0 +1,141 @@
+// -*- C++ -*-
+//
+// $Id$
+
+#include "ace/OS_NS_ctype.h"
+#include "ace/Default_Constants.h"
+#include "ace/os_include/os_errno.h"
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
+
+template <typename CHAR_TYPE> int
+ACE_OS::string_to_argv (CHAR_TYPE *buf,
+                        int &argc,
+                        CHAR_TYPE **&argv,
+                        int substitute_env_args)
+{
+  // Reset the number of arguments
+  argc = 0;
+
+  if (buf == 0)
+    return -1;
+
+  CHAR_TYPE *cp = buf;
+
+  // First pass: count arguments.
+
+  // '#' is the start-comment token..
+  while (*cp != CHAR_TYPE ('\0') && *cp != CHAR_TYPE ('#'))
+    {
+      // Skip whitespace..
+      while (ACE_OS::ace_isspace (*cp))
+        cp++;
+
+      // Increment count and move to next whitespace..
+      if (*cp != CHAR_TYPE ('\0'))
+        argc++;
+
+      while (*cp != CHAR_TYPE ('\0') && !ACE_OS::ace_isspace (*cp))
+        {
+          // Grok quotes....
+          if (*cp == CHAR_TYPE ('\'') || *cp == CHAR_TYPE ('"'))
+            {
+              CHAR_TYPE quote = *cp;
+
+              // Scan past the string..
+              for (cp++; *cp != CHAR_TYPE ('\0') && *cp != quote; cp++)
+                continue;
+
+              // '\0' implies unmatched quote..
+              if (*cp == CHAR_TYPE ('\0'))
+                {
+                  argc--;
+                  break;
+                }
+              else
+                cp++;
+            }
+          else
+            cp++;
+        }
+    }
+
+  // Second pass: copy arguments.
+  CHAR_TYPE arg[ACE_DEFAULT_ARGV_BUFSIZ];
+  CHAR_TYPE *argp = arg;
+
+  // Make sure that the buffer we're copying into is always large
+  // enough.
+  if (cp - buf >= ACE_DEFAULT_ARGV_BUFSIZ)
+    ACE_NEW_RETURN (argp,
+                    CHAR_TYPE[cp - buf + 1],
+                    -1);
+
+  // Make a new argv vector of argc + 1 elements.
+  ACE_NEW_RETURN (argv,
+                  CHAR_TYPE *[argc + 1],
+                  -1);
+
+  CHAR_TYPE *ptr = buf;
+
+  for (int i = 0; i < argc; i++)
+    {
+      // Skip whitespace..
+      while (ACE_OS::ace_isspace (*ptr))
+        ptr++;
+
+      // Copy next argument and move to next whitespace..
+      cp = argp;
+      while (*ptr != CHAR_TYPE ('\0') && !ACE_OS::ace_isspace (*ptr))
+        if (*ptr == CHAR_TYPE ('\'') || *ptr == CHAR_TYPE ('"'))
+          {
+            CHAR_TYPE quote = *ptr++;
+
+            while (*ptr != CHAR_TYPE ('\0') && *ptr != quote)
+              *cp++ = *ptr++;
+
+            if (*ptr == quote)
+              ptr++;
+          }
+        else
+          *cp++ = *ptr++;
+
+      *cp = CHAR_TYPE ('\0');
+
+#if !defined (ACE_LACKS_ENV)
+      // Check for environment variable substitution here.
+      if (substitute_env_args)
+      {
+          ACE_TCHAR* dup = ACE_OS::strenvdup(ACE_TEXT_TO_TCHAR_IN(argp));
+          argv[i] = ACE::String_Conversion::Convert_Out< CHAR_TYPE >(dup).c_str();
+          delete[] dup;
+
+          if (argv[i] == 0)
+            {
+              if (argp != arg)
+                delete [] argp;
+              errno = ENOMEM;
+              return -1;
+            }
+      }
+      else
+#endif /* ACE_LACKS_ENV */
+        {
+          argv[i] = ACE_OS::strdup(argp);
+
+          if (argv[i] == 0)
+            {
+              if (argp != arg)
+                delete [] argp;
+              errno = ENOMEM;
+              return -1;
+            }
+        }
+    }
+
+  if (argp != arg)
+    delete [] argp;
+
+  argv[argc] = 0;
+  return 0;
+}
diff --git a/ace/OS_NS_wchar.cpp b/ace/OS_NS_wchar.cpp
index bc6fd7bae93..b6701492a67 100644
--- a/ace/OS_NS_wchar.cpp
+++ b/ace/OS_NS_wchar.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
-#include "ace/OS_NS_wchar.h"
+# include "ace/OS_NS_wchar.h"
 
-ACE_RCSID(ace, OS_NS_wchar, "$Id$")
+ACE_RCSID(ace, OS_NS_wchar_t, "$Id$")
 
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_wchar.inl"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
-#if defined (ACE_HAS_WCHAR)
-#  include "ace/OS_NS_ctype.h"
-#  include "ace/OS_NS_string.h"
-#endif /* ACE_HAS_WCHAR */
+#include "ace/OS_NS_ctype.h"
+#include "ace/OS_NS_string.h"
 
 // The following wcs*_emulation methods were created based on BSD code:
 /*-
@@ -52,7 +50,8 @@ ACE_RCSID(ace, OS_NS_wchar, "$Id$")
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCAT)
+#if defined (ACE_LACKS_WCSCAT)
+
 wchar_t *
 ACE_OS::wcscat_emulation (wchar_t *destination,
                           const wchar_t *source)
@@ -63,9 +62,9 @@ ACE_OS::wcscat_emulation (wchar_t *destination,
   while ((*destination++ = *source++));
   return save;
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCAT */
+#endif /* ACE_LACKS_WCSCAT */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCHR)
+#if defined (ACE_LACKS_WCSCHR)
 wchar_t *
 ACE_OS::wcschr_emulation (const wchar_t *string, wint_t c)
 {
@@ -75,21 +74,21 @@ ACE_OS::wcschr_emulation (const wchar_t *string, wint_t c)
 
   return 0;
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCHR */
+#endif /* ACE_LACKS_WCSCHR */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSCMP)
+#if defined (ACE_LACKS_WCSCMP)
 int
-ACE_OS::wcscmp_emulation (const ACE_WCHAR_T *string1,
-                          const ACE_WCHAR_T *string2)
+ACE_OS::wcscmp_emulation (const wchar_t *string1,
+                          const wchar_t *string2)
 {
   while (*string1 == *string2++)
     if (*string1++ == 0)
       return (0);
   return (*string1 - *--string2);
 }
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */
+#endif /* ACE_LACKS_WCSCMP */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCPY)
+#if defined (ACE_LACKS_WCSCPY)
 wchar_t *
 ACE_OS::wcscpy_emulation (wchar_t *destination,
                           const wchar_t *source)
@@ -99,9 +98,9 @@ ACE_OS::wcscpy_emulation (wchar_t *destination,
   for (; (*destination = *source); ++source, ++destination);
   return save;
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCPY */
+#endif /* ACE_LACKS_WCSCPY */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCSPN)
+#if defined (ACE_LACKS_WCSCSPN)
 size_t
 ACE_OS::wcscspn_emulation (const wchar_t *s, const wchar_t *reject)
 {
@@ -121,9 +120,9 @@ ACE_OS::wcscspn_emulation (const wchar_t *s, const wchar_t *reject)
 
   return count;
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCSPN */
+#endif /* ACE_LACKS_WCSCSPN */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSICMP)
+#if defined (ACE_LACKS_WCSICMP)
 int
 ACE_OS::wcsicmp_emulation (const wchar_t *s, const wchar_t *t)
 {
@@ -151,31 +150,31 @@ ACE_OS::wcsicmp_emulation (const wchar_t *s, const wchar_t *t)
   else
     return ACE_OS::ace_tolower (*scan1) - ACE_OS::ace_towlower (*scan2);
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSICMP */
+#endif /* ACE_LACKS_WCSICMP */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSLEN)
+#if defined (ACE_LACKS_WCSLEN)
 size_t
-ACE_OS::wcslen_emulation (const ACE_WCHAR_T *string)
+ACE_OS::wcslen_emulation (const wchar_t *string)
 {
-  const ACE_WCHAR_T *s;
+  const wchar_t *s;
 
   for (s = string; *s; ++s)
     continue;
 
   return s - string;
 }
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */
+#endif /* ACE_LACKS_WCSLEN */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT)
-ACE_WCHAR_T *
-ACE_OS::wcsncat_emulation (ACE_WCHAR_T *destination,
-                           const ACE_WCHAR_T *source,
+#if defined (ACE_LACKS_WCSNCAT)
+wchar_t *
+ACE_OS::wcsncat_emulation (wchar_t *destination,
+                           const wchar_t *source,
                            size_t count)
 {
   if (count != 0)
     {
-      ACE_WCHAR_T *d = destination;
-      const ACE_WCHAR_T *s = source;
+      wchar_t *d = destination;
+      const wchar_t *s = source;
 
       while (*d != 0)
         d++;
@@ -193,12 +192,12 @@ ACE_OS::wcsncat_emulation (ACE_WCHAR_T *destination,
 
   return destination;
 }
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCAT */
+#endif /* ACE_LACKS_WCSCAT */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCMP)
+#if defined (ACE_LACKS_WCSNCMP)
 int
-ACE_OS::wcsncmp_emulation (const ACE_WCHAR_T *s1,
-                           const ACE_WCHAR_T *s2,
+ACE_OS::wcsncmp_emulation (const wchar_t *s1,
+                           const wchar_t *s2,
                            size_t len)
 {
   if (len == 0)
@@ -214,18 +213,18 @@ ACE_OS::wcsncmp_emulation (const ACE_WCHAR_T *s1,
 
   return 0;
 }
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCMP */
+#endif /* ACE_LACKS_WCSNCMP */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCPY)
-ACE_WCHAR_T *
-ACE_OS::wcsncpy_emulation (ACE_WCHAR_T *destination,
-                           const ACE_WCHAR_T *source,
+#if defined (ACE_LACKS_WCSNCPY)
+wchar_t *
+ACE_OS::wcsncpy_emulation (wchar_t *destination,
+                           const wchar_t *source,
                            size_t len)
 {
   if (len != 0)
     {
-      ACE_WCHAR_T *d = destination;
-      const ACE_WCHAR_T *s = source;
+      wchar_t *d = destination;
+      const wchar_t *s = source;
 
       do
         {
@@ -241,9 +240,9 @@ ACE_OS::wcsncpy_emulation (ACE_WCHAR_T *destination,
 
   return destination;
 }
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCPY */
+#endif /* ACE_LACKS_WCSNCPY */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSNICMP)
+#if defined (ACE_LACKS_WCSNICMP)
 int
 ACE_OS::wcsnicmp_emulation (const wchar_t *s,
                             const wchar_t *t,
@@ -278,9 +277,9 @@ ACE_OS::wcsnicmp_emulation (const wchar_t *s,
   else
     return ACE_OS::ace_towlower (*scan1) - ACE_OS::ace_towlower (*scan2);
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNICMP */
+#endif /* ACE_LACKS_WCSNICMP */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSPBRK)
+#if defined (ACE_LACKS_WCSPBRK)
 wchar_t *
 ACE_OS::wcspbrk_emulation (const wchar_t *string,
                            const wchar_t *charset)
@@ -297,9 +296,9 @@ ACE_OS::wcspbrk_emulation (const wchar_t *string,
 
   return 0;
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSPBRK */
+#endif /* ACE_LACKS_WCSPBRK */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSRCHR)
+#if defined (ACE_LACKS_WCSRCHR)
 const wchar_t *
 ACE_OS::wcsrchr_emulation (const wchar_t *s, wint_t c)
 {
@@ -327,9 +326,9 @@ ACE_OS::wcsrchr_emulation (wchar_t *s, wint_t c)
 
   return p;
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSRCHR */
+#endif /* ACE_LACKS_WCSRCHR */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSPN)
+#if defined (ACE_LACKS_WCSSPN)
 size_t
 ACE_OS::wcsspn_emulation (const wchar_t *string,
                           const wchar_t *charset)
@@ -346,9 +345,9 @@ cont:
       goto cont;
   return (p - 1 - string);
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSPN */
+#endif /* ACE_LACKS_WCSSPN */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSTR)
+#if defined (ACE_LACKS_WCSSTR)
 wchar_t *
 ACE_OS::wcsstr_emulation (const wchar_t *string,
                           const wchar_t *charset)
@@ -372,6 +371,6 @@ ACE_OS::wcsstr_emulation (const wchar_t *string,
 
   return const_cast<wchar_t *> (string);
 }
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSTR */
+#endif /* ACE_LACKS_WCSSTR */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_wchar.h b/ace/OS_NS_wchar.h
index 55999db6e59..4568629183a 100644
--- a/ace/OS_NS_wchar.h
+++ b/ace/OS_NS_wchar.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file   OS_NS_wchar.h
+ *  @file   OS_NS_wchar_t.h
  *
  *  $Id$
  *
@@ -14,8 +14,8 @@
  */
 //=============================================================================
 
-#ifndef ACE_OS_NS_WCHAR_H
-# define ACE_OS_NS_WCHAR_H
+#ifndef ACE_OS_NS_wchar_t_H
+# define ACE_OS_NS_wchar_t_H
 
 # include /**/ "ace/pre.h"
 
@@ -25,10 +25,9 @@
 #  pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/os_include/os_wchar.h"
+#include "ace/ace_wchar.h"
 #include "ace/Basic_Types.h"
 #include "ace/ACE_export.h"
-#include "ace/ace_wchar.h" // include for the time being, but this code needs to be moved.  dhinton
 
 #include "ace/os_include/os_errno.h"
 
@@ -42,100 +41,96 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE_OS
 {
 
-  typedef ACE_WCHAR_T WChar;
-
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   wint_t fgetwc (FILE* fp);
-#endif /* ACE_HAS_WCHAR */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCAT)
+#if defined (ACE_LACKS_WCSCAT)
   /// Emulated wcscat - Appends a string.
   extern ACE_Export
   wchar_t *wcscat_emulation (wchar_t *destination,
                                     const wchar_t *source);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCAT */
+#endif /* ACE_LACKS_WCSCAT */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCHR)
+#if defined (ACE_LACKS_WCSCHR)
   /// Emulated wcschr - Finds a character in a string.
   extern ACE_Export
   wchar_t *wcschr_emulation (const wchar_t *string, wint_t c);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCHR */
+#endif /* ACE_LACKS_WCSCHR */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSCMP)
+#if defined (ACE_LACKS_WCSCMP)
   /// Emulated wcscmp - Compares strings.
   extern ACE_Export
-  int wcscmp_emulation (const ACE_WCHAR_T *string1, const ACE_WCHAR_T *string2);
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCMP */
+  int wcscmp_emulation (const wchar_t *string1, const wchar_t *string2);
+#endif /* ACE_LACKS_WCSCMP */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCPY)
+#if defined (ACE_LACKS_WCSCPY)
   /// Emulated wcscpy - Copies a string.
   extern ACE_Export
   wchar_t *wcscpy_emulation (wchar_t *destination,
                              const wchar_t *source);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCPY */
+#endif /* ACE_LACKS_WCSCPY */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCSPN)
+#if defined (ACE_LACKS_WCSCSPN)
   /// Emulated wcscspn.
   extern ACE_Export
   size_t wcscspn_emulation (const wchar_t *string,
                             const wchar_t *reject);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCSPN */
+#endif /* ACE_LACKS_WCSCSPN */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSICMP)
+#if defined (ACE_LACKS_WCSICMP)
   /// Emulated wcsicmp - Performs a case insensitive comparison of strings.
   extern ACE_Export
   int wcsicmp_emulation (const wchar_t *string1,
                          const wchar_t *string2);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSICMP */
+#endif /* ACE_LACKS_WCSICMP */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSLEN)
+#if defined (ACE_LACKS_WCSLEN)
   /// Emulated wcslen - Returns the length of a string.
   extern ACE_Export
-  size_t wcslen_emulation (const ACE_WCHAR_T *string);
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */
+  size_t wcslen_emulation (const wchar_t *string);
+#endif /* ACE_LACKS_WCSLEN */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCAT)
+#if defined (ACE_LACKS_WCSNCAT)
   /// Emulated wcscat - Appends a string.
   extern ACE_Export
-  ACE_WCHAR_T *wcsncat_emulation (ACE_WCHAR_T *destination,
-                                  const ACE_WCHAR_T *source,
+  wchar_t *wcsncat_emulation (wchar_t *destination,
+                                  const wchar_t *source,
                                   size_t count);
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSCAT */
+#endif /* ACE_LACKS_WCSCAT */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCMP)
+#if defined (ACE_LACKS_WCSNCMP)
   /// Emulated wcsncmp - Compares two arrays.
   extern ACE_Export
-  int wcsncmp_emulation (const ACE_WCHAR_T *string1,
-                         const ACE_WCHAR_T *string2,
+  int wcsncmp_emulation (const wchar_t *string1,
+                         const wchar_t *string2,
                          size_t len);
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCMP */
+#endif /* ACE_LACKS_WCSNCMP */
 
-#if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSNCPY)
+#if defined (ACE_LACKS_WCSNCPY)
   /// Emulated wcsncpy - Copies an array.
   extern ACE_Export
-  ACE_WCHAR_T *wcsncpy_emulation (ACE_WCHAR_T *destination,
-                                  const ACE_WCHAR_T *source,
+  wchar_t *wcsncpy_emulation (wchar_t *destination,
+                                  const wchar_t *source,
                                   size_t len);
-#endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSNCPY */
+#endif /* ACE_LACKS_WCSNCPY */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSNICMP)
+#if defined (ACE_LACKS_WCSNICMP)
   /// Emulated wcsnicmp - Performs a case insensitive comparison of two
   /// arrays
   extern ACE_Export
   int wcsnicmp_emulation (const wchar_t *string1,
                           const wchar_t *string2,
                           size_t len);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNICMP */
+#endif /* ACE_LACKS_WCSNICMP */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSPBRK)
+#if defined (ACE_LACKS_WCSPBRK)
   /// Emulated wcspbrk - Searches for characters in a string.
   extern ACE_Export
   wchar_t *wcspbrk_emulation (const wchar_t *string,
                               const wchar_t *charset);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSPBRK */
+#endif /* ACE_LACKS_WCSPBRK */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSRCHR)
+#if defined (ACE_LACKS_WCSRCHR)
   /// Emulated wcsrchr (wchar_t version) - Finds the last occurance of a
   /// character in a string.
   extern ACE_Export
@@ -145,43 +140,41 @@ namespace ACE_OS
   /// character in a string.
   extern ACE_Export
   const wchar_t *wcsrchr_emulation (const wchar_t *string, wint_t c);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSRCHR */
+#endif /* ACE_LACKS_WCSRCHR */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSPN)
+#if defined (ACE_LACKS_WCSSPN)
   /// Emulated wcsspn.
   extern ACE_Export
   size_t wcsspn_emulation (const wchar_t *string,
                            const wchar_t *charset);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSPN */
+#endif /* ACE_LACKS_WCSSPN */
 
-#if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSSTR)
+#if defined (ACE_LACKS_WCSSTR)
   /// Emulated wcsstr - Performs a case insensitive comparison of two strings.
   extern ACE_Export
   wchar_t *wcsstr_emulation (const wchar_t *string,
                              const wchar_t *charset);
-#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSSTR */
+#endif /* ACE_LACKS_WCSSTR */
 
   // these are named wrong.  should be wcslen, etc... dhinton
   ACE_NAMESPACE_INLINE_FUNCTION
-  u_int wslen (const WChar *);
+  u_int wslen (const wchar_t *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  WChar *wscpy (WChar *,
-                const WChar *);
+  wchar_t *wscpy (wchar_t *,
+                const wchar_t *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int wscmp (const WChar *,
-             const WChar *);
+  int wscmp (const wchar_t *,
+             const wchar_t *);
 
   ACE_NAMESPACE_INLINE_FUNCTION
-  int wsncmp (const WChar *,
-              const WChar *,
+  int wsncmp (const wchar_t *,
+              const wchar_t *,
               size_t len);
 
-#if defined (ACE_HAS_WCHAR)
   ACE_NAMESPACE_INLINE_FUNCTION
   wint_t ungetwc (wint_t c, FILE* fp);
-#endif /* ACE_HAS_WCHAR */
 
 } /* namespace ACE_OS */
 
diff --git a/ace/OS_NS_wchar.inl b/ace/OS_NS_wchar.inl
index 7f2abac8d8f..19cddfcb413 100644
--- a/ace/OS_NS_wchar.inl
+++ b/ace/OS_NS_wchar.inl
@@ -4,7 +4,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_WCHAR)
+
 ACE_INLINE wint_t
 ACE_OS::fgetwc (FILE* fp)
 {
@@ -15,10 +15,9 @@ ACE_OS::fgetwc (FILE* fp)
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::fgetwc (fp), wint_t, WEOF);
 #  endif /* ACE_LACKS_FGETWC */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE u_int
-ACE_OS::wslen (const WChar *s)
+ACE_OS::wslen (const wchar_t *s)
 {
   u_int len = 0;
 
@@ -28,10 +27,10 @@ ACE_OS::wslen (const WChar *s)
   return len;
 }
 
-ACE_INLINE ACE_OS::WChar *
-ACE_OS::wscpy (WChar *dest, const WChar *src)
+ACE_INLINE wchar_t *
+ACE_OS::wscpy (wchar_t *dest, const wchar_t *src)
 {
-  WChar *original_dest = dest;
+  wchar_t *original_dest = dest;
 
   while ((*dest++ = *src++) != 0)
     continue;
@@ -40,10 +39,10 @@ ACE_OS::wscpy (WChar *dest, const WChar *src)
 }
 
 ACE_INLINE int
-ACE_OS::wscmp (const WChar *s, const WChar *t)
+ACE_OS::wscmp (const wchar_t *s, const wchar_t *t)
 {
-  const WChar *scan1 = s;
-  const WChar *scan2 = t;
+  const wchar_t *scan1 = s;
+  const wchar_t *scan2 = t;
 
   while (*scan1 != 0 && *scan1 == *scan2)
     {
@@ -55,10 +54,10 @@ ACE_OS::wscmp (const WChar *s, const WChar *t)
 }
 
 ACE_INLINE int
-ACE_OS::wsncmp (const WChar *s, const WChar *t, size_t len)
+ACE_OS::wsncmp (const wchar_t *s, const wchar_t *t, size_t len)
 {
-  const WChar *scan1 = s;
-  const WChar *scan2 = t;
+  const wchar_t *scan1 = s;
+  const wchar_t *scan2 = t;
 
   while (len != 0 && *scan1 != 0 && *scan1 == *scan2)
     {
@@ -70,7 +69,6 @@ ACE_OS::wsncmp (const WChar *s, const WChar *t, size_t len)
   return len == 0 ? 0 : *scan1 - *scan2;
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE wint_t
 ACE_OS::ungetwc (wint_t c, FILE* fp)
 {
@@ -82,6 +80,5 @@ ACE_OS::ungetwc (wint_t c, FILE* fp)
   ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::ungetwc (c, fp), wint_t, WEOF);
 #  endif /* ACE_LACKS_FGETWC */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_main.cpp b/ace/OS_main.cpp
index 65087b8057b..79e8413bea9 100644
--- a/ace/OS_main.cpp
+++ b/ace/OS_main.cpp
@@ -138,7 +138,7 @@ int ACE_Main_Base::run (HINSTANCE,
 {
   ACE_TCHAR cmdline[1024];
   ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program "));
-  ACE_OS::strcat (cmdline, ACE_TEXT_WCHAR_TO_TCHAR (lpCmdLine));
+  ACE_OS::strcat (cmdline, ACE_TEXT_TO_TCHAR_IN (lpCmdLine));
   ACE_ARGV ce_argv (cmdline);
   ACE::init ();
   ACE_MAIN_OBJECT_MANAGER
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 70477591e56..293864096b3 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -158,7 +158,7 @@ template <class T> class ACE_Cleanup_Adapter;
  * With ACE_HAS_NONSTATIC_OBJECT_MANAGER enabled, the ACE
  * library has no static objects that require destruction.
  * However, there are two drawbacks to using it:
- * 1) main (int, char *[]) must be declared with arguments, even
+ * 1) ACE_TMAIN (int, ACE_TCHAR *[]) must be declared with arguments, even
  * if they're not used.  All of ACE is converted to this, so
  * just applications have to be concerned with it.
  * 2) If there any static objects that depend on those that are
diff --git a/ace/Object_Manager_Base.cpp b/ace/Object_Manager_Base.cpp
index f61247558e9..185ab58d5be 100644
--- a/ace/Object_Manager_Base.cpp
+++ b/ace/Object_Manager_Base.cpp
@@ -409,7 +409,7 @@ ACE_OS_Object_Manager::print_error_message (unsigned int line_number,
 #if !defined (ACE_HAS_WINCE)
   fprintf (stderr, "ace/OS.cpp, line %u: %s ",
            line_number,
-           ACE_TEXT_ALWAYS_CHAR (message));
+           ACE_TEXT_TO_CHAR_IN (message));
   perror ("failed");
 #else
   // @@ Need to use the following information.
diff --git a/ace/Obstack.cpp b/ace/Obstack.cpp
new file mode 100644
index 00000000000..792a398ba8a
--- /dev/null
+++ b/ace/Obstack.cpp
@@ -0,0 +1,15 @@
+// $Id$
+
+#include "ace/Obstack.h"
+
+ACE_RCSID(ace, Obstack, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Obstack_T<char>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Obstack_T<char>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Process.cpp b/ace/Process.cpp
index 1aa0adbd4e9..dcf34f36c16 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -350,8 +350,8 @@ ACE_Process::spawn (ACE_Process_Options &options)
         // releasing any of the converted string memory since this
         // process will either exec() or exit() shortly.
 # if defined (ACE_USES_WCHAR)
-        ACE_Wide_To_Ascii n_procname (options.process_name ());
-        const char *procname = n_procname.char_rep ();
+        ACE::String_Conversion::Convert_In< char, wchar_t  > n_procname (options.process_name ());
+        const char *procname = n_procname.c_str ();
 
         wchar_t * const *wargv = options.command_line_argv ();
         size_t vcount, i;
@@ -359,8 +359,9 @@ ACE_Process::spawn (ACE_Process_Options &options)
           ;
         char **procargv = new char *[vcount + 1];  // Need 0 at the end
         procargv[vcount] = 0;
+
         for (i = 0; i < vcount; ++i)
-          procargv[i] = ACE_Wide_To_Ascii::convert (wargv[i]);
+          procargv[i] = ACE_TEXT_TO_CHAR_OUT (wargv[i]); // memory allocated!
 
         wargv = options.env_argv ();
         for (vcount = 0; wargv[vcount] != 0; ++vcount)
@@ -368,7 +369,7 @@ ACE_Process::spawn (ACE_Process_Options &options)
         char **procenv = new char *[vcount + 1];  // Need 0 at the end
         procenv[vcount] = 0;
         for (i = 0; i < vcount; ++i)
-          procenv[i] = ACE_Wide_To_Ascii::convert (wargv[i]);
+          procenv[i] = ACE_TEXT_TO_CHAR_OUT (wargv[i]); // memory allocated!
 # else
         const char *procname = options.process_name ();
         char *const *procargv = options.command_line_argv ();
@@ -963,7 +964,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...)
   return 0;
 }
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE)
+#if !defined (ACE_HAS_WINCE)
 /**
  * @note Not available on Windows CE because it doesn't have a char version of
  * vsprintf.
@@ -989,14 +990,14 @@ ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...)
   va_end (argp);
 
   ACE_OS::strcpy (this->command_line_buf_,
-                  ACE_TEXT_ANTI_TO_TCHAR (anti_clb));
+                  ACE_TEXT_TO_TCHAR_IN (anti_clb));
 
   delete [] anti_clb;
 
   command_line_argv_calculated_ = 0;
   return 0;
 }
-#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */
+#endif /* !ACE_HAS_WINCE */
 
 ACE_TCHAR *
 ACE_Process_Options::env_buf (void)
diff --git a/ace/Process.h b/ace/Process.h
index 98582720e1c..6c057bd2ed7 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -128,10 +128,8 @@ public:
   /// be <= MAXPATHLEN.
   void working_directory (const char *wd);
 
-#if defined (ACE_HAS_WCHAR)
   /// wchar_t version of working_directory
   void working_directory (const wchar_t *wd);
-#endif /* ACE_HAS_WCHAR */
 
   /**
    * Set the command-line arguments.  @a format can use any printf
@@ -144,10 +142,10 @@ public:
    */
   int command_line (const ACE_TCHAR *format, ...);
 
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE)
+#if !defined (ACE_HAS_WINCE)
   /// Anti-TChar version of command_line ()
   int command_line (const ACE_ANTI_TCHAR *format, ...);
-#endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */
+#endif /* !ACE_HAS_WINCE */
 
   /// Same as above in argv format.  @a argv must be null terminated.
   int command_line (const ACE_TCHAR * const argv[]);
diff --git a/ace/Process.inl b/ace/Process.inl
index 3b9b18f6429..5af3893100f 100644
--- a/ace/Process.inl
+++ b/ace/Process.inl
@@ -250,7 +250,7 @@ ACE_INLINE int
 ACE_Process_Options::setreugid (const ACE_TCHAR* user)
 {
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
-  struct passwd *ent = ACE_OS::getpwnam (ACE_TEXT_ALWAYS_CHAR (user));
+  struct passwd *ent = ACE_OS::getpwnam (ACE_TEXT_TO_CHAR_IN (user));
 
   if (ent != 0)
     {
@@ -342,23 +342,21 @@ ACE_INLINE void
 ACE_Process_Options::working_directory (const char *wd)
 {
 #if !defined(ACE_HAS_WINCE)
-  ACE_OS::strcpy (working_directory_, ACE_TEXT_CHAR_TO_TCHAR (wd));
+  ACE_OS::strcpy (working_directory_, ACE_TEXT_TO_TCHAR_IN (wd));
 #else
   ACE_UNUSED_ARG (wd);
 #endif /* !ACE_HAS_WINCE */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_INLINE void
 ACE_Process_Options::working_directory (const wchar_t *wd)
 {
 #if !defined(ACE_HAS_WINCE)
-  ACE_OS::strcpy (working_directory_, ACE_TEXT_WCHAR_TO_TCHAR (wd));
+  ACE_OS::strcpy (working_directory_, ACE_TEXT_TO_TCHAR_IN (wd));
 #else
   ACE_UNUSED_ARG (wd);
 #endif /* !ACE_HAS_WINCE */
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE void
 ACE_Process_Options::process_name (const ACE_TCHAR *p)
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index 5324903d8dd..f476fc04a10 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -354,7 +354,7 @@ ACE_Process_Manager::handle_signal (int,
           {
             ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, lock_, -1));
 
-            ssize_t const i = this->find_proc (proc);
+            ssize_t i = this->find_proc (proc);
             if (i == -1)
               return -1;
 #if 0
@@ -400,7 +400,7 @@ ACE_Process_Manager::register_handler (ACE_Event_Handler *eh,
       return 0;
     }
 
-  ssize_t const i = this->find_proc (pid);
+  ssize_t i = this->find_proc (pid);
 
   if (i == -1)
     {
@@ -443,7 +443,7 @@ ACE_Process_Manager::spawn (ACE_Process *process,
 {
   ACE_TRACE ("ACE_Process_Manager::spawn");
 
-  pid_t const pid = process->spawn (options);
+  pid_t pid = process->spawn (options);
 
   // Only include the pid in the parent's table.
   if (pid == ACE_INVALID_PID || pid == 0)
@@ -479,7 +479,7 @@ ACE_Process_Manager::spawn_n (size_t n,
        i < n;
        i++)
     {
-      pid_t const pid = this->spawn (options, event_handler);
+      pid_t pid = this->spawn (options, event_handler);
       if (pid == ACE_INVALID_PID || pid == 0)
         // We're in the child or something's gone wrong.
         return pid;
@@ -521,7 +521,7 @@ ACE_Process_Manager::append_proc (ACE_Process *proc,
   // automagically.  Get a handle to this new Process and tell the
   // Reactor we're interested in <handling_input> on it.
 
-  ACE_Reactor * const r = this->reactor ();
+  ACE_Reactor *r = this->reactor ();
   if (r != 0)
     r->register_handler (this, proc->gethandle ());
 #endif /* ACE_WIN32 */
@@ -556,7 +556,7 @@ ACE_Process_Manager::remove (pid_t pid)
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
 
-  ssize_t const i = this->find_proc (pid);
+  ssize_t i = this->find_proc (pid);
 
   if (i != -1)
     return this->remove_proc (i);
@@ -584,7 +584,7 @@ ACE_Process_Manager::remove_proc (size_t i)
     }
 
 #if defined (ACE_WIN32)
-  ACE_Reactor * const r = this->reactor ();
+  ACE_Reactor *r = this->reactor ();
   if (r != 0)
     r->remove_handler (this->process_table_[i].process_->gethandle (),
                        ACE_Event_Handler::DONT_CALL);
@@ -643,7 +643,7 @@ ACE_Process_Manager::terminate (pid_t pid,
 
   // Check for duplicates and bail out if they're already
   // registered...
-  ssize_t const i = this->find_proc (pid);
+  ssize_t i = this->find_proc (pid);
 
   if (i == -1)
     // set "no such process" error
@@ -655,16 +655,16 @@ ACE_Process_Manager::terminate (pid_t pid,
 
 int
 ACE_Process_Manager::set_scheduler (const ACE_Sched_Params & params,
-                                    pid_t pid)
+                                         pid_t pid)
 {
-  ACE_TRACE ("ACE_Process_Manager::set_scheduler");
+  ACE_TRACE ("ACE_Process_Manager::sched_setscheduler");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
                             ace_mon, this->lock_, -1));
 
   // Check to see if the process identified by the given pid is managed by
   // this instance of ACE_Process_Manager.
-  ssize_t const i = this->find_proc (pid);
+  ssize_t i = this->find_proc (pid);
 
   if (i == -1)
     // set "no such process" error
@@ -676,14 +676,14 @@ ACE_Process_Manager::set_scheduler (const ACE_Sched_Params & params,
 int
 ACE_Process_Manager::set_scheduler_all (const ACE_Sched_Params & params)
 {
-  ACE_TRACE ("ACE_Process_Manager::set_scheduler_all");
+  ACE_TRACE ("ACE_Process_Manager::setscheduler_all");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex,
                             ace_mon, this->lock_, -1));
-
+  pid_t pid;
   for (size_t i = 0; i < this->current_count_; ++i)
     {
-      pid_t const pid = this->process_table_[i].process_->getpid ();
+      pid = this->process_table_[i].process_->getpid ();
       if (ACE_OS::sched_params (params, pid) != 0)
         return -1;
     }
@@ -740,7 +740,7 @@ ACE_Process_Manager::wait (const ACE_Time_Value &timeout)
 
   while (this->current_count_ > 0)
     {
-      pid_t const pid = this->wait (0, remaining);
+      pid_t pid = this->wait (0, remaining);
 
       if (pid == ACE_INVALID_PID)       // wait() failed
         return -1;
diff --git a/ace/Process_Mutex.cpp b/ace/Process_Mutex.cpp
index 9aba33a7894..6078bfdbc68 100644
--- a/ace/Process_Mutex.cpp
+++ b/ace/Process_Mutex.cpp
@@ -40,7 +40,7 @@ ACE_Process_Mutex::unique_name (void)
 
 ACE_Process_Mutex::ACE_Process_Mutex (const char *name, void *arg, mode_t mode)
 #if defined (_ACE_USE_SV_SEM)
-  : lock_ (name ? name : ACE_TEXT_ALWAYS_CHAR (this->unique_name ()),
+  : lock_ (name ? name : ACE_TEXT_TO_CHAR_IN (this->unique_name ()),
            ACE_SV_Semaphore_Complex::ACE_CREATE,
            1,
            1,
@@ -48,7 +48,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const char *name, void *arg, mode_t mode)
 #else
   : lock_ (USYNC_PROCESS,
            name ?
-             ACE_TEXT_CHAR_TO_TCHAR (name) : this->unique_name (),
+             ACE_TEXT_TO_TCHAR_IN (name) : this->unique_name (),
            (ACE_mutexattr_t *) arg,
            mode)
 #endif /* _ACE_USE_SV_SEM */
@@ -58,14 +58,13 @@ ACE_Process_Mutex::ACE_Process_Mutex (const char *name, void *arg, mode_t mode)
 #endif /* !_ACE_USE_SV_SEM */
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name,
                                       void *arg,
                                       mode_t mode)
 #if defined (_ACE_USE_SV_SEM)
   : lock_ (name ?
-             ACE_Wide_To_Ascii (name).char_rep () :
-             ACE_TEXT_ALWAYS_CHAR (this->unique_name ()),
+             ACE_TEXT_TO_CHAR_IN (name) :
+             ACE_TEXT_TO_CHAR_IN (this->unique_name ()),
            ACE_SV_Semaphore_Complex::ACE_CREATE,
            1,
            1,
@@ -73,7 +72,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name,
 #else
   : lock_ (USYNC_PROCESS,
            name ?
-             ACE_TEXT_WCHAR_TO_TCHAR (name) : this->unique_name (),
+             ACE_TEXT_TO_TCHAR_IN (name) : this->unique_name (),
            (ACE_mutexattr_t *) arg,
            mode)
 #endif /* _ACE_USE_SV_SEM */
@@ -82,7 +81,7 @@ ACE_Process_Mutex::ACE_Process_Mutex (const wchar_t *name,
   ACE_UNUSED_ARG (arg);
 #endif /* _ACE_USE_SV_SEM */
 }
-#endif /* ACE_HAS_WCHAR */
+
 ACE_Process_Mutex::~ACE_Process_Mutex (void)
 {
 }
diff --git a/ace/Process_Mutex.h b/ace/Process_Mutex.h
index 130f59980f1..604d7ee0c80 100644
--- a/ace/Process_Mutex.h
+++ b/ace/Process_Mutex.h
@@ -90,8 +90,6 @@ public:
   ACE_Process_Mutex (const char *name = 0,
                      void *arg = 0,
                      mode_t mode = ACE_DEFAULT_FILE_PERMS);
-
-#if defined (ACE_HAS_WCHAR)
   /**
    * Create a Process_Mutex, passing in the optional @c name. (@c wchar_t
    * version)
@@ -109,7 +107,6 @@ public:
   ACE_Process_Mutex (const wchar_t *name,
                      void *arg = 0,
                      mode_t mode = ACE_DEFAULT_FILE_PERMS);
-#endif /* ACE_HAS_WCHAR */
 
   ~ACE_Process_Mutex (void);
 
diff --git a/ace/Process_Semaphore.cpp b/ace/Process_Semaphore.cpp
index 952f20a99f6..1ac13b44065 100644
--- a/ace/Process_Semaphore.cpp
+++ b/ace/Process_Semaphore.cpp
@@ -32,7 +32,7 @@ ACE_Process_Semaphore::ACE_Process_Semaphore (u_int count,
 #if defined (ACE_WIN32) || defined (ACE_HAS_POSIX_SEM) || defined (ACE_PSOS)
   : lock_ (count, USYNC_PROCESS, name, arg, max)
 #else
-  : lock_ (ACE_TEXT_ALWAYS_CHAR (name),
+  : lock_ (ACE_TEXT_TO_CHAR_IN (name),
            ACE_SV_Semaphore_Complex::ACE_CREATE,
            count)
 #endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM || ACE_PSOS */
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
index 548c56bef12..408d5f22a62 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
@@ -134,8 +134,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
             if (this->subscribe (mcast_addr,
                                  qos_params,
                                  reuse_addr,
-                                 ACE_TEXT_CHAR_TO_TCHAR
-                                   (if_addrs[if_cnt].get_host_addr()),
+                                 ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr()),
                                  protocol_family,
                                  protocol,
                                  protocolinfo) == 0)
diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp
index e382af8482e..465da31d34b 100644
--- a/ace/Registry_Name_Space.cpp
+++ b/ace/Registry_Name_Space.cpp
@@ -82,7 +82,7 @@ ACE_Registry_Name_Space::bind (const ACE_NS_WString &name,
 #else
   return this->context_.bind (name.char_rep(),
                               object);
-#endif /* ACE_HAS_WCHAR */
+#endif /* ACE_USES_WCHAR */
 }
 
 
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index 2b55cf684a5..2d3f7795e38 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -46,12 +46,12 @@ ACE_Remote_Name_Space::bind (const ACE_NS_WString &name,
                              const char *type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::bind");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> value_urep (value.rep ());
   ACE_UINT32 name_len =
-    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (name.length () * sizeof (wchar_t));
   ACE_UINT32 value_len =
-    static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (value.length () * sizeof (wchar_t));
   ACE_UINT32 type_len =
     static_cast<ACE_UINT32> (ACE_OS::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::BIND,
@@ -70,12 +70,12 @@ ACE_Remote_Name_Space::rebind (const ACE_NS_WString &name,
                                const char *type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::rebind");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> value_urep (value.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> value_urep (value.rep ());
   ACE_UINT32 name_len =
-    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (name.length () * sizeof (wchar_t));
   ACE_UINT32 value_len =
-    static_cast<ACE_UINT32> (value.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (value.length () * sizeof (wchar_t));
   ACE_UINT32 type_len =
     static_cast<ACE_UINT32> (ACE_OS::strlen (type));
   ACE_Name_Request request (ACE_Name_Request::REBIND,
@@ -94,9 +94,9 @@ ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name,
                                 char *&type)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::resolve");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ());
   ACE_UINT32 name_len =
-    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (name.length () * sizeof (wchar_t));
   ACE_Name_Request request (ACE_Name_Request::RESOLVE,
                             name_urep.get (),
                             name_len,
@@ -110,7 +110,7 @@ ACE_Remote_Name_Space::resolve (const ACE_NS_WString &name,
   if (this->ns_proxy_.recv_reply (reply) == -1)
     return -1;
 
-  ACE_NS_WString temp (reply.value (), reply.value_len () / sizeof (ACE_WCHAR_T));
+  ACE_NS_WString temp (reply.value (), reply.value_len () / sizeof (wchar_t));
   value = temp;
   ACE_NEW_RETURN (type,
                   char[reply.type_len () + 1],
@@ -123,9 +123,9 @@ int
 ACE_Remote_Name_Space::unbind (const ACE_NS_WString &name)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::unbind");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> name_urep (name.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> name_urep (name.rep ());
   ACE_UINT32 name_len =
-    static_cast<ACE_UINT32> (name.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (name.length () * sizeof (wchar_t));
   ACE_Name_Request request (ACE_Name_Request::UNBIND,
                             name_urep.get (),
                             name_len,
@@ -138,9 +138,9 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
                                    const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_names");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAMES,
                             pattern_urep.get (),
                             pattern_len,
@@ -160,7 +160,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString name (reply.name (),
-                               reply.name_len () / sizeof (ACE_WCHAR_T));
+                               reply.name_len () / sizeof (wchar_t));
           set.insert (name);
         }
     }
@@ -172,9 +172,9 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
                                     const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_values");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUES,
                             pattern_urep.get (),
                             pattern_len,
@@ -194,7 +194,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString value (reply.value (),
-                                reply.value_len () / sizeof (ACE_WCHAR_T));
+                                reply.value_len () / sizeof (wchar_t));
           set.insert (value);
         }
     }
@@ -207,9 +207,9 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set,
                                    const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_types");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPES,
                             pattern_urep.get (),
                             pattern_len,
@@ -242,9 +242,9 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
                                           const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_name_entries");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t));
   ACE_Name_Request request (ACE_Name_Request::LIST_NAME_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -265,9 +265,9 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString name (reply.name (),
-                               reply.name_len () / sizeof (ACE_WCHAR_T));
+                               reply.name_len () / sizeof (wchar_t));
           ACE_NS_WString value (reply.value (),
-                                reply.value_len () / sizeof (ACE_WCHAR_T));
+                                reply.value_len () / sizeof (wchar_t));
           ACE_Name_Binding entry (name,
                                   value,
                                   reply.type ());
@@ -283,9 +283,9 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
                                            const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_value_entries");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t));
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUE_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -306,9 +306,9 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString name (reply.name (),
-                               reply.name_len () / sizeof (ACE_WCHAR_T));
+                               reply.name_len () / sizeof (wchar_t));
           ACE_NS_WString value (reply.value (),
-                                reply.value_len () / sizeof (ACE_WCHAR_T));
+                                reply.value_len () / sizeof (wchar_t));
           ACE_Name_Binding entry (name,
                                   value,
                                   reply.type());
@@ -324,9 +324,9 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
                                           const ACE_NS_WString &pattern)
 {
   ACE_TRACE ("ACE_Remote_Name_Space::list_type_entries");
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> pattern_urep (pattern.rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> pattern_urep (pattern.rep ());
   ACE_UINT32 pattern_len =
-    static_cast<ACE_UINT32> (pattern.length () * sizeof (ACE_WCHAR_T));
+    static_cast<ACE_UINT32> (pattern.length () * sizeof (wchar_t));
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPE_ENTRIES,
                             pattern_urep.get (),
                             pattern_len,
@@ -347,9 +347,9 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
       if (reply.msg_type () != ACE_Name_Request::MAX_ENUM)
         {
           ACE_NS_WString name (reply.name (),
-                               reply.name_len () / sizeof (ACE_WCHAR_T));
+                               reply.name_len () / sizeof (wchar_t));
           ACE_NS_WString value (reply.value (),
-                                reply.value_len () / sizeof (ACE_WCHAR_T));
+                                reply.value_len () / sizeof (wchar_t));
           ACE_Name_Binding entry (name,
                                   value,
                                   reply.type ());
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index 5c4a04c5397..89bbadc7201 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -620,7 +620,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq,
       // Look up the interface by number, not name.
       if_address.ifr_ifno = ACE_OS::atoi (net_if);
 #else
-      ACE_OS::strcpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if));
+      ACE_OS::string_copy (if_address.ifr_name, net_if, sizeof(if_address.ifr_name));
 #endif /* defined (ACE_PSOS) */
 
       if (ACE_OS::ioctl (this->get_handle (),
@@ -663,7 +663,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq,
 #if defined(__linux__)
   if (net_if != 0)
     {
-      lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_ALWAYS_CHAR(net_if));
+      lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_TO_CHAR_IN(net_if));
     }
   else
 #elif defined (ACE_WIN32)
@@ -707,10 +707,11 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq,
         {
           if ((num_if && pAddrs->Ipv6IfIndex == static_cast<unsigned int>(if_ix))
               || (!num_if &&
-                  (ACE_OS::strcmp (ACE_TEXT_ALWAYS_CHAR (net_if),
-                                   pAddrs->AdapterName) == 0
-                   || ACE_OS::strcmp (ACE_TEXT_ALWAYS_CHAR (net_if),
-                                      ACE_Wide_To_Ascii (pAddrs->FriendlyName).char_rep()) == 0)))
+                  // Do we need these conversions?
+                  (ACE_OS::strcmp (ACE_TEXT_TO_CHAR_IN (net_if),
+                                   ACE_TEXT_TO_CHAR_IN (pAddrs->AdapterName)) == 0
+                   || ACE_OS::strcmp (ACE_TEXT_TO_CHAR_IN (net_if),
+                                      ACE_TEXT_TO_CHAR_IN (pAddrs->FriendlyName)) == 0)))
             {
               lmreq.ipv6mr_interface = pAddrs->Ipv6IfIndex;
               break;
diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp
index 4138d067c37..ff8d9f1fd69 100644
--- a/ace/SOCK_Dgram_Bcast.cpp
+++ b/ace/SOCK_Dgram_Bcast.cpp
@@ -146,7 +146,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
   // Get host ip address
   if (host_name)
     {
-      hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR (host_name));
+      hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_TO_CHAR_IN (host_name));
 
       if (hp == 0)
         return -1;
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index 5f325a7e519..2e5daad30a7 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -273,7 +273,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
           while (intf[index].if_index != 0 || intf[index].if_name != 0)
             {
               if (this->join (mcast_addr, reuse_addr,
-                              ACE_TEXT_CHAR_TO_TCHAR(intf[index].if_name)) == 0)
+                              ACE_TEXT_TO_TCHAR_IN(intf[index].if_name)) == 0)
                 ++nr_subscribed;
 
               ++index;
@@ -314,7 +314,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
           while (pAddrs)
             {
               if (this->join (mcast_addr, reuse_addr,
-                              ACE_TEXT_CHAR_TO_TCHAR(pAddrs->AdapterName)) == 0)
+                              ACE_TEXT_TO_TCHAR_IN(pAddrs->AdapterName)) == 0)
                 ++nr_subscribed;
 
               pAddrs = pAddrs->Next;
@@ -365,8 +365,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
                     continue;
                   if (this->subscribe (mcast_addr,
                                        reuse_addr,
-                                       ACE_TEXT_CHAR_TO_TCHAR
-                                   (if_addrs[if_cnt].get_host_addr ())) == 0)
+                                       ACE_TEXT_TO_TCHAR_IN(if_addrs[if_cnt].get_host_addr ())) == 0)
                     ++nr_subscribed;
                 }
             }
@@ -416,8 +415,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
                 continue;
               if (this->subscribe (mcast_addr,
                                    reuse_addr,
-                                   ACE_TEXT_CHAR_TO_TCHAR
-                                     (if_addrs[if_cnt].get_host_addr ())) == 0)
+                                   ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr ())) == 0)
                 ++nr_subscribed;
             }
         }
@@ -657,7 +655,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
           int index = 0;
           while (intf[index].if_index != 0 || intf[index].if_name != 0)
             {
-              if (this->leave (mcast_addr, ACE_TEXT_CHAR_TO_TCHAR(intf[index].if_name)) == 0)
+              if (this->leave (mcast_addr, ACE_TEXT_TO_TCHAR_IN(intf[index].if_name)) == 0)
                 ++nr_unsubscribed;
 
               ++index;
@@ -697,7 +695,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
 
           while (pAddrs)
             {
-              if (this->leave (mcast_addr, ACE_TEXT_CHAR_TO_TCHAR(pAddrs->AdapterName)) == 0)
+              if (this->leave (mcast_addr, ACE_TEXT_TO_TCHAR_IN(pAddrs->AdapterName)) == 0)
                 ++nr_unsubscribed;
 
               pAddrs = pAddrs->Next;
@@ -750,8 +748,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
                   if (if_addrs[if_cnt].get_type () != AF_INET || if_addrs[if_cnt].is_loopback ())
                     continue;
                   if (this->leave (mcast_addr,
-                                   ACE_TEXT_CHAR_TO_TCHAR
-                                   (if_addrs[if_cnt].get_host_addr ())) == 0)
+                                   ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr ())) == 0)
                     ++nr_unsubscribed;
                 }
             }
@@ -799,8 +796,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
               if (if_addrs[if_cnt].is_loopback ())
                 continue;
               if (this->leave (mcast_addr,
-                               ACE_TEXT_CHAR_TO_TCHAR
-                               (if_addrs[if_cnt].get_host_addr ())) == 0)
+                               ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr ())) == 0)
                 ++nr_unsubscribed;
             }
         }
diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h
index 9537162a4d3..92000947271 100644
--- a/ace/SOCK_Stream.h
+++ b/ace/SOCK_Stream.h
@@ -81,22 +81,8 @@ public:
   /// Destructor.
   ~ACE_SOCK_Stream (void);
 
-  /** @name Counted send/receive methods
-   *
-   * The counted send/receive methods attempt to send a specified number of
-   * bytes even if they must block and retry the operation in order to
-   * transfer the entire amount. The time spent blocking for the entire
-   * transfer can be limited by a specified ACE_Time_Value object which is
-   * a relative time (i.e., a fixed amount of time, not an absolute time
-   * of day). These methods return the count of transferred bytes, or -1
-   * if an error occurs or the operation times out. In error or timeout
-   * situations it's possible that some data was transferred before the error
-   * or timeout. The @c bytes_transferred parameter is used to obtain the
-   * count of bytes transferred before the error or timeout occurred. If the
-   * total specified number of bytes is transferred without error, the
-   * method return value should equal the value of @c bytes_transferred.
-   */
-  //@{
+  // = I/O functions.
+
   /// Try to recv exactly @a len bytes into @a buf from the connected socket.
   ssize_t recv_n (void *buf,
                   size_t len,
@@ -142,8 +128,6 @@ public:
                    const ACE_Time_Value *timeout = 0,
                    size_t *bytes_transferred = 0) const;
 
-  //@}
-
   // = Send/receive ``urgent'' data (see TCP specs...).
   ssize_t send_urg (const void *ptr,
                     size_t len = sizeof (char),
diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp
index 23ab69059fd..2967c7fd8b3 100644
--- a/ace/SSL/SSL_Asynch_Stream.cpp
+++ b/ace/SSL/SSL_Asynch_Stream.cpp
@@ -8,9 +8,25 @@ ACE_RCSID (ACE_SSL,
 #if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
 
 #if defined (ACE_WIN32)
+
+# define A_RESULT     ACE_WIN32_Asynch_Result
+# define ARS_RESULT   ACE_WIN32_Asynch_Read_Stream_Result
+# define AWS_RESULT   ACE_WIN32_Asynch_Write_Stream_Result
+
+# define ERR_CANCELED ERROR_OPERATION_ABORTED
+
 # include "ace/WIN32_Proactor.h"
+
 #else
+
+# define A_RESULT     ACE_POSIX_Asynch_Result
+# define ARS_RESULT   ACE_POSIX_Asynch_Read_Stream_Result
+# define AWS_RESULT   ACE_POSIX_Asynch_Write_Stream_Result
+
+# define ERR_CANCELED ECANCELED
+
 # include "ace/POSIX_Proactor.h"
+
 #endif  /* ACE_WIN32 */
 
 #include "ace/OS_NS_string.h"
@@ -20,6 +36,28 @@ ACE_RCSID (ACE_SSL,
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+// ************************************************************
+//  SSL Asynchronous Write Result
+// ************************************************************
+
+class ACE_SSL_Asynch_Write_Stream_Result
+  : public AWS_RESULT
+{
+  /// Factory class will have special permissions.
+  friend class ACE_SSL_Asynch_Stream;
+
+protected:
+
+  ACE_SSL_Asynch_Write_Stream_Result (ACE_Handler &handler,
+                                      ACE_HANDLE handle,
+                                      ACE_Message_Block &message_block,
+                                      size_t bytes_to_read,
+                                      const void* act,
+                                      ACE_HANDLE event,
+                                      int priority,
+                                      int signal_number);
+};
+
 ACE_SSL_Asynch_Write_Stream_Result::ACE_SSL_Asynch_Write_Stream_Result
   (ACE_Handler &       handler,
    ACE_HANDLE          handle,
@@ -42,6 +80,29 @@ ACE_SSL_Asynch_Write_Stream_Result::ACE_SSL_Asynch_Write_Stream_Result
 {
 }
 
+// ************************************************************
+//  SSL Asynchronous Read Result
+// ************************************************************
+class ACE_SSL_Asynch_Read_Stream_Result
+  : public ARS_RESULT
+{
+  /// Factory class will have special permissions.
+  friend class ACE_SSL_Asynch_Stream;
+
+protected:
+
+  ACE_SSL_Asynch_Read_Stream_Result (ACE_Handler &handler,
+                                     ACE_HANDLE handle,
+                                     ACE_Message_Block &message_block,
+                                     size_t bytes_to_read,
+                                     const void* act,
+                                     ACE_HANDLE event,
+                                     int priority,
+                                     int signal_number);
+};
+
+
+
 ACE_SSL_Asynch_Read_Stream_Result::ACE_SSL_Asynch_Read_Stream_Result
   (ACE_Handler &        handler,
    ACE_HANDLE           handle,
@@ -64,7 +125,23 @@ ACE_SSL_Asynch_Read_Stream_Result::ACE_SSL_Asynch_Read_Stream_Result
 {
 }
 
-ACE_SSL_Asynch_Result::ACE_SSL_Asynch_Result (ACE_Handler & handler)
+
+// ************************************************************
+//   Faked Result. It is used for close notification
+// ************************************************************
+class ACE_SSL_Asynch_Result : public A_RESULT
+{
+public:
+    ACE_SSL_Asynch_Result (ACE_Handler & handler);
+
+    void complete (size_t bytes_transferred,
+                   int    success,
+                   const  void * completion_key,
+                   u_long error);
+};
+
+ACE_SSL_Asynch_Result::ACE_SSL_Asynch_Result
+  (ACE_Handler & handler)
   : A_RESULT (handler.proxy (),
               0,          // act,
               ACE_INVALID_HANDLE,
@@ -86,7 +163,7 @@ ACE_SSL_Asynch_Result::complete (size_t /* bytes_transferred */,
 }
 
 // ************************************************************
-//  ACE_SSL_Asynch_Stream Constructor / Destructor
+//  ACE_SSL_Asynch_Stream Constructor / Desctructor
 // ************************************************************
 ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream (
   ACE_SSL_Asynch_Stream::Stream_Type s_type,
@@ -121,8 +198,8 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream (
   if (this->ssl_ == 0)
     ACE_ERROR
       ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-        ACE_TEXT ("- cannot allocate new SSL structure")
+        ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+        ACE_LIB_TEXT ("- cannot allocate new SSL structure")
      ));
 
   ::SSL_set_verify (this->ssl_,
@@ -141,9 +218,9 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void)
   if (this->flags_ & SF_STREAM_OPEN)             // open
     if ((this->flags_ & SF_DELETE_ENABLE) == 0)  // but ..
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("ACE_SSL_Asynch_Stream::DTOR-")
-                  ACE_TEXT("possible access violation ")
-                  ACE_TEXT("if proactor still handles events\n")));
+                  ACE_LIB_TEXT("ACE_SSL_Asynch_Stream::DTOR-")
+                  ACE_LIB_TEXT("possible access violation ")
+                  ACE_LIB_TEXT("if proactor still handles events\n")));
 
   ::SSL_free (this->ssl_);
 
@@ -232,22 +309,22 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler,
   if (this->flags_ & SF_STREAM_OPEN)
     ACE_ERROR_RETURN
       ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-        ACE_TEXT ("- already opened")),
+        ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+        ACE_LIB_TEXT ("- already opened")),
        -1);
 
   if (this->ssl_ == 0)
     ACE_ERROR_RETURN
       ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-        ACE_TEXT ("- SSL structure is absent")),
+        ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+        ACE_LIB_TEXT ("- SSL structure is absent")),
        -1);
 
   if (handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN
       ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-        ACE_TEXT ("- invalid handle")),
+        ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+        ACE_LIB_TEXT ("- invalid handle")),
        -1);
 
 
@@ -275,8 +352,8 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler,
   if (this->bio_ == 0)
     ACE_ERROR_RETURN
       ((LM_ERROR,
-        ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-        ACE_TEXT ("- cannot allocate new BIO structure")),
+        ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+        ACE_LIB_TEXT ("- cannot allocate new BIO structure")),
        -1);
 
   ::SSL_set_bio (this->ssl_ , this->bio_ , this->bio_);
@@ -294,8 +371,8 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler,
     default:
       ACE_ERROR_RETURN
         ((LM_ERROR,
-          ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
-          ACE_TEXT ("- invalid stream type")),
+          ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"),
+          ACE_LIB_TEXT ("- invalid stream type")),
          -1);
     }
 
@@ -306,6 +383,13 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler,
   return 0;
 }
 
+void
+ACE_SSL_Asynch_Stream::open (ACE_HANDLE new_handle,
+                             ACE_Message_Block &block)
+{
+  ACE_Service_Handler::open (new_handle,
+                             block);
+}
 
 // ************************************************************
 //  Asynch_Operation interface
@@ -464,7 +548,7 @@ ACE_SSL_Asynch_Stream::do_SSL_shutdown (void)
 
     default:
       this->print_error (status,
-                         ACE_TEXT ("Shutdown error"));
+                         ACE_LIB_TEXT ("Shutdown error"));
       retval = -1;
       break;
     }
@@ -505,8 +589,8 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void)
     default:
       ACE_ERROR_RETURN
         ((LM_ERROR,
-          ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("- invalid stream type")),
+          ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+          ACE_LIB_TEXT ("- invalid stream type")),
          -1);
     }
 
@@ -528,7 +612,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void)
     case SSL_ERROR_SYSCALL:
     default:
       this->print_error (status,
-                         ACE_TEXT ("Handshake error"));
+                         ACE_LIB_TEXT ("Handshake error"));
       return -1;
     }
 
@@ -587,7 +671,7 @@ ACE_SSL_Asynch_Stream::do_SSL_read (void)
 
  this->notify_read (0, EFAULT);
  this->print_error (status,
-                    ACE_TEXT ("SSL_read error"));
+                    ACE_LIB_TEXT ("SSL_read error"));
 
  return -1;
 }
@@ -637,7 +721,7 @@ ACE_SSL_Asynch_Stream::do_SSL_write (void)
 
  this->notify_write(0, EFAULT);
  this->print_error (status,
-                    ACE_TEXT ("SSL_write error"));
+                    ACE_LIB_TEXT ("SSL_write error"));
 
  return -1;
 }
@@ -820,8 +904,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf,
     {
       ACE_ERROR
         ((LM_ERROR,
-          ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("error in ACE_Message_Block::size() ")
+          ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+          ACE_LIB_TEXT ("error in ACE_Message_Block::size() ")
           ));
 
       errval = EINVAL;
@@ -843,8 +927,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf,
     {
       ACE_ERROR
         ((LM_ERROR,
-          ACE_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("attempt read failed")
+          ACE_LIB_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+          ACE_LIB_TEXT ("attempt read failed")
           ));
 
       errval = EINVAL;  // may be leave EINPROGRESS ??
@@ -884,8 +968,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf,
     {
       ACE_ERROR
         ((LM_ERROR,
-          ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("error in ACE_Message_Block::size() ")
+          ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+          ACE_LIB_TEXT ("error in ACE_Message_Block::size() ")
           ));
 
       errval = EINVAL;
@@ -901,8 +985,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf,
     {
       ACE_ERROR
         ((LM_ERROR,
-          ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("error in ACE_Message_Block::copy() ")
+          ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+          ACE_LIB_TEXT ("error in ACE_Message_Block::copy() ")
           ));
 
       errval = EINVAL;
@@ -920,8 +1004,8 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf,
     {
       ACE_ERROR
         ((LM_ERROR,
-          ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("attempt write failed")
+          ACE_LIB_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+          ACE_LIB_TEXT ("attempt write failed")
           ));
 
       errval = EINVAL;  // may be leave EINPROGRESS ??
@@ -971,8 +1055,8 @@ ACE_SSL_Asynch_Stream::handle_write_stream (
 
       ACE_ERROR
         ((LM_ERROR,
-          ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
-          ACE_TEXT ("attempt write failed")
+          ACE_LIB_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"),
+          ACE_LIB_TEXT ("attempt write failed")
           ));
 
       this->bio_out_errno_ = EINVAL;
diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h
index 671cca46c24..57007f5013d 100644
--- a/ace/SSL/SSL_Asynch_Stream.h
+++ b/ace/SSL/SSL_Asynch_Stream.h
@@ -29,101 +29,13 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 
-/*
- * This facility doesn't follow the normal ACE asynch I/O support classes'
- * interface/implementation arrangement. It's not needed because rather than
- * branching off to platform-specific APIs, all platforms use the OpenSSL
- * API. Thus, you can think of this class as the implementation class (for
- * OpenSSL) and there's no separate interface class.
- * Also, since both read and write operations are defined in one I/O
- * factory, there's no single Result class defined as there is for
- * ACE_Asynch_Read_Stream, et al. There are separate result classes defined
- * for read and write operations.
- */
-
-#if defined (ACE_WIN32)
-#  include "ace/WIN32_Asynch_IO.h"
-typedef ACE_WIN32_Asynch_Result              A_RESULT;
-typedef ACE_WIN32_Asynch_Read_Stream_Result  ARS_RESULT;
-typedef ACE_WIN32_Asynch_Write_Stream_Result AWS_RESULT;
-
-# define ERR_CANCELED ERROR_OPERATION_ABORTED
-
-#else
-#  include "ace/POSIX_Asynch_IO.h"
-typedef ACE_POSIX_Asynch_Result              A_RESULT;
-typedef ACE_POSIX_Asynch_Read_Stream_Result  ARS_RESULT;
-typedef ACE_POSIX_Asynch_Write_Stream_Result AWS_RESULT;
-
-# define ERR_CANCELED ECANCELED
-
-#endif  /* ACE_WIN32 */
-
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class ACE_SSL_Asynch_Stream;     // Forward decl for use in result class def.
-
-/**
- * @class ACE_SSL_Asynch_Read_Stream_Result
- *
- * Result class that communicates result of read operations initiated on
- * an ACE_SSL_Asynch_Stream object.
- */
-class ACE_SSL_Asynch_Read_Stream_Result : public ARS_RESULT
-{
-  /// Factory class will have special permissions.
-  friend class ACE_SSL_Asynch_Stream;
-
-protected:
-  ACE_SSL_Asynch_Read_Stream_Result (ACE_Handler &handler,
-                                     ACE_HANDLE handle,
-                                     ACE_Message_Block &message_block,
-                                     size_t bytes_to_read,
-                                     const void* act,
-                                     ACE_HANDLE event,
-                                     int priority,
-                                     int signal_number);
-};
-
-/**
- * @class ACE_SSL_Asynch_Write_Stream_Result
- *
- * Result class that communicates result of write operations initiated on
- * an ACE_SSL_Asynch_Stream object.
- */
-class ACE_SSL_Asynch_Write_Stream_Result : public AWS_RESULT
-{
-  /// Factory class will have special permissions.
-  friend class ACE_SSL_Asynch_Stream;
-
-protected:
-  ACE_SSL_Asynch_Write_Stream_Result (ACE_Handler &handler,
-                                      ACE_HANDLE handle,
-                                      ACE_Message_Block &message_block,
-                                      size_t bytes_to_read,
-                                      const void* act,
-                                      ACE_HANDLE event,
-                                      int priority,
-                                      int signal_number);
-};
-
-
-/**
- * @class ACE_SSL_Asynch_Result
- *
- * Result class that is used internally for socket close notifications.
- */
-class ACE_SSL_Asynch_Result : public A_RESULT
-{
-public:
-    ACE_SSL_Asynch_Result (ACE_Handler &handler);
-
-    void complete (size_t bytes_transferred,
-                   int    success,
-                   const  void * completion_key,
-                   u_long error);
-};
+/// Forward declarations
+class ACE_SSL_Asynch_Result;
+class ACE_SSL_Asynch_Read_Stream_Result;
+class ACE_SSL_Asynch_Write_Stream_Result;
 
 
 // Only provide forward declarations to prevent possible abuse of the
@@ -133,17 +45,19 @@ struct ACE_SSL_Asynch_Stream_Accessor;
 /**
  * @class ACE_SSL_Asynch_Stream
  *
- * @brief This class is a factory for initiating asynchronous reads
- * and writes on an SSL stream.
- *
- * Once open() is called, multiple asynchronous read and write operations
- * can be started using this class.  The handler object (derived from
- * ACE_Handler) specified in open() will receive completion events for the
- * operations initiated via this class.
+ * @brief This class is a factory for starting off asynchronous reads
+ * on a stream. This class forwards all methods to its
+ * implementation class.
+ * @par
+ * Once open() is called, multiple asynchronous read()s can
+ * started using this class.  An ACE_SSL_Asynch_Stream::Result
+ * will be passed back to the @param handler when the asynchronous
+ * reads completes through the ACE_Handler::handle_read_stream
+ * callback.
  */
 class ACE_SSL_Export ACE_SSL_Asynch_Stream
   : public ACE_Asynch_Operation,
-    public ACE_Handler
+    public ACE_Service_Handler
 {
 public:
 
@@ -165,15 +79,13 @@ public:
       ST_SERVER = 0x0002
     };
 
-  /// Constructor.
+  /// The constructor.
   /**
-   * @arg context  Pointer to an ACE_SSL_Context instance containing
-   *               the OpenSSL information to be associated with this
-   *               ACE_SSL_Asynch_Stream.  The needed SSL data will be
-   *               copied before return. Therefore, this object can be
-   *               reused, modified, or deleted upon return. If a 0 pointer
-   *               is passed, the ACE_SSL_Context::instance() method will
-   *               be called to get access to a singleton.
+   * @param context Pointer to @c ACE_SSL_Context instance containing
+   *                the OpenSSL @c SSL data structure to be associated
+   *                with this @c ACE_SSL_SOCK_Stream.  The @c SSL data
+   *                structure will be copied to make it at least
+   *                logically independent of the supplied @a context.
    */
   ACE_SSL_Asynch_Stream (Stream_Type s_type = ST_SERVER,
                          ACE_SSL_Context * context = 0);
@@ -181,92 +93,28 @@ public:
   /// Destructor
   virtual ~ACE_SSL_Asynch_Stream (void);
 
-  int cancel (void);
+  int cancel(void);
 
   int close (void);
 
-  /**
-   * Initializes the factory with information which will be used with
-   * each asynchronous call.
-   *
-   * @arg handler The ACE_Handler that will be called to handle completions
-   *              for operations initiated using this factory.
-   * @arg handle  The handle that future read/write operations will use.
-   *
-   * @retval 0    for success.
-   * @retval -1   for failure; consult @c errno for further information.
-   */
   int open (ACE_Handler &handler,
             ACE_HANDLE handle = ACE_INVALID_HANDLE,
             const void *completion_key = 0,
             ACE_Proactor *proactor = 0);
 
-  /**
-   * Initiates an asynchronous read. If the operation is successfully
-   * initiated, the handle_read_stream() method will be called on the
-   * ACE_Handler object passed to open() when the operation completes.
-   * Data is read into the specified ACE_Message_Block beginning at its
-   * write pointer; the block's write pointer is updated to reflect any
-   * added data when the operation completes.
-   *
-   * @arg message_block      The specified ACE_Message_Block will receive any
-   *                         data that is read. Data will be read into the
-   *                         block beginning at the block's write pointer.
-   * @arg num_bytes_to_read  The maximum number of bytes to read. The actual
-   *                         amount read may be less.
-   * @arg act                ACT which is passed to the completion handler in
-   *                         the result object.
-   * @arg priority           Specifies the operation priority. This has an
-   *                         affect on POSIX only. Works like @i nice in Unix.
-   *                         Negative values are not allowed. 0 means priority
-   *                         of the operation same as the process priority.
-   *                         1 means priority of the operation is one less than
-   *                         process, and so forth. This parameter has no
-   *                         affect on Win32.
-   * @arg signal_number      The POSIX4 real-time signal number to be used
-   *                         for the operation. signal_number ranges from
-   *                         ACE_SIGRTMIN to ACE_SIGRTMAX. This argument is
-   *                         unused on non-POSIX4 systems.
-   *
-   * @retval 0    for success.
-   * @retval -1   for failure; consult @c errno for further information.
-   */
+  /// NOTE: This method has been specifically put in place so that
+  /// compilers like the borland doesnt get confused between the above
+  /// open () call with the one in the ACE_Service_Handler, from which
+  /// this class is derived from..
+  void open (ACE_HANDLE new_handle,
+             ACE_Message_Block &message_block);
+
   int read (ACE_Message_Block &message_block,
             size_t num_bytes_to_read,
             const void *act = 0,
             int priority = 0,
             int signal_number = ACE_SIGRTMIN);
 
-  /**
-   * Initiates an asynchronous write. If the operation is successfully
-   * initiated, the handle_write_stream() method will be called on the
-   * ACE_Handler object passed to open() when the operation completes.
-   * Data is taken from the specified ACE_Message_Block beginning at its
-   * read pointer; the block's read pointer is updated to reflect any
-   * data successfully sent when the operation completes.
-   *
-   * @arg message_block      The specified ACE_Message_Block is the source of
-   *                         data that is written. Data will be taken from the
-   *                         block beginning at the block's read pointer.
-   * @arg bytes_to_write     The maximum number of bytes to write. The actual
-   *                         amount written may be less.
-   * @arg act                ACT which is passed to the completion handler in
-   *                         the result object.
-   * @arg priority           Specifies the operation priority. This has an
-   *                         affect on POSIX only. Works like @i nice in Unix.
-   *                         Negative values are not allowed. 0 means priority
-   *                         of the operation same as the process priority.
-   *                         1 means priority of the operation is one less than
-   *                         process, and so forth. This parameter has no
-   *                         affect on Win32.
-   * @arg signal_number      The POSIX4 real-time signal number to be used
-   *                         for the operation. signal_number ranges from
-   *                         ACE_SIGRTMIN to ACE_SIGRTMAX. This argument is
-   *                         unused on non-POSIX4 systems.
-   *
-   * @retval 0    for success.
-   * @retval -1   for failure; consult @c errno for further information.
-   */
   int write (ACE_Message_Block &message_block,
              size_t bytes_to_write,
              const void *act = 0,
@@ -274,11 +122,8 @@ public:
              int signal_number = ACE_SIGRTMIN);
 
 protected:
-  /// Virtual from ACE_Asynch_Operation. Since this class is essentially an
-  /// implementation class, simply return 0.
-  virtual ACE_Asynch_Operation_Impl *implementation (void) const { return 0; }
 
-  /// virtual from ACE_Handler
+  /// virtual from ACE_Service_Handler
 
   /// This method is called when BIO write request is completed. It
   /// processes the IO completion and calls do_SSL_state_machine().
diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp
index fa120632038..fd884dd9044 100644
--- a/ace/SSL/SSL_Context.cpp
+++ b/ace/SSL/SSL_Context.cpp
@@ -503,7 +503,7 @@ ACE_SSL_Context::report_error (unsigned long error_code)
   (void) ::ERR_error_string (error_code, error_string);
 
   ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"),
+              ACE_LIB_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"),
               error_code,
               error_string));
 }
diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp
index d0ed9f3709e..f5ba831ad17 100644
--- a/ace/SSL/SSL_SOCK_Stream.cpp
+++ b/ace/SSL/SSL_SOCK_Stream.cpp
@@ -45,7 +45,7 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context)
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) ACE_SSL_SOCK_Stream "
                   "- cannot allocate new SSL structure %p\n",
-                  ACE_TEXT ("")));
+                  ACE_LIB_TEXT ("")));
     }
 }
 
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 6c16c6b7697..1c03657398f 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -41,12 +41,7 @@ operator<< (ACE_OSTREAM_TYPE &os, const ACE_WString &ws)
 {
   // @@ Need to figure out how to print the "wide" string
   //    on platforms that don't support "wide" strings.
-#if defined (ACE_HAS_WCHAR)
-  os << ACE_Wide_To_Ascii (ws.fast_rep ()).char_rep ();
-#else
-  ACE_UNUSED_ARG (ws);
-  os << "(*non-printable string*)";
-#endif
+  os << ACE_TEXT_TO_CHAR_IN (ws.fast_rep ());
   return os;
 }
 
diff --git a/ace/SStringfwd.h b/ace/SStringfwd.h
index 315553751ce..8910233ed56 100644
--- a/ace/SStringfwd.h
+++ b/ace/SStringfwd.h
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Basic_Types.h"   /* ACE_WCHAR_T definition */
+#include "ace/Basic_Types.h"   /* wchar_t definition */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class CHAR> class ACE_String_Base;  // Forward declaration.
 
-typedef ACE_WCHAR_T ACE_WSTRING_TYPE;
+typedef wchar_t ACE_WSTRING_TYPE;
 
 typedef ACE_String_Base<char> ACE_CString;
 typedef ACE_String_Base<ACE_WSTRING_TYPE> ACE_WString;
diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp
index 42fac9be0c7..3156338c44b 100644
--- a/ace/SV_Semaphore_Simple.cpp
+++ b/ace/SV_Semaphore_Simple.cpp
@@ -188,7 +188,6 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name,
                 ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
 }
 
-#if defined (ACE_HAS_WCHAR)
 ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name,
                                                   short flags,
                                                   int initial_value,
@@ -196,7 +195,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name,
                                                   mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple(wchar_t)");
-  if (this->open (ACE_Wide_To_Ascii (name).char_rep (),
+  if (this->open (ACE_TEXT_TO_CHAR_IN (name),
                   flags,
                   initial_value,
                   nsems,
@@ -205,7 +204,6 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name,
                 ACE_LIB_TEXT ("%p\n"),
                 ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple")));
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_SV_Semaphore_Simple::~ACE_SV_Semaphore_Simple (void)
 {
diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h
index af999654f0f..d2c82b71181 100644
--- a/ace/SV_Semaphore_Simple.h
+++ b/ace/SV_Semaphore_Simple.h
@@ -69,13 +69,12 @@ public:
                            int initial_value = 1,
                            u_short nsems = 1,
                            mode_t perms = ACE_DEFAULT_FILE_PERMS);
-#if defined (ACE_HAS_WCHAR)
+
   ACE_SV_Semaphore_Simple (const wchar_t *name,
                            short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
                            int initial_value = 1,
                            u_short nsems = 1,
                            mode_t perms = ACE_DEFAULT_FILE_PERMS);
-#endif /* ACE_HAS_WCHAR */
 
   ~ACE_SV_Semaphore_Simple (void);
 
@@ -85,13 +84,11 @@ public:
             u_short nsems = 1,
             mode_t perms = ACE_DEFAULT_FILE_PERMS);
 
-#if defined (ACE_HAS_WCHAR)
   int open (const wchar_t *name,
             short flags = ACE_SV_Semaphore_Simple::ACE_CREATE,
             int initial_value = 1,
             u_short nsems = 1,
             mode_t perms = ACE_DEFAULT_FILE_PERMS);
-#endif /* ACE_HAS_WCHAR */
 
   /// Open or create one or more SV_Semaphores.  We return 0 if all is
   /// OK, else -1.
diff --git a/ace/SV_Semaphore_Simple.inl b/ace/SV_Semaphore_Simple.inl
index 5dde75ffff6..81a828b4401 100644
--- a/ace/SV_Semaphore_Simple.inl
+++ b/ace/SV_Semaphore_Simple.inl
@@ -7,7 +7,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_WCHAR)
 // Semaphores don't offer wide-char names, so convert the name and forward
 // to the narrow-char open().
 ACE_INLINE int
@@ -18,13 +17,12 @@ ACE_SV_Semaphore_Simple::open (const wchar_t *name,
                                mode_t perms)
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::open (wchar_t)");
-  return this->open (ACE_Wide_To_Ascii (name).char_rep (),
+  return this->open (ACE_TEXT_TO_CHAR_IN (name),
                      flags,
                      initial_value,
                      nsems,
                      perms);
 }
-#endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE int
 ACE_SV_Semaphore_Simple::control (int cmd,
diff --git a/ace/Select_Reactor.cpp b/ace/Select_Reactor.cpp
new file mode 100644
index 00000000000..7f1e9505855
--- /dev/null
+++ b/ace/Select_Reactor.cpp
@@ -0,0 +1,33 @@
+// $Id$
+
+#include "ace/Select_Reactor.h"
+
+ACE_RCSID(ace, Select_Reactor, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+template class ACE_Reactor_Token_T<ACE_Token>;
+template class ACE_Select_Reactor_T< ACE_Reactor_Token_T<ACE_Token> >;
+template class ACE_Lock_Adapter< ACE_Reactor_Token_T<ACE_Token> >;
+template class ACE_Guard< ACE_Reactor_Token_T<ACE_Token> >;
+# else
+template class ACE_Reactor_Token_T<ACE_Noop_Token>;
+template class ACE_Select_Reactor_T< ACE_Reactor_Token_T<ACE_Noop_Token> >;
+template class ACE_Lock_Adapter< ACE_Reactor_Token_T<ACE_Noop_Token> >;
+# endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+#   pragma instantiate ACE_Reactor_Token_T<ACE_Token>
+#   pragma instantiate ACE_Select_Reactor_T< ACE_Reactor_Token_T<ACE_Token> >
+#   pragma instantiate ACE_Lock_Adapter< ACE_Reactor_Token_T<ACE_Token> >
+#   pragma instantiate ACE_Guard< ACE_Reactor_Token_T<ACE_Token> >
+# else
+#   pragma instantiate ACE_Reactor_Token_T<ACE_Noop_Token>
+#   pragma instantiate ACE_Select_Reactor_T< ACE_Reactor_Token_T<ACE_Noop_Token> >
+#   pragma instantiate ACE_Lock_Adapter< ACE_Reactor_Token_T<ACE_Noop_Token> >
+# endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index f69f3569cf9..e56b5b04489 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -159,7 +159,7 @@ int
 ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_Service_Config::parse_args");
-  ACE_Get_Opt getopt (argc,
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc,
                       argv,
                       ACE_LIB_TEXT ("bdf:k:nyp:s:S:"),
                       1); // Start at argv[1].
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index 40955ac8a9b..6fafb50408b 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -51,6 +51,18 @@ class ACE_DLL;
   ACE_LIB_TEXT ("() \"") \
   ACE_LIB_TEXT (parameters) \
   ACE_LIB_TEXT ("\"")
+#define ACE_DYNAMIC_SERVICE_DIRECTIVE_A(ident, libpathname, objectclass, parameters) \
+  "dynamic " \
+  ident \
+  " Service_Object * " \
+  libpathname \
+  ":" \
+  objectclass \
+  "() \"" \
+  parameters \
+  "\""
+
+
 #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \
   ACE_LIB_TEXT ("remove ") \
   ACE_LIB_TEXT (ident)
diff --git a/ace/Service_Config.inl b/ace/Service_Config.inl
index 44df3f6742d..4dd09e802b0 100644
--- a/ace/Service_Config.inl
+++ b/ace/Service_Config.inl
@@ -74,32 +74,32 @@ ACE_Service_Config::signal_handler (ACE_Sig_Adapter *signal_handler)
 ACE_INLINE int
 ACE_Service_Config::initialize (const ACE_Service_Type *sp, char parameters[])
 {
-  return ACE_Service_Config::initialize (sp, ACE_TEXT_CHAR_TO_TCHAR (parameters));
+  return ACE_Service_Config::initialize (sp, ACE_TEXT_TO_TCHAR_IN (parameters));
 }
 
 ACE_INLINE int
 ACE_Service_Config::initialize (const char svc_name[], char parameters[])
 {
-  return ACE_Service_Config::initialize (ACE_TEXT_CHAR_TO_TCHAR (svc_name),
-                                         ACE_TEXT_CHAR_TO_TCHAR (parameters));
+  return ACE_Service_Config::initialize (ACE_TEXT_TO_TCHAR_IN (svc_name),
+                                         ACE_TEXT_TO_TCHAR_IN (parameters));
 }
 
 ACE_INLINE int
 ACE_Service_Config::resume (const char svc_name[])
 {
-  return ACE_Service_Config::resume (ACE_TEXT_CHAR_TO_TCHAR (svc_name));
+  return ACE_Service_Config::resume (ACE_TEXT_TO_TCHAR_IN (svc_name));
 }
 
 ACE_INLINE int
 ACE_Service_Config::suspend (const char svc_name[])
 {
-  return ACE_Service_Config::suspend (ACE_TEXT_CHAR_TO_TCHAR (svc_name));
+  return ACE_Service_Config::suspend (ACE_TEXT_TO_TCHAR_IN (svc_name));
 }
 
 ACE_INLINE int
 ACE_Service_Config::remove (const char svc_name[])
 {
-  return ACE_Service_Config::remove (ACE_TEXT_CHAR_TO_TCHAR (svc_name));
+  return ACE_Service_Config::remove (ACE_TEXT_TO_TCHAR_IN (svc_name));
 }
 #endif /* ACE_HAS_WINCE && !ACE_USES_WCHAR */
 
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 446302ce87a..3dd1c8e151c 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -96,7 +96,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_Service_Manager::init");
   ACE_INET_Addr local_addr (ACE_Service_Manager::DEFAULT_PORT_);
-  ACE_Get_Opt getopt (argc, argv, ACE_LIB_TEXT ("dp:s:"), 0); // Start at argv[0]
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_LIB_TEXT ("dp:s:"), 0); // Start at argv[0]
 
   for (int c; (c = getopt ()) != -1; )
      switch (c)
@@ -301,7 +301,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_LIB_TEXT ("accepted from host %s at port %d\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (sa.get_host_name ()),
+                  ACE_TEXT_TO_TCHAR_IN (sa.get_host_name ()),
                   sa.get_port_number ()));
     }
 
diff --git a/ace/Service_Templates.cpp b/ace/Service_Templates.cpp
new file mode 100644
index 00000000000..11569316299
--- /dev/null
+++ b/ace/Service_Templates.cpp
@@ -0,0 +1,103 @@
+// $Id$
+
+#include "ace/config-lite.h"
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#  include "ace/Service_Templates.h"
+#  include "ace/SString.h"
+
+#endif
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+template class ACE_Node<ACE_Static_Svc_Descriptor *>;
+template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>;
+template class ACE_Node<ACE_TString>;
+template class ACE_Unbounded_Queue<ACE_TString>;
+template class ACE_Unbounded_Queue_Iterator<ACE_TString>;
+template class ACE_Unbounded_Set<ACE_TString>;
+template class ACE_Unbounded_Set_Iterator<ACE_TString>;
+template class auto_ptr<ACE_Obstack>;
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+template class ACE_Auto_Basic_Ptr<ACE_Obstack>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
+
+template class ACE_Message_Queue<ACE_SYNCH>;
+template class ACE_Message_Queue_Iterator<ACE_SYNCH>;
+template class ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH>;
+template class ACE_Message_Queue_Factory<ACE_SYNCH>;
+template class ACE_Dynamic_Message_Queue<ACE_SYNCH>;
+template class ACE_Module<ACE_SYNCH>;
+template class ACE_Stream<ACE_SYNCH>;
+template class ACE_Stream_Head<ACE_SYNCH>;
+template class ACE_Stream_Tail<ACE_SYNCH>;
+template class ACE_Task<ACE_SYNCH>;
+template class ACE_Thru_Task<ACE_SYNCH>;
+
+// Even with threads, these ACE_NULL_SYNCH specializations are necessary.
+#if defined (ACE_HAS_THREADS)
+  template class ACE_Message_Queue<ACE_NULL_SYNCH>;
+  template class ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>;
+  template class ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>;
+  template class ACE_Message_Queue_Factory<ACE_NULL_SYNCH>;
+  template class ACE_Dynamic_Message_Queue<ACE_NULL_SYNCH>;
+  template class ACE_Module<ACE_NULL_SYNCH>;
+  template class ACE_Task<ACE_NULL_SYNCH>;
+  template class ACE_Thru_Task<ACE_NULL_SYNCH>;
+#endif /* ACE_HAS_THREADS */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+#pragma instantiate ACE_Node<ACE_Static_Svc_Descriptor *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>
+#pragma instantiate ACE_Node<ACE_TString>
+#pragma instantiate ACE_Unbounded_Queue<ACE_TString>
+#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_TString>
+#pragma instantiate ACE_Unbounded_Set<ACE_TString>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_TString>
+#pragma instantiate auto_ptr<ACE_Obstack>
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<ACE_Obstack>
+#  endif  /* ACE_LACKS_AUTO_PTR */
+
+#pragma instantiate ACE_Message_Queue<ACE_SYNCH>
+#pragma instantiate ACE_Message_Queue_Iterator<ACE_SYNCH>
+#pragma instantiate ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH>
+#pragma instantiate ACE_Message_Queue_Factory<ACE_SYNCH>
+#pragma instantiate ACE_Dynamic_Message_Queue<ACE_SYNCH>
+#pragma instantiate ACE_Module<ACE_SYNCH>
+#pragma instantiate ACE_Stream<ACE_SYNCH>
+#pragma instantiate ACE_Stream_Head<ACE_SYNCH>
+#pragma instantiate ACE_Stream_Tail<ACE_SYNCH>
+#pragma instantiate ACE_Task<ACE_SYNCH>
+#pragma instantiate ACE_Thru_Task<ACE_SYNCH>
+// Even with threads, these ACE_NULL_SYNCH specializations are necessary.
+#if defined (ACE_HAS_THREADS)
+  #pragma instantiate ACE_Message_Queue<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Message_Queue_Factory<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Dynamic_Message_Queue<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Module<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Task<ACE_NULL_SYNCH>
+  #pragma instantiate ACE_Thru_Task<ACE_NULL_SYNCH>
+#endif /* ACE_HAS_THREADS */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/ace/Shared_Memory_Pool.cpp b/ace/Shared_Memory_Pool.cpp
index c61334485b7..93fb2e97fcf 100644
--- a/ace/Shared_Memory_Pool.cpp
+++ b/ace/Shared_Memory_Pool.cpp
@@ -251,7 +251,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_n
       // key.
 
       int segment_key;
-      int result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (backing_store_name),
+      int result = ::sscanf (ACE_TEXT_TO_CHAR_IN (backing_store_name),
                              "%d",
                              &segment_key);
 
@@ -259,7 +259,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool (const ACE_TCHAR *backing_store_n
         // The conversion to a number failed so hash with crc32
         // ACE::crc32 is also used in <SV_Semaphore_Simple>.
         this->base_shm_key_ =
-          (key_t) ACE::crc32 (ACE_TEXT_ALWAYS_CHAR (backing_store_name));
+          (key_t) ACE::crc32 (ACE_TEXT_TO_CHAR_IN (backing_store_name));
       else
         this->base_shm_key_ = segment_key;
 
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index fa3c00993b0..ec7797ae156 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -526,7 +526,7 @@ ACE_DLL_Singleton_Adapter_T<TYPE>::dll_name (void)
 {
   // @todo make this a constant somewhere (or it there already is one
   // then use it.
-  return ACE_TEXT("ACE");
+  return ACE_LIB_TEXT("ACE");
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp
index 3f66b838fcf..e0ff264da00 100644
--- a/ace/Sock_Connect.cpp
+++ b/ace/Sock_Connect.cpp
@@ -391,7 +391,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
   // Get host ip address if necessary.
   if (host_name)
     {
-      hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR (host_name));
+      hostent *hp = ACE_OS::gethostbyname (ACE_TEXT_TO_CHAR_IN (host_name));
 
       if (hp == 0)
         return -1;
diff --git a/ace/Stats.cpp b/ace/Stats.cpp
index 058830a8cc6..fa75340c83e 100644
--- a/ace/Stats.cpp
+++ b/ace/Stats.cpp
@@ -521,7 +521,7 @@ ACE_Throughput_Stats::accumulate (const ACE_Throughput_Stats &rhs)
 }
 
 void
-ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg,
+ACE_Throughput_Stats::dump_results (const char* msg,
                                     ACE_UINT32 sf)
 {
   if (this->samples_count () == 0u)
@@ -584,7 +584,56 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg,
 }
 
 void
-ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg,
+ACE_Throughput_Stats::dump_results (const wchar_t* msg,
+                                    ACE_UINT32 sf)
+{
+  if (this->samples_count () == 0u)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_LIB_TEXT ("%s : no data collected\n"), msg));
+      return;
+    }
+
+  this->ACE_Basic_Stats::dump_results (msg, sf);
+
+  ACE_Throughput_Stats::dump_throughput (msg, sf,
+                                         this->throughput_last_,
+                                         this->samples_count ());
+}
+
+void
+ACE_Throughput_Stats::dump_throughput (const char *msg,
+                                       ACE_UINT32 sf,
+                                       ACE_UINT64 elapsed_time,
+                                       ACE_UINT32 samples_count)
+{
+#ifndef ACE_NLOGGING
+  double seconds =
+# if defined ACE_LACKS_LONGLONG_T
+    elapsed_time / sf;
+#elif  defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
+    static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (
+                           ACE_U_LongLong(elapsed_time / sf)));
+# else  /* ! ACE_LACKS_LONGLONG_T */
+    static_cast<double> (ACE_UINT64_DBLCAST_ADAPTER (elapsed_time / sf));
+# endif /* ! ACE_LACKS_LONGLONG_T */
+  seconds /= ACE_HR_SCALE_CONVERSION;
+
+  const double t_avg = samples_count / seconds;
+
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_LIB_TEXT ("%s throughput: %.2f (events/second)\n"),
+              msg, t_avg));
+#else
+  ACE_UNUSED_ARG (msg);
+  ACE_UNUSED_ARG (sf);
+  ACE_UNUSED_ARG (elapsed_time);
+  ACE_UNUSED_ARG (samples_count);
+#endif /* ACE_NLOGGING */
+}
+
+void
+ACE_Throughput_Stats::dump_throughput (const wchar_t *msg,
                                        ACE_UINT32 sf,
                                        ACE_UINT64 elapsed_time,
                                        ACE_UINT32 samples_count)
diff --git a/ace/Stats.h b/ace/Stats.h
index a95328b74d1..e98305cb0b8 100644
--- a/ace/Stats.h
+++ b/ace/Stats.h
@@ -243,10 +243,19 @@ public:
   void accumulate (const ACE_Throughput_Stats &throughput);
 
   /// Print down the stats
-  void dump_results (const ACE_TCHAR* msg, ACE_UINT32 scale_factor);
+  void dump_results (const char* msg, ACE_UINT32 scale_factor);
+
+  /// Print down the stats
+  void dump_results (const wchar_t* msg, ACE_UINT32 scale_factor);
+
+  /// Dump the average throughput stats.
+  static void dump_throughput (const char *msg,
+                               ACE_UINT32 scale_factor,
+                               ACE_UINT64 elapsed_time,
+                               ACE_UINT32 samples_count);
 
   /// Dump the average throughput stats.
-  static void dump_throughput (const ACE_TCHAR *msg,
+  static void dump_throughput (const wchar_t *msg,
                                ACE_UINT32 scale_factor,
                                ACE_UINT64 elapsed_time,
                                ACE_UINT32 samples_count);
diff --git a/ace/String_Conversion_T.cpp b/ace/String_Conversion_T.cpp
new file mode 100644
index 00000000000..046b9627cdf
--- /dev/null
+++ b/ace/String_Conversion_T.cpp
@@ -0,0 +1,17 @@
+/* -*- C++ -*- */
+// $Id$
+
+#ifndef STRING_CONVERTER_T_CPP
+#define STRING_CONVERTER_T_CPP
+
+#include "config-lite.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if !defined (__ACE_INLINE__)
+#include "ace/String_Conversion_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#endif  /* STRING_CONVERTER_T_CPP */
diff --git a/ace/String_Conversion_T.h b/ace/String_Conversion_T.h
new file mode 100644
index 00000000000..41b13626ec2
--- /dev/null
+++ b/ace/String_Conversion_T.h
@@ -0,0 +1,343 @@
+/* -*- C++ -*- */
+// $Id$
+
+#ifndef STRING_CONVERTER_T_H
+#define STRING_CONVERTER_T_H
+#include /**/ "ace/pre.h"
+#include /**/ "ace/ace_wchar.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace ACE
+{
+
+namespace String_Conversion
+{
+// The duplicate/copy(_new) suite of methods are used to provide seamless
+// conversions between wchar_t and char.
+// * The alloc/free suite of methods are used to advertise
+//   how the String_Conversion services manage memory.
+//   Alloc allocates len + 1 and sets first byte to zero.
+// * The duplicate method allocates the output string.
+// * The copy method is the worker that expects two existing buffers
+//   of at least <len+1> size. It will always NULL terminate the dest string.
+
+static const size_t calc_len = static_cast<size_t>(-1);
+
+template < typename T >
+class Allocator_cpp
+{
+public:
+  T* alloc( size_t len ) const;
+
+  void free( T* str ) const;
+};
+
+template < typename T >
+class Allocator_malloc
+{
+public:
+  T* alloc( size_t len ) const;
+
+  void free( T* str ) const;
+};
+
+template < typename DestT, typename SrcT, typename Allocator > ACE_INLINE
+DestT*
+duplicate( const SrcT* src, size_t* dest_len = 0 );
+
+template < typename DestT, typename SrcT > ACE_INLINE
+size_t
+copy( DestT* dest, const SrcT* src, size_t dest_len = calc_len );
+
+// Length Note:
+// The len parameters are content-length. The need to
+// allocate more (len + 1 for null character) is an
+// implementation detail.
+
+// Constructor Note:
+// The classes have overriden constructors. This
+// obviates the need for the user to explicitely
+// redeclare the type of the input. The classes
+// will do the right/optimal thing depending
+// on the type.
+
+/**
+ * @class Convert_Out
+ *
+ * @brief A lightweight classed used for
+ *        output symmantics.
+ *
+ * This class will always allocate a new copy
+ * of the source string.
+ */
+template < typename DestT, typename Allocator = Allocator_cpp<DestT> >
+class Convert_Out
+{
+public:
+  template < typename SrcT >
+  explicit Convert_Out( const SrcT* src, size_t len = calc_len )
+  : len_( len )
+  , dest_( duplicate<DestT, SrcT, Allocator>( src, &len_ ) )
+  {
+  }
+
+  // Make certain we provide a counter to the allocation
+  static void free( DestT* ptr )
+  {
+    Allocator().free( ptr );
+  }
+
+  DestT* c_str() const;
+
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  DestT* char_rep() const
+  {
+    return c_str();
+  }
+#endif
+
+  size_t length() const;
+
+private:
+  size_t len_;
+  DestT* dest_;
+
+  /// Not implemented.
+  Convert_Out();
+  Convert_Out( Convert_Out& );
+  Convert_Out& operator= ( Convert_Out& );
+};
+
+
+/**
+ * @class Convert_In
+ *
+ * @brief A lightweight classed used for
+ *        input symmantics.
+ *
+ * This class will either pass the src string
+ * along or make a temporary copy.
+ * The c_str() is const and should not be modified.
+ *
+ * TODO: Remove <typename SrcT> from class template.
+ *       It appears that some compilers do not support
+ *       template method specialization within a template
+ *       class.
+ */
+template < typename DestT, typename SrcT >
+class Convert_In
+{
+public:
+  //template < typename SrcT >
+  explicit Convert_In( const SrcT* src )
+  : str_(0)
+  , ownstr_( duplicate<DestT, SrcT, Allocator_cpp<DestT> >( src, 0 ) )
+  {
+  }
+
+  // This is an optimized specialization
+  // where src and dest are the same type
+  //template <>
+  explicit Convert_In( const DestT* src )
+  : str_(src)
+  , ownstr_(0)
+  {
+  }
+
+  ~Convert_In();
+
+  const DestT* c_str() const;
+
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  const DestT* char_rep() const
+  {
+    return c_str();
+  }
+#endif
+
+private:
+  const DestT* str_;
+  DestT* ownstr_;
+
+  /// Not implemented.
+  Convert_In();
+  Convert_In( Convert_In& );
+  Convert_In& operator= ( Convert_In& );
+};
+
+
+/**
+ * @class Convert_InOut
+ *
+ * @brief A lightweight classed used for
+ *        input/output symmantics.
+ *
+ * This class will either pass the src string
+ * along or make a temporary copy.
+ * The if a temp string is created, it is copied
+ * back to the src on destruction.
+ *
+ * NOTE: Make certain src points to a NULL teminated string.
+ *
+ * NOTE: The size passed in at construction is buffer size,
+ * including space for the NULL char.
+ *
+ * NOTE: encode_factor is used when we believe that the number
+ * of characters required differs between the two representations.
+ * To avoid data loss, we default to an oversized buffer of size*3.
+ */
+template < typename DestT, typename SrcT >
+class Convert_InOut
+{
+public:
+  //template < typename SrcT >
+  explicit Convert_InOut( SrcT* src, size_t size, size_t encode_factor = 3 )
+  : len_( size == calc_len ? calc_len : (size - 1) * encode_factor )
+  , encode_factor_( size == calc_len ? 1 : encode_factor )
+  , str_(0)
+  , orig_(src)
+  , ownstr_( duplicate<DestT, SrcT, Allocator_cpp<DestT> >(src, &len_))
+  {
+  }
+
+  //template < typename SrcT >
+  explicit Convert_InOut( SrcT* src )
+  : len_(calc_len)
+  , encode_factor_(1)
+  , str_(0)
+  , orig_(src)
+  , ownstr_( duplicate<DestT, SrcT, Allocator_cpp<DestT> >(src, &len_))
+  {
+  }
+
+  // This is an optimized specialization
+  // where src and dest are the same type
+  //template <>
+  explicit Convert_InOut( DestT* src, size_t size = calc_len )
+  : len_( size == calc_len ? calc_len : size - 1 )
+  , encode_factor_(1)
+  , str_(src)
+  , orig_(0)
+  , ownstr_(0)
+  {
+  }
+
+  ~Convert_InOut();
+
+  DestT* c_str();
+
+  size_t size() const
+  {
+    return len_+1;
+  }
+
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  DestT* char_rep()
+  {
+    return c_str();
+  }
+#endif
+
+private:
+  /// Internal pointer to the converted string.
+  size_t  len_;
+  size_t  encode_factor_;
+  DestT*  str_;
+  SrcT*   orig_;
+  DestT*  ownstr_;
+
+  /// Not implemented.
+  Convert_InOut();
+  Convert_InOut( Convert_InOut& );
+  Convert_InOut& operator= ( Convert_InOut& );
+};
+
+} // String_Conversion
+
+} // ACE
+
+// Conversion Macros
+# define ACE_TEXT_TO_CHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< char >( STRING ).c_str()
+# define ACE_TEXT_TO_WCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< wchar_t >( STRING ).c_str()
+# define ACE_TEXT_TO_TCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< ACE_TCHAR >( STRING ).c_str()
+
+# define ACE_TEXT_TO_MALLOC_CHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< char, ACE::String_Conversion::Allocator_malloc<char> >( STRING ).c_str()
+# define ACE_TEXT_TO_MALLOC_WCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< wchar_t, ACE::String_Conversion::Allocator_malloc<wchar_t> >( STRING ).c_str()
+# define ACE_TEXT_TO_MALLOC_TCHAR_OUT(STRING) ACE::String_Conversion::Convert_Out< ACE_TCHAR, ACE::String_Conversion::Allocator_malloc<ACE_TCHAR> >( STRING ).c_str()
+
+# define ACE_TEXT_TO_CHAR_IN(STRING) ACE::String_Conversion::Convert_In< char, wchar_t  >( STRING ).c_str()
+# define ACE_TEXT_TO_WCHAR_IN(STRING) ACE::String_Conversion::Convert_In< wchar_t, char >( STRING ).c_str()
+# define ACE_TEXT_TO_TCHAR_IN(STRING) ACE::String_Conversion::Convert_In< ACE_TCHAR, ACE_ANTI_TCHAR >( STRING ).c_str()
+
+# define ACE_TEXT_TO_CHAR_INOUT(STRING) ACE::String_Conversion::Convert_InOut< char, wchar_t >( STRING ).c_str()
+# define ACE_TEXT_TO_WCHAR_INOUT(STRING) ACE::String_Conversion::Convert_InOut< wchar_t, char >( STRING ).c_str()
+# define ACE_TEXT_TO_TCHAR_INOUT(STRING) ACE::String_Conversion::Convert_InOut< ACE_TCHAR, ACE_ANTI_TCHAR >( STRING ).c_str()
+
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+
+// Global Namespace Types
+typedef ACE::String_Conversion::Convert_In< char, wchar_t > ACE_Wide_To_Ascii;
+typedef ACE::String_Conversion::Convert_In< wchar_t, char > ACE_Ascii_To_Wide;
+typedef ACE::String_Conversion::Convert_In< ACE_TCHAR, ACE_ANTI_TCHAR > ACE_AntiChar_To_TChar;
+typedef ACE::String_Conversion::Convert_In< ACE_ANTI_TCHAR, ACE_TCHAR > ACE_TChar_To_AntiChar;
+
+#if defined (ACE_LEGACY_MODE)
+
+typedef ACE_Ascii_To_Wide ACE_OS_CString;
+typedef ACE_Wide_To_Ascii ACE_OS_WString;
+
+# define ASYS_ONLY_MULTIBYTE_STRING ACE_TEXT_TO_CHAR_IN
+# define ASYS_MULTIBYTE_STRING ACE_TEXT_TO_TCHAR_IN
+# define ASYS_WIDE_STRING ACE_TEXT_TO_TCHAR_IN
+# define ACE_WIDE_STRING ACE_TEXT_TO_TCHAR_IN
+
+# if defined (ACE_USES_WCHAR)
+#   define ASYS_ONLY_WIDE_STRING(STRING) STRING
+# else /* ACE_USES_WCHAR */
+#   define ASYS_ONLY_WIDE_STRING(STRING) \
+           ACE_Ascii_To_Wide (STRING).char_rep ()
+# endif /* ACE_USES_WCHAR */
+
+#endif /* ACE_LEGACY_MODE */
+
+// Legacy Macros
+// These macros have been deprecated in favor of those stated above
+// or expicitely declaring the converter instance.
+// These macros will no longer work where the destination requires
+// a non-const string.
+#define ACE_TEXT_ALWAYS_CHAR(STRING) ACE_TEXT_TO_CHAR_IN( STRING )
+#define ACE_TEXT_ALWAYS_WCHAR(STRING) ACE_TEXT_TO_WCHAR_IN( STRING )
+#define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_TEXT_TO_TCHAR_IN( STRING )
+#define ACE_TEXT_WCHAR_TO_TCHAR(STRING) ACE_TEXT_TO_TCHAR_IN( STRING )
+#define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_TEXT_TO_TCHAR_IN (STRING)
+
+// These macros have been deprecated and should be replaced by their
+// ACE_TEXT_* equivalents.  These macros are just hacks and may not
+// completely provide the old functionality.
+#if defined (ACE_LEGACY_MODE)
+// These are defined to get older stuff to compile
+// FUZZ: disable check_for_tchar
+# define ASYS_TCHAR ACE_TCHAR
+# define ASYS_TEXT ACE_LIB_TEXT
+# define ACE_TEXT_STRING ACE_TString
+#endif /* ACE_LEGACY_MODE */
+
+#endif /* !ACE_LACKS_DEPRECATED_MACROS */
+
+#if defined (__ACE_INLINE__)
+#include "ace/String_Conversion_T.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace/String_Conversion_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("String_Conversion_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include /**/ "ace/post.h"
+#endif /* STRING_CONVERTER_T_H */
diff --git a/ace/String_Conversion_T.inl b/ace/String_Conversion_T.inl
new file mode 100644
index 00000000000..6523ea03653
--- /dev/null
+++ b/ace/String_Conversion_T.inl
@@ -0,0 +1,160 @@
+/* -*- C++ -*- */
+// $Id$
+\
+#ifndef STRING_CONVERSION_T_I
+#define STRING_CONVERSION_T_I
+
+#include "ace/String_Conversion_T.h"
+#include "ace/OS_NS_stdlib_base.h"
+#include "ace/OS_NS_string_base.h"
+
+namespace ACE
+{
+
+namespace String_Conversion
+{
+
+template < typename T > ACE_INLINE
+T*
+Allocator_cpp< T >::alloc( size_t len ) const
+{
+  T* result = new T [len+1];
+  result[ 0 ] = 0;
+  return result;
+}
+
+template < typename T > ACE_INLINE 
+void
+Allocator_cpp< T >::free( T* str ) const
+{
+  delete[] str;
+}
+
+template < typename T > ACE_INLINE 
+T*
+Allocator_malloc< T >::alloc( size_t len ) const
+{
+  T* result = static_cast<T*>(::malloc((len+1)*sizeof(T)));
+  result[ 0 ] = 0;
+  return result;
+}
+
+template < typename T > ACE_INLINE
+void
+Allocator_malloc< T >::free( T* str ) const
+{
+  ::free (str);
+}
+
+template < typename DestT, typename SrcT, typename Allocator > ACE_INLINE
+DestT*
+duplicate( const SrcT* src, size_t* dest_len )
+{
+  DestT* dest = 0;
+
+  if ( src == 0 )
+  {
+    return dest;
+  }
+
+  size_t required_len = ACE_OS::string_copy( static_cast<DestT*>(0), src, 0 );
+  size_t alloc_len = required_len;
+  size_t copy_len = required_len;
+
+  if ( dest_len != 0 )
+  {
+    // If we are calculating len
+    if ( *dest_len == calc_len )
+      *dest_len = required_len;
+
+    // alloc_len is the greater
+    else if ( *dest_len > required_len )
+      alloc_len = *dest_len;
+
+    // copy_len is the lesser
+    else if ( *dest_len < required_len )
+      copy_len = *dest_len;
+  }
+
+  dest = Allocator().alloc( alloc_len );
+
+  copy( dest, src, copy_len );
+
+  return dest;
+}
+
+
+template < typename DestT, typename SrcT > ACE_INLINE
+size_t
+copy( DestT* dest, const SrcT* src, size_t dest_len )
+{
+  if ( dest == 0 )
+  {
+    return -1;
+  }
+  if (src == 0 || dest_len == 0)
+  {
+    dest[0] = 0;
+    return 0;
+  }
+  if ( dest_len == calc_len )
+  {
+    dest_len = ACE_OS::string_copy( static_cast<DestT*>(0), src, 0 );
+  }
+  int result = ACE_OS::string_copy( dest, src, dest_len + 1 );
+  dest[ dest_len ] = 0;
+  return result;
+}
+
+template < typename DestT, typename Allocator > ACE_INLINE
+DestT*
+Convert_Out< DestT, Allocator >::c_str() const
+{
+  return dest_;
+}
+
+
+template < typename DestT, typename Allocator > ACE_INLINE
+size_t
+Convert_Out< DestT, Allocator >::length() const
+{
+  return len_;
+}
+
+template < typename DestT, typename SrcT > ACE_INLINE
+Convert_In< DestT, SrcT >::~Convert_In()
+{
+  Allocator_cpp<DestT>().free( ownstr_ );
+}
+
+
+template < typename DestT, typename SrcT > ACE_INLINE
+const DestT*
+Convert_In< DestT, SrcT >::c_str( void ) const
+{
+  return ( str_ != 0 ? str_ : ownstr_ );
+}
+
+template < typename DestT, typename SrcT > ACE_INLINE
+Convert_InOut< DestT, SrcT >::~Convert_InOut( void )
+{
+  if (ownstr_ != 0)
+  {
+    copy(orig_, ownstr_, (len_/encode_factor_));
+    Allocator_cpp<DestT>().free( ownstr_ );
+  }
+}
+
+
+template < typename DestT, typename SrcT > ACE_INLINE
+DestT*
+Convert_InOut< DestT, SrcT >::c_str( void )
+{
+  return ( str_ != 0 ? str_ : ownstr_ );
+}
+
+} // String_Conversion
+
+} // Ace
+
+#endif /* STRING_CONVERSION_T_I */
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index d18774268d8..f8cb4551e48 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -1520,7 +1520,7 @@ ace_get_module (ACE_Static_Node *str_rec,
 // Main driver program.
 
 int
-main (int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Svc_Conf_Param param (stdin);
 
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
new file mode 100644
index 00000000000..d6972b74a5d
--- /dev/null
+++ b/ace/Synch.cpp
@@ -0,0 +1,40 @@
+#ifndef ACE_SYNCH_CPP
+#define ACE_SYNCH_CPP
+
+#include "ace/Thread.h"
+#include "ace/ACE.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// FUZZ: disable check_for_synch_include
+#include "ace/Synch.h"
+#include "ace/Log_Msg.h"
+
+
+ACE_RCSID (ace,
+           Synch,
+           "$Id$")
+
+#include "ace/TSS_Adapter.cpp"
+#include "ace/Auto_Event.cpp"
+#include "ace/Manual_Event.cpp"
+#include "ace/Barrier.cpp"
+#include "ace/Condition_Thread_Mutex.cpp"
+#include "ace/Condition_Recursive_Thread_Mutex.cpp"
+#include "ace/Event.cpp"
+#include "ace/Lock.cpp"
+#include "ace/Mutex.cpp"
+#include "ace/RW_Mutex.cpp"
+#include "ace/RW_Thread_Mutex.cpp"
+#include "ace/Recursive_Thread_Mutex.cpp"
+#include "ace/Semaphore.cpp"
+#include "ace/Thread_Mutex.cpp"
+#include "ace/Thread_Semaphore.cpp"
+
+// ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+// ACE_ALLOC_HOOK_DEFINE(ACE_Null_Mutex)
+// ACE_END_VERSIONED_NAMESPACE_DECL
+
+#endif /* ACE_SYNCH_CPP */
diff --git a/ace/Template_Instantiations.cpp b/ace/Template_Instantiations.cpp
new file mode 100644
index 00000000000..3df1a0062ec
--- /dev/null
+++ b/ace/Template_Instantiations.cpp
@@ -0,0 +1,360 @@
+//$Id$
+// Note: this file has been created through concatenation of ALL
+// explicit template instantiations in ACE, and only those that
+// interfered with the multithreaded port of ACE to pSOS using the
+// Diab D-C++ 4.1a compiler have been wrapped with the appropriate
+// preprocesor directives for conditional compilation.  If you are
+// trying to use this file, you will need to ensure that any
+// additional preprocessor directives needed are added.  Also, if you
+// wish to extend this technique to instantiation pragmas, you will
+// need to modify the preprocesor directives below
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE)
+// header files that are not already included
+#include "ace/Local_Tokens.h"
+#include "ace/Token.h"
+#include "ace/Containers.h"
+#include "ace/Obstack.h"
+#include "ace/Select_Reactor.h"
+#include "ace/Message_Queue.h"
+#include "ace/Module.h"
+#include "ace/Name_Space.h"
+#include "ace/Stream.h"
+#include "ace/Stream_Modules.h"
+#include "ace/Dynamic.h"
+#include "ace/Local_Name_Space_T.h"
+#include "ace/Filecache.h"
+#include "ace/Token_Invariants.h"
+#include "ace/Remote_Tokens.h"
+#include "ace/Singleton.h"
+#include "ace/Timer_Hash.h"
+#include "ace/Timer_Wheel_T.h"
+#include "ace/Auto_Ptr.h"
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#error ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE may not be used with  ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION or ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
+#endif /* defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) */
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+//  D E P T H = 0
+// Templates with nesting depth 0 (no dependencies on
+// other templates), ordered by number of template arguments
+
+ACE_MT (template class ACE_Guard<ACE_Recursive_Thread_Mutex>);
+
+// ACE_MT (template class ACE_Guard<ACE_SELECT_REACTOR_MUTEX>);
+ACE_MT (template class ACE_Guard<ACE_Local_Mutex>);
+ACE_MT (template class ACE_Guard<ACE_Token>);
+
+ACE_MT (template class ACE_Guard<ACE_Thread_Mutex>);
+
+template class ACE_Guard<ACE_Lock>;
+template class ACE_Guard<ACE_Null_Mutex>;
+template class ACE_Guard<ACE_Process_Mutex>;
+template class ACE_Guard<ACE_RW_Process_Mutex>;
+template class ACE_Guard<ACE_RW_Thread_Mutex>;
+
+ACE_MT (template class ACE_TSS_Guard<ACE_Recursive_Thread_Mutex>);
+
+template class ACE_Array<ACE_Mutex *>;
+template class ACE_Array_Base<ACE_Mutex *>;
+template class ACE_Array<ACE_RW_Thread_Mutex *>;
+template class ACE_Array_Base<ACE_RW_Thread_Mutex *>;
+template class ACE_Array<ACE_TSS_Info>;
+template class ACE_Array_Base<ACE_TSS_Info>;
+template class ACE_Array<ACE_Thread_Mutex *>;
+template class ACE_Array_Base<ACE_Thread_Mutex *>;
+template class ACE_Array_Iterator<ACE_TSS_Info>;
+
+// ACE_PROCESS_MUTEX is defined in Malloc.h,
+// depending on whether ACE_HAS_THREADS is defined
+#if defined (ACE_HAS_MALLOC_STATS)
+template class ACE_Atomic_Op<ACE_PROCESS_MUTEX, int>;
+#endif /* ACE_HAS_MALLOC_STATS */
+
+template class ACE_Auto_Array_Ptr<struct ifreq>;
+template class ACE_Auto_Basic_Array_Ptr<struct ifreq>;
+template class ACE_Auto_Basic_Ptr<ACE_Obstack>;
+
+template class ACE_Cleanup_Adapter<ACE_Log_Msg>;
+template class ACE_Cleanup_Adapter<ACE_Mutex>;
+template class ACE_Cleanup_Adapter<ACE_Null_Mutex>;
+template class ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex>;
+
+// ACE_SYNCH_RW_MUTEX is defined in Synch_T.h
+template class ACE_Cleanup_Adapter<ACE_SYNCH_RW_MUTEX>;
+
+template class ACE_Cleanup_Adapter<ACE_Thread_Mutex>;
+template class ACE_Double_Linked_List<ACE_Thread_Descriptor>;
+template class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor>;
+template class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
+template class ACE_Double_Linked_List_Reverse_Iterator<ACE_Thread_Descriptor>;
+// ACE_SYNCH_RECURSIVE_MUTEX is defined in Synch_T.h
+template class ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>;
+
+template class ACE_Lock_Adapter<ACE_Select_Reactor_Token>;
+
+template class ACE_Managed_Object<ACE_Mutex>;
+template class ACE_Managed_Object<ACE_Null_Mutex>;
+template class ACE_Managed_Object<ACE_Recursive_Thread_Mutex>;
+
+// ACE_SYNCH_RW_MUTEX is defined in Synch_T.h
+template class ACE_Managed_Object<ACE_SYNCH_RW_MUTEX>;
+template class ACE_Managed_Object<ACE_SYNCH_RW_MUTEX>;
+
+template class ACE_Managed_Object<ACE_Thread_Mutex>;
+
+// ACE_NULL_SYNCH is defined in Synch_T.h
+template class ACE_Message_Queue<ACE_NULL_SYNCH>;
+
+// ACE_SYNCH is defined in Synch_T.h
+template class ACE_Message_Queue<ACE_SYNCH>;
+
+// ACE_NULL_SYNCH is defined in Synch_T.h
+template class ACE_Module<ACE_NULL_SYNCH>;
+
+// ACE_SYNCH is defined in Synch_T.h
+template class ACE_Module<ACE_SYNCH>;
+
+template class ACE_Node <ACE_TPQ_Entry *>;
+template class ACE_Node<ACE_Cleanup_Info>;
+template class ACE_Node<ACE_Event_Tuple>;
+template class ACE_Node<ACE_Name_Binding>;
+template class ACE_Node<ACE_Static_Svc_Descriptor *>;
+template class ACE_Node<ACE_TSS_Ref>;
+template class ACE_Node<ACE_Thread_Descriptor*>;
+template class ACE_Node<ACE_Thread_Descriptor>;
+
+template class ACE_Node<ACE_WString>;
+
+// ACE_TCHAR is defined in OS.h
+template class ACE_Node<ACE_TCHAR *>;
+
+template class ACE_Read_Guard<ACE_Null_Mutex>;
+template class ACE_Read_Guard<ACE_RW_Process_Mutex>;
+template class ACE_Read_Guard<ACE_RW_Thread_Mutex>;
+
+// ACE_SYNCH is defined in Synch_T.h
+template class ACE_Stream<ACE_SYNCH>;
+template class ACE_Stream_Head<ACE_SYNCH>;
+template class ACE_Stream_Tail<ACE_SYNCH>;
+
+template class ACE_TSS <ACE_SOCK_Stream>;
+template class ACE_TSS <ACE_TPQ_Entry>;
+template class ACE_TSS<ACE_Dynamic>;
+template class ACE_TSS<ACE_TSS_Keys>;
+template class ACE_TSS<ACE_Thread_Exit>;
+
+// ACE_NULL_SYNCH is defined in Synch_T.h
+template class ACE_Task<ACE_NULL_SYNCH>;
+
+// ACE_SYNCH is defined in Synch_T.h
+template class ACE_Task<ACE_SYNCH>;
+
+// ACE_NULL_SYNCH is defined in Synch_T.h
+template class ACE_Thru_Task<ACE_NULL_SYNCH>;
+
+// ACE_SYNCH is defined in Synch_T.h
+template class ACE_Thru_Task<ACE_SYNCH>;
+
+template class ACE_Timer_Node_T<ACE_Event_Handler *>;
+template class ACE_Unbounded_Queue<ACE_Cleanup_Info>;
+template class ACE_Unbounded_Queue<ACE_Event_Tuple>;
+template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
+template class ACE_Unbounded_Queue<ACE_Thread_Descriptor>;
+
+// ACE_TCHAR is defined in OS.h
+template class ACE_Unbounded_Queue<ACE_TCHAR *>;
+
+template class ACE_Unbounded_Queue_Iterator<ACE_Cleanup_Info>;
+template class ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple>;
+template class ACE_Unbounded_Queue_Iterator<ACE_Thread_Descriptor*>;
+template class ACE_Unbounded_Queue_Iterator<ACE_Thread_Descriptor>;
+
+// ACE_TCHAR is defined in OS.h
+template class ACE_Unbounded_Queue_Iterator<ACE_TCHAR *>;
+
+template class ACE_Unbounded_Set<ACE_Name_Binding>;
+template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>;
+template class ACE_Unbounded_Set<ACE_WString>;
+template class ACE_Unbounded_Set_Iterator<ACE_Name_Binding>;
+template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>;
+template class ACE_Unbounded_Set_Iterator<ACE_WString>;
+template class ACE_Unbounded_Stack <ACE_TPQ_Entry *>;
+template class ACE_Write_Guard<ACE_Null_Mutex>;
+template class ACE_Write_Guard<ACE_RW_Process_Mutex>;
+template class ACE_Write_Guard<ACE_RW_Thread_Mutex>;
+
+// ACE_SYNCH_RW_MUTEX is defined in Synch_T.h
+template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
+
+template class auto_ptr<ACE_Obstack>;
+
+// from Signal.cpp
+#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
+#define ACE_MAX_SIGNAL_HANDLERS ((size_t) 20)
+template class ACE_Fixed_Set<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
+template class ACE_Fixed_Set_Iterator<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
+#endif /* !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) */
+
+// ACE_LOCAL_MEMORY_POOL, ACE_MMAP_MEMORY_POOL, and
+// ACE_LITE_MMAP_MEMORY_POOL are all defined in OS.h
+
+template class ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
+template class ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
+template class ACE_Malloc<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
+template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>;
+template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex>;
+template class ACE_Malloc_T<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex, ACE_Control_Block>;
+template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>;
+template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex, ACE_Control_Block>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> >;
+
+template class ACE_Map_Entry <ACE_Token_Name, ACE_Tokens *>;
+template class ACE_Map_Entry<ACE_Token_Name, ACE_Mutex_Invariants *>;
+template class ACE_Map_Entry<ACE_Token_Name, ACE_RWLock_Invariants *>;
+template class ACE_Map_Entry<ACE_Token_Name, ACE_Token_Proxy *>;
+template class ACE_Module<ACE_Thread_Mutex, ACE_Condition_Thread_Mutex>;
+
+// from Remote_Tokens.cpp
+template class ACE_Singleton <ACE_TSS_Connection, ACE_SYNCH_MUTEX>;
+
+template class ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex>;
+
+// from Local_Name_Space.cpp
+#if (1)
+template class ACE_Hash_Map_Entry<ACE_NS_String, ACE_NS_Internal>;
+template class ACE_Hash<ACE_NS_String>;
+template class ACE_Equal_To<ACE_NS_String>;
+template class ACE_Hash_Map_Manager_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_NS_String, ACE_NS_Internal, ACE_Hash<ACE_NS_String>, ACE_Equal_To<ACE_NS_String>, ACE_Null_Mutex>;
+#else
+template class ACE_Map_Entry<ACE_NS_String, ACE_NS_Internal>;
+template class ACE_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
+#endif
+
+// from Filecache.cpp
+#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
+template class ACE_Hash_Map_Entry<const char *, ACE_Filecache_Object *>;
+template class ACE_Hash_Map_Manager_Ex<const char *, ACE_Filecache_Object *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<const char *, ACE_Filecache_Object *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<const char *, ACE_Filecache_Object *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, ACE_Filecache_Object *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>;
+#else
+template class ACE_Hash_Map_Entry<ACE_TString, ACE_Filecache_Object *>;
+template class ACE_Hash<ACE_TString>;
+template class ACE_Equal_To<ACE_TString>;
+template class ACE_Hash_Map_Manager_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, ACE_Filecache_Object *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
+#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
+
+template class ACE_Map_Iterator<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>;
+template class ACE_Map_Manager <ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>;
+template class ACE_Map_Manager<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>;
+template class ACE_Map_Manager<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>;
+template class ACE_Map_Manager<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Mutex_Invariants *, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>;
+
+//  D E P T H = 1
+// Templates with nesting depth 1 (dependencies on other templates 1
+// level deep), ordered by number of template arguments at top level
+
+
+// ACE_MMAP_MEMORY_POOL is defined in OS.h
+
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> >;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> >;
+
+template class ACE_Node<ACE_Timer_Node_T<ACE_Event_Handler *> *>;
+
+// ACE_SYNCH_NULL_MUTEX is defined in Synch_T.h
+template class ACE_Cached_Allocator<ACE_Node<ACE_Event_Tuple>, ACE_SYNCH_NULL_MUTEX>;
+
+template class ACE_Cached_Mem_Pool_Node<ACE_Node<ACE_Event_Tuple> >;
+template class ACE_Free_List<ACE_Timer_Node_T<ACE_Event_Handler *> >;
+
+// ACE_SYNCH_RECURSIVE_MUTEX is defined in Synch_T.h
+template class ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Timer_List_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Timer_List_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Timer_Queue_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Timer_Queue_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Timer_Wheel_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
+
+template class ACE_Unbounded_Set<ACE_Timer_Node_T<ACE_Event_Handler *> *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Timer_Node_T<ACE_Event_Handler *> *>;
+template class ACE_Locked_Free_List<ACE_Timer_Node_T<ACE_Event_Handler *>, ACE_Null_Mutex>;
+
+template class ACE_Timer_Hash_Upcall<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>;
+
+// ACE_SYNCH_RECURSIVE_MUTEX is defined in Synch_T.h
+template class ACE_Timer_Hash_Upcall <ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Timer_Hash_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_List>;
+template class ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_List>;
+template class ACE_Timer_Hash_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_Heap>;
+template class ACE_Timer_Hash_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX, ACE_Hash_Timer_Heap>;
+
+//  D E P T H = 2
+// Templates with nesting depth 2 (dependencies on other templates 2
+// levels deep), ordered by number of template arguments at top level
+
+template class ACE_Timer_Queue_T <ACE_Event_Handler *, ACE_Hash_Upcall, ACE_Null_Mutex>;
+
+template class ACE_Timer_Queue_Iterator_T <ACE_Event_Handler *, ACE_Hash_Upcall, ACE_Null_Mutex>;
+
+template class ACE_Timer_List_T <ACE_Event_Handler *, ACE_Hash_Upcall, ACE_Null_Mutex>;
+
+template class ACE_Timer_List_Iterator_T <ACE_Event_Handler *, ACE_Hash_Upcall, ACE_Null_Mutex>;
+
+template class ACE_Timer_Heap_T <ACE_Event_Handler *, ACE_Hash_Upcall, ACE_Null_Mutex>;
+
+template class ACE_Timer_Heap_Iterator_T <ACE_Event_Handler *, ACE_Hash_Upcall, ACE_Null_Mutex>;
+
+// ACE_MMAP_MEMORY_POOL and ACE_LITE_MMAP_MEMORY_POOL are defined in OS.h
+
+template class ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> > >;
+template class ACE_Name_Space_Map <ACE_Allocator_Adapter <ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> > >;
+
+template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_Node<ACE_Event_Tuple> > >;
+
+// ACE_SYNCH_NULL_MUTEX is defined in Synch_T.h
+template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_Node<ACE_Event_Tuple> >, ACE_SYNCH_NULL_MUTEX>;
+
+template class ACE_Timer_Heap_T<ACE_Event_Handler*, ACE_Timer_Hash_Upcall<ACE_Event_Handler*, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>, ACE_Null_Mutex>;
+
+template class ACE_Timer_Heap_Iterator_T<ACE_Event_Handler*, ACE_Timer_Hash_Upcall<ACE_Event_Handler*, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>, ACE_Null_Mutex>;
+
+template class ACE_Timer_List_T<ACE_Event_Handler*, ACE_Timer_Hash_Upcall<ACE_Event_Handler*, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>, ACE_Null_Mutex>;
+
+template class ACE_Timer_List_Iterator_T<ACE_Event_Handler*, ACE_Timer_Hash_Upcall<ACE_Event_Handler*, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>, ACE_Null_Mutex>;
+
+template class ACE_Timer_Queue_T<ACE_Event_Handler*, ACE_Timer_Hash_Upcall<ACE_Event_Handler*, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>, ACE_Null_Mutex>;
+
+template class ACE_Timer_Queue_Iterator_T<ACE_Event_Handler*, ACE_Timer_Hash_Upcall<ACE_Event_Handler*, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_Null_Mutex>, ACE_Null_Mutex>, ACE_Null_Mutex>;
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+#elif defined (__HP_aCC)
+// Make aC++ stop complaining about an empty translation unit
+static int shut_up_aCC = 0;
+#endif /* defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE) */
diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp
index 8dd3c52a36c..cb23ba91ef5 100644
--- a/ace/UNIX_Addr.cpp
+++ b/ace/UNIX_Addr.cpp
@@ -50,7 +50,7 @@ int
 ACE_UNIX_Addr::addr_to_string (ACE_TCHAR s[], size_t len) const
 {
   ACE_OS::strsncpy (s,
-                    ACE_TEXT_CHAR_TO_TCHAR (this->unix_addr_.sun_path),
+                    ACE_TEXT_TO_TCHAR_IN (this->unix_addr_.sun_path),
                     len);
   return 0;
 }
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index fcd6ed9bf46..eacabcf0d90 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -73,13 +73,11 @@ public:
   /// Transform the string into the current addressing format.
   virtual int string_to_addr (const char addr[]);
 
-#if defined (ACE_HAS_WCHAR)
   /// Creates an ACE_UNIX_Addr from a string.
   ACE_UNIX_Addr (const wchar_t rendezvous_point[]);
 
   /// Creates an ACE_UNIX_Addr from a string.
   int set (const wchar_t rendezvous_point[]);
-#endif /* ACE_HAS_WCHAR */
 
   /// Compare two addresses for equality.
   bool operator == (const ACE_UNIX_Addr &SAP) const;
diff --git a/ace/UNIX_Addr.inl b/ace/UNIX_Addr.inl
index 34fa002ef34..4e9e369d8f0 100644
--- a/ace/UNIX_Addr.inl
+++ b/ace/UNIX_Addr.inl
@@ -10,21 +10,18 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_WCHAR)
-/// Creates an ACE_UNIX_Addr from a string.
 ACE_INLINE
 ACE_UNIX_Addr::ACE_UNIX_Addr (const wchar_t rendezvous_point[])
 {
-  this->set (ACE_TEXT_ALWAYS_CHAR (rendezvous_point));
+  this->set (rendezvous_point);
 }
 
 /// Creates an ACE_UNIX_Addr from a string.
 ACE_INLINE int
 ACE_UNIX_Addr::set (const wchar_t rendezvous_point[])
 {
-  return this->set (ACE_TEXT_ALWAYS_CHAR (rendezvous_point));
+  return this->set (ACE_TEXT_TO_CHAR_IN (rendezvous_point));
 }
-#endif /* ACE_HAS_WCHAR */
 
 // Compare two addresses for equality.
 
diff --git a/ace/ace_for_tao.mpc b/ace/ace_for_tao.mpc
index a9c45be927b..1e7a3704833 100644
--- a/ace/ace_for_tao.mpc
+++ b/ace/ace_for_tao.mpc
@@ -13,7 +13,6 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, versioned_namespace, pkgconfi
     Active_Map_Manager.cpp
     Addr.cpp
     Arg_Shifter.cpp
-    ARGV.cpp
     Argv_Type_Converter.cpp
     Assert.cpp
     Atomic_Op.cpp
diff --git a/ace/ace_wchar.h b/ace/ace_wchar.h
index ef0026fb7d0..740100eb671 100644
--- a/ace/ace_wchar.h
+++ b/ace/ace_wchar.h
@@ -17,83 +17,49 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// These macros have been deprecated and should be replaced by their
-// ACE_TEXT_* equivalents.  These macros are just hacks and may not
-// completely provide the old functionality.
-#if defined (ACE_LEGACY_MODE)
-// Convert the old unicode indicators
-# if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
-#   define ACE_USES_WCHAR
-# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
-# if defined (ACE_HAS_UNICODE)
-#   define ACE_HAS_WCHAR
-# endif /* ACE_HAS_UNICODE */
-
-// These are defined to get older stuff to compile
-// FUZZ: disable check_for_tchar
-# define ASYS_TCHAR ACE_TCHAR
-# define ASYS_TEXT ACE_TEXT
-# define ASYS_ONLY_MULTIBYTE_STRING ACE_TEXT_ALWAYS_CHAR
-# define ASYS_MULTIBYTE_STRING ACE_TEXT_CHAR_TO_TCHAR
-# define ASYS_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR
-# define ACE_WIDE_STRING ACE_TEXT_CHAR_TO_TCHAR
-
-# if defined (ACE_USES_WCHAR)
-#   define ASYS_ONLY_WIDE_STRING(STRING) STRING
-# else /* ACE_USES_WCHAR */
-#   define ASYS_ONLY_WIDE_STRING(STRING) \
-           ACE_Ascii_To_Wide (STRING).wchar_rep ()
-# endif /* ACE_USES_WCHAR */
-
-# define ACE_TEXT_STRING ACE_TString
-
-#endif /* ACE_LEGACY_MODE */
-
-#if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
-#  if !defined (ACE_HAS_WCHAR)
-#    define ACE_HAS_WCHAR
-#  endif
-#  include /**/ <wchar.h>
-#endif /* ACE_HAS_XPG4_MULTIBYPTE_CHAR */
-
-#if defined (ACE_HAS_WCHAR)
-# if defined (ACE_VXWORKS)
+#if !defined(ACE_SIZEOF_WCHAR) || !defined (ACE_WCHAR_MAX)
+#error Must define ACE_SIZEOF_WCHAR, ACE_WCHAR_MAX, \
+and (maybe undefine) ACE_LACKS_BUILTIN_WCHAR_T in the config-<platform>.h. \
+Typedef wchar_t, wint_t, and/or wctype_t in the config-<platform>.h \
+or within the conditional #includes below if the platform does \
+not supply them.
+#endif
+
+// Add includes and/or typedefs to get wchar_t, wint_t, and wctype_t.
+# if defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
+#    include /**/ <wchar.h>
+# endif /* ACE_HAS_XPG4_MULTIBYPTE_CHAR */
+
+# if defined (VXWORKS)
 #   include /**/ <types/vxTypes.h>  /* For wchar_t */
-#   include /**/ <stdlib.h>         /* For mbstowcs, etc. */
-#   include /**/ <string.h>         /* For strlen */
-#   if !defined (__RTP__)
-#     define wint_t unsigned int    /* VxWorks has wchar_t but not wint_t */
-#   else
-#     include /**/ <wchar.h>
-#     include /**/ <wctype.h>
-#   endif
+#   include <stddef.h> /* For wint_t */
+    typedef wchar_t wctype_t;
+# elif defined (__Lynx__)
+#   include /**/ <stdlib.h>  /* For wchar_t */
+    typedef unsigned int wint_t;
+    typedef wchar_t wctype_t;
 # elif defined (ACE_OPENVMS)
 #   include /**/ <wchar.h>
 #   include /**/ <wctype.h>
+
 # elif defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \
     (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
 #   include /**/ <cwchar>
 #   include /**/ <cwctype>
+
 # elif defined (ACE_HAS_WINCE)
 #   include /**/ <wtypes.h>
+
 # elif !defined (__BORLANDC__)
 #   include /**/ <wchar.h>
+
 # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
-#endif /* ACE_HAS_WCHAR */
 
 #if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \
             (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0)
 using std::size_t;
 #endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */
 
-// This makes the somewhat dubious assumption that if a platform lacks
-// a native wchar_t type, then it will typedef it as unsigned short.
-#if defined (ACE_HAS_WCHAR) && !defined (ACE_LACKS_NATIVE_WCHAR_T)
-# if !defined (ACE_WSTRING_HAS_USHORT_SUPPORT)
-#  define ACE_WSTRING_HAS_USHORT_SUPPORT
-# endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */
-#endif /* ACE_HAS_WCHAR && !ACE_LACKS_NATIVE_WCHAR_T */
-
 // Set the default behaviour for ACE_TEXT_WIDE to use the L-prefix
 #if !defined (ACE_USES_L_PREFIX)
 # define ACE_USES_L_PREFIX 1
@@ -110,26 +76,6 @@ using std::size_t;
 #  define ACE_TEXT_WIDE(STRING) ACE_TEXT_WIDE_I (STRING)
 # endif /* ACE_TEXT_WIDE */
 
-#if defined (ACE_USES_WCHAR)
-typedef wchar_t ACE_TCHAR;
-typedef char ACE_ANTI_TCHAR;
-# define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE (STRING)
-# define ACE_TEXT_ALWAYS_CHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep ()
-# define ACE_TEXT_ALWAYS_WCHAR(STRING) STRING
-# define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep ()
-# define ACE_TEXT_WCHAR_TO_TCHAR(STRING) STRING
-# define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep ()
-#else /* ACE_USES_WCHAR */
-typedef char ACE_TCHAR;
-typedef wchar_t ACE_ANTI_TCHAR;
-# define ACE_LIB_TEXT(STRING) STRING
-# define ACE_TEXT_ALWAYS_CHAR(STRING) STRING
-# define ACE_TEXT_ALWAYS_WCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep ()
-# define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING
-# define ACE_TEXT_WCHAR_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep ()
-# define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep ()
-#endif /* ACE_USES_WCHAR */
-
 #if defined (ACE_LEGACY_MODE)
 # define ACE_TEXT TEXT
 #else /* ACE_LEGACY_MODE */
@@ -161,188 +107,33 @@ typedef wchar_t ACE_ANTI_TCHAR;
 
 #endif /* ACE_HAS_XPG4_MULTIBYTE_CHAR */
 
-#if defined ACE_HAS_WCHAR
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class ACE_Wide_To_Ascii
- *
- * @brief A lightweight wchar* to char* string conversion class.
- *
- * The purpose of this class is to perform conversion from
- * wchar* to char* strings.  It is not intended for general
- * purpose use.
- */
-class ACE_Wide_To_Ascii
-{
-public:
-  /// Ctor must take a wchar string.
-  ACE_Wide_To_Ascii (const wchar_t *s);
-
-  /// Dtor will free up the memory.
-  ~ACE_Wide_To_Ascii (void);
-
-  /// Return the internal char* representation.
-  char *char_rep (void);
-
-  /// Converts an wchar_t string to ascii and returns a new string.
-  static char *convert (const wchar_t *wstr);
-
-private:
-  /// Internal pointer to the converted string.
-  char *s_;
-
-  /// Disallow these operation.
-  ACE_Wide_To_Ascii (void);
-  ACE_Wide_To_Ascii (ACE_Wide_To_Ascii &);
-  ACE_Wide_To_Ascii& operator= (ACE_Wide_To_Ascii &);
-};
-
-/**
- * @class ACE_Ascii_To_Wide
- *
- * @brief A lightweight char* to wchar* string conversion class.
- *
- * The purpose of this class is to perform conversion from
- * char* to wchar* strings.  It is not intended for general
- * purpose use.
- */
-class ACE_Ascii_To_Wide
-{
-public:
-  /// Ctor must take a wchar string.
-  ACE_Ascii_To_Wide (const char *s);
-
-  /// Dtor will free up the memory.
-  ~ACE_Ascii_To_Wide (void);
-
-  /// Return the internal wchar* representation.
-  wchar_t *wchar_rep (void);
-
-  /// Converts an char string to unicode/wide and returns a new string.
-  static wchar_t *convert (const char *str);
-
-private:
-  /// Internal pointer to the converted string.
-  wchar_t *s_;
-
-  /// Disallow these operation.
-  ACE_Ascii_To_Wide (void);
-  ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &);
-  ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &);
-};
-
-#if defined (ACE_LEGACY_MODE)
-typedef ACE_Ascii_To_Wide ACE_OS_CString;
-typedef ACE_Wide_To_Ascii ACE_OS_WString;
-#endif /* ACE_LEGACY_MODE */
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_WCHAR */
-
-#if defined (ACE_WIN32)
 #if defined (ACE_USES_WCHAR)
-#define ACE_TEXT_SERVICE_TABLE_ENTRY             SERVICE_TABLE_ENTRYW
-#define ACE_TEXT_STARTUPINFO                     STARTUPINFOW
-#define ACE_TEXT_WIN32_FIND_DATA                 WIN32_FIND_DATAW
-
-#define ACE_TEXT_CreateEvent                     ::CreateEventW
-#define ACE_TEXT_CreateFile                      ::CreateFileW
-#define ACE_TEXT_CreateFileMapping               ::CreateFileMappingW
-#define ACE_TEXT_CreateMutex                     ::CreateMutexW
-#define ACE_TEXT_CreateProcess                   ::CreateProcessW
-#define ACE_TEXT_CreateSemaphore                 ::CreateSemaphoreW
-#define ACE_TEXT_CreateService                   ::CreateServiceW
-#define ACE_TEXT_ExpandEnvironmentStrings        ::ExpandEnvironmentStringsW
-#define ACE_TEXT_FindFirstChangeNotification     ::FindFirstChangeNotificationW
-#define ACE_TEXT_FindFirstFile                   ::FindFirstFileW
-#define ACE_TEXT_FindNextFile                    ::FindNextFileW
-#define ACE_TEXT_FormatMessage                   ::FormatMessageW
-#define ACE_TEXT_FreeEnvironmentStrings          ::FreeEnvironmentStringsW
-#define ACE_TEXT_GetComputerName                 ::GetComputerNameW
-#define ACE_TEXT_GetEnvironmentStrings           ::GetEnvironmentStringsW
-#define ACE_TEXT_GetFileAttributes               ::GetFileAttributesW
-#define ACE_TEXT_GetModuleFileName               ::GetModuleFileNameW
-#define ACE_TEXT_GetTempPath                     ::GetTempPathW
-#define ACE_TEXT_GetUserName                     ::GetUserNameW
-#define ACE_TEXT_LoadLibrary                     ::LoadLibraryW
-#define ACE_TEXT_MoveFileEx                      ::MoveFileExW
-#define ACE_TEXT_WaitNamedPipe                   ::WaitNamedPipeW
-#define ACE_TEXT_OpenFileMapping                 ::OpenFileMappingW
-#define ACE_TEXT_OpenSCManager                   ::OpenSCManagerW
-#define ACE_TEXT_OpenService                     ::OpenServiceW
-#define ACE_TEXT_OutputDebugString               ::OutputDebugStringW
-#define ACE_TEXT_RegisterEventSource             ::RegisterEventSourceW
-#define ACE_TEXT_RegisterServiceCtrlHandler      ::RegisterServiceCtrlHandlerW
-#define ACE_TEXT_RegConnectRegistry              ::RegConnectRegistryW
-#define ACE_TEXT_RegCreateKeyEx                  ::RegCreateKeyExW
-#define ACE_TEXT_RegDeleteKey                    ::RegDeleteKeyW
-#define ACE_TEXT_RegDeleteValue                  ::RegDeleteValueW
-#define ACE_TEXT_RegEnumKeyEx                    ::RegEnumKeyExW
-#define ACE_TEXT_RegEnumValue                    ::RegEnumValueW
-#define ACE_TEXT_RegCreateKey                    ::RegCreateKeyW
-#define ACE_TEXT_RegOpenKey                      ::RegOpenKeyW
-#define ACE_TEXT_RegOpenKeyEx                    ::RegOpenKeyExW
-#define ACE_TEXT_RegQueryValueEx                 ::RegQueryValueExW
-#define ACE_TEXT_RegSetValueEx                   ::RegSetValueExW
-#define ACE_TEXT_ReportEvent                     ::ReportEventW
-#define ACE_TEXT_SearchPath                      ::SearchPathW
-#define ACE_TEXT_StartService                    ::StartServiceW
-#define ACE_TEXT_StartServiceCtrlDispatcher      ::StartServiceCtrlDispatcherW
-
+  typedef wchar_t ACE_TCHAR;
+  typedef char ACE_ANTI_TCHAR;
+  # define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE( STRING )
 #else /* ACE_USES_WCHAR */
-#define ACE_TEXT_SERVICE_TABLE_ENTRY             SERVICE_TABLE_ENTRYA
-#define ACE_TEXT_STARTUPINFO                     STARTUPINFOA
-#define ACE_TEXT_WIN32_FIND_DATA                 WIN32_FIND_DATAA
-
-#define ACE_TEXT_CreateEvent                     ::CreateEventA
-#define ACE_TEXT_CreateFile                      ::CreateFileA
-#define ACE_TEXT_CreateFileMapping               ::CreateFileMappingA
-#define ACE_TEXT_CreateMutex                     ::CreateMutexA
-#define ACE_TEXT_CreateProcess                   ::CreateProcessA
-#define ACE_TEXT_CreateSemaphore                 ::CreateSemaphoreA
-#define ACE_TEXT_CreateService                   ::CreateServiceA
-#define ACE_TEXT_ExpandEnvironmentStrings        ::ExpandEnvironmentStringsA
-#define ACE_TEXT_FindFirstChangeNotification     ::FindFirstChangeNotificationA
-#define ACE_TEXT_FindFirstFile                   ::FindFirstFileA
-#define ACE_TEXT_FindNextFile                    ::FindNextFileA
-#define ACE_TEXT_FormatMessage                   ::FormatMessageA
-#define ACE_TEXT_FreeEnvironmentStrings          ::FreeEnvironmentStringsA
-#define ACE_TEXT_GetComputerName                 ::GetComputerNameA
-#define ACE_TEXT_GetEnvironmentStrings           ::GetEnvironmentStringsA
-#define ACE_TEXT_GetFileAttributes               ::GetFileAttributesA
-#define ACE_TEXT_GetModuleFileName               ::GetModuleFileNameA
-#define ACE_TEXT_GetTempPath                     ::GetTempPathA
-#define ACE_TEXT_GetUserName                     ::GetUserNameA
-#define ACE_TEXT_LoadLibrary                     ::LoadLibraryA
-#define ACE_TEXT_MoveFileEx                      ::MoveFileExA
-#define ACE_TEXT_WaitNamedPipe                   ::WaitNamedPipeA
-#define ACE_TEXT_OpenFileMapping                 ::OpenFileMappingA
-#define ACE_TEXT_OpenSCManager                   ::OpenSCManagerA
-#define ACE_TEXT_OpenService                     ::OpenServiceA
-#define ACE_TEXT_OutputDebugString               ::OutputDebugStringA
-#define ACE_TEXT_RegisterEventSource             ::RegisterEventSourceA
-#define ACE_TEXT_RegisterServiceCtrlHandler      ::RegisterServiceCtrlHandlerA
-#define ACE_TEXT_RegConnectRegistry              ::RegConnectRegistryA
-#define ACE_TEXT_RegCreateKeyEx                  ::RegCreateKeyExA
-#define ACE_TEXT_RegDeleteKey                    ::RegDeleteKeyA
-#define ACE_TEXT_RegDeleteValue                  ::RegDeleteValueA
-#define ACE_TEXT_RegEnumKeyEx                    ::RegEnumKeyExA
-#define ACE_TEXT_RegEnumValue                    ::RegEnumValueA
-#define ACE_TEXT_RegCreateKey                    ::RegCreateKeyA
-#define ACE_TEXT_RegOpenKey                      ::RegOpenKeyA
-#define ACE_TEXT_RegOpenKeyEx                    ::RegOpenKeyExA
-#define ACE_TEXT_RegQueryValueEx                 ::RegQueryValueExA
-#define ACE_TEXT_RegSetValueEx                   ::RegSetValueExA
-#define ACE_TEXT_ReportEvent                     ::ReportEventA
-#define ACE_TEXT_SearchPath                      ::SearchPathA
-#define ACE_TEXT_StartService                    ::StartServiceA
-#define ACE_TEXT_StartServiceCtrlDispatcher      ::StartServiceCtrlDispatcherA
+  typedef char ACE_TCHAR;
+  typedef wchar_t ACE_ANTI_TCHAR;
+  # define ACE_LIB_TEXT(STRING) STRING
 #endif /* ACE_USES_WCHAR */
-#endif /* ACE_WIN32 */
 
-#include "ace/ace_wchar.inl"
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+  // Via compiler, sys headers, config-platform.h,
+  // or this header we have a wchar_t
+  #define ACE_HAS_WCHAR
+  #undef ACE_LACKS_WCHAR_T
+  // The wchar type is simpley wchar_t
+  #define ACE_WCHAR_T wchar_t
+  #define ACE_WINT_T wint_t
+  #define ACE_WCHAR_T_TYPE wchar_t
+  #define ACE_LACKS_NATIVR_WCHAR_T ACE_LACKS_BUILTIN_WCHAR_T
+  namespace ACE_OS { typedef wchar_t WChar; }
+#endif /* ACE_LACKS_DEPRECATED_MACROS */
+
+// This package should only be included in the implementation files
+// that use it.
+#if defined (ACE_WIN32)
+#include "ace/ace_wchar_win32_defs.h"
+#endif
 
 #endif /* ACE_WCHAR_H */
diff --git a/ace/ace_wchar.inl b/ace/ace_wchar.inl
deleted file mode 100644
index 617975df46a..00000000000
--- a/ace/ace_wchar.inl
+++ /dev/null
@@ -1,127 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// These are always inlined
-// FUZZ: disable check_for_inline
-
-#if defined (ACE_HAS_WCHAR)
-
-#if !defined (ACE_WIN32)
-#  include /**/ <string.h>             // Need to see strlen()
-#endif /* ACE_WIN32 */
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-inline
-ACE_Wide_To_Ascii::~ACE_Wide_To_Ascii (void)
-{
-  delete [] this->s_;
-}
-
-inline char *
-ACE_Wide_To_Ascii::char_rep (void)
-{
-  return this->s_;
-}
-
-inline char *
-ACE_Wide_To_Ascii::convert (const wchar_t *wstr)
-{
-  // Short circuit null pointer case
-  if (wstr == 0)
-    return 0;
-
-# if defined (ACE_WIN32)
-  UINT cp = GetACP ();
-  int len = ::WideCharToMultiByte (cp,
-                                   0,
-                                   wstr,
-                                   -1,
-                                   0,
-                                   0,
-                                   0,
-                                   0);
-# elif defined (ACE_LACKS_WCSLEN)
-  const wchar_t *wtemp = wstr;
-  while (wtemp != 0)
-    ++wtemp;
-
-  int len = wtemp - wstr + 1;
-# else  /* ACE_WIN32 */
-  size_t len = ::wcslen (wstr) + 1;
-# endif /* ACE_WIN32 */
-
-  char *str = new char[len];
-
-# if defined (ACE_WIN32)
-  ::WideCharToMultiByte (cp, 0, wstr, -1, str, len, 0, 0);
-# elif defined (VXWORKS)
-  ::wcstombs (str, wstr, len);
-# else /* ACE_WIN32 */
-  for (size_t i = 0; i < len; i++)
-    {
-      wchar_t *t = const_cast <wchar_t *> (wstr);
-      str[i] = static_cast<char> (*(t + i));
-    }
-# endif /* ACE_WIN32 */
-  return str;
-}
-
-inline
-ACE_Wide_To_Ascii::ACE_Wide_To_Ascii (const wchar_t *s)
-  : s_ (ACE_Wide_To_Ascii::convert (s))
-{
-}
-
-inline
-ACE_Ascii_To_Wide::~ACE_Ascii_To_Wide (void)
-{
-  delete [] this->s_;
-}
-
-inline wchar_t *
-ACE_Ascii_To_Wide::wchar_rep (void)
-{
-  return this->s_;
-}
-
-inline wchar_t *
-ACE_Ascii_To_Wide::convert (const char *str)
-{
-  // Short circuit null pointer case
-  if (str == 0)
-    return 0;
-
-# if defined (ACE_WIN32)
-  UINT cp = GetACP ();
-  int len = ::MultiByteToWideChar (cp, 0, str, -1, 0, 0);
-# else /* ACE_WIN32 */
-  size_t len = strlen (str) + 1;
-# endif /* ACE_WIN32 */
-
-  wchar_t *wstr = new wchar_t[len];
-
-# if defined (ACE_WIN32)
-  ::MultiByteToWideChar (cp, 0, str, -1, wstr, len);
-# elif defined (VXWORKS)
-  ::mbstowcs (wstr, str, len);
-# else /* ACE_WIN32 */
-  for (size_t i = 0; i < len; i++)
-    {
-      char *t = const_cast<char *> (str);
-      wstr[i] = static_cast<wchar_t> (*((unsigned char*)(t + i)));
-    }
-# endif /* ACE_WIN32 */
-  return wstr;
-}
-
-inline
-ACE_Ascii_To_Wide::ACE_Ascii_To_Wide (const char *s)
-  : s_ (ACE_Ascii_To_Wide::convert (s))
-{
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_HAS_WCHAR */
diff --git a/ace/ace_wchar_win32_defs.h b/ace/ace_wchar_win32_defs.h
new file mode 100644
index 00000000000..eec4ab2dd2c
--- /dev/null
+++ b/ace/ace_wchar_win32_defs.h
@@ -0,0 +1,100 @@
+/* -*- C++ -*- */
+// $Id$
+
+// Windows Macros
+#if defined (ACE_USES_WCHAR)
+#define ACE_TEXT_SERVICE_TABLE_ENTRY             SERVICE_TABLE_ENTRYW
+#define ACE_TEXT_STARTUPINFO                     STARTUPINFOW
+#define ACE_TEXT_WIN32_FIND_DATA                 WIN32_FIND_DATAW
+
+#define ACE_TEXT_CreateEvent                     ::CreateEventW
+#define ACE_TEXT_CreateFile                      ::CreateFileW
+#define ACE_TEXT_CreateFileMapping               ::CreateFileMappingW
+#define ACE_TEXT_CreateMutex                     ::CreateMutexW
+#define ACE_TEXT_CreateProcess                   ::CreateProcessW
+#define ACE_TEXT_CreateSemaphore                 ::CreateSemaphoreW
+#define ACE_TEXT_CreateService                   ::CreateServiceW
+#define ACE_TEXT_ExpandEnvironmentStrings        ::ExpandEnvironmentStringsW
+#define ACE_TEXT_FindFirstChangeNotification     ::FindFirstChangeNotificationW
+#define ACE_TEXT_FindFirstFile                   ::FindFirstFileW
+#define ACE_TEXT_FindNextFile                    ::FindNextFileW
+#define ACE_TEXT_FormatMessage                   ::FormatMessageW
+#define ACE_TEXT_FreeEnvironmentStrings          ::FreeEnvironmentStringsW
+#define ACE_TEXT_GetComputerName                 ::GetComputerNameW
+#define ACE_TEXT_GetEnvironmentStrings           ::GetEnvironmentStringsW
+#define ACE_TEXT_GetFileAttributes               ::GetFileAttributesW
+#define ACE_TEXT_GetModuleFileName               ::GetModuleFileNameW
+#define ACE_TEXT_GetTempPath                     ::GetTempPathW
+#define ACE_TEXT_GetUserName                     ::GetUserNameW
+#define ACE_TEXT_LoadLibrary                     ::LoadLibraryW
+#define ACE_TEXT_MoveFileEx                      ::MoveFileExW
+#define ACE_TEXT_WaitNamedPipe                   ::WaitNamedPipeW
+#define ACE_TEXT_OpenFileMapping                 ::OpenFileMappingW
+#define ACE_TEXT_OpenSCManager                   ::OpenSCManagerW
+#define ACE_TEXT_OpenService                     ::OpenServiceW
+#define ACE_TEXT_RegisterEventSource             ::RegisterEventSourceW
+#define ACE_TEXT_RegisterServiceCtrlHandler      ::RegisterServiceCtrlHandlerW
+#define ACE_TEXT_RegConnectRegistry              ::RegConnectRegistryW
+#define ACE_TEXT_RegCreateKeyEx                  ::RegCreateKeyExW
+#define ACE_TEXT_RegDeleteKey                    ::RegDeleteKeyW
+#define ACE_TEXT_RegDeleteValue                  ::RegDeleteValueW
+#define ACE_TEXT_RegEnumKeyEx                    ::RegEnumKeyExW
+#define ACE_TEXT_RegEnumValue                    ::RegEnumValueW
+#define ACE_TEXT_RegCreateKey                    ::RegCreateKeyW
+#define ACE_TEXT_RegOpenKey                      ::RegOpenKeyW
+#define ACE_TEXT_RegOpenKeyEx                    ::RegOpenKeyExW
+#define ACE_TEXT_RegQueryValueEx                 ::RegQueryValueExW
+#define ACE_TEXT_RegSetValueEx                   ::RegSetValueExW
+#define ACE_TEXT_ReportEvent                     ::ReportEventW
+#define ACE_TEXT_SearchPath                      ::SearchPathW
+#define ACE_TEXT_StartService                    ::StartServiceW
+#define ACE_TEXT_StartServiceCtrlDispatcher      ::StartServiceCtrlDispatcherW
+
+#else /* ACE_USES_WCHAR */
+#define ACE_TEXT_SERVICE_TABLE_ENTRY             SERVICE_TABLE_ENTRYA
+#define ACE_TEXT_STARTUPINFO                     STARTUPINFOA
+#define ACE_TEXT_WIN32_FIND_DATA                 WIN32_FIND_DATAA
+
+#define ACE_TEXT_CreateEvent                     ::CreateEventA
+#define ACE_TEXT_CreateFile                      ::CreateFileA
+#define ACE_TEXT_CreateFileMapping               ::CreateFileMappingA
+#define ACE_TEXT_CreateMutex                     ::CreateMutexA
+#define ACE_TEXT_CreateProcess                   ::CreateProcessA
+#define ACE_TEXT_CreateSemaphore                 ::CreateSemaphoreA
+#define ACE_TEXT_CreateService                   ::CreateServiceA
+#define ACE_TEXT_ExpandEnvironmentStrings        ::ExpandEnvironmentStringsA
+#define ACE_TEXT_FindFirstChangeNotification     ::FindFirstChangeNotificationA
+#define ACE_TEXT_FindFirstFile                   ::FindFirstFileA
+#define ACE_TEXT_FindNextFile                    ::FindNextFileA
+#define ACE_TEXT_FormatMessage                   ::FormatMessageA
+#define ACE_TEXT_FreeEnvironmentStrings          ::FreeEnvironmentStringsA
+#define ACE_TEXT_GetComputerName                 ::GetComputerNameA
+#define ACE_TEXT_GetEnvironmentStrings           ::GetEnvironmentStringsA
+#define ACE_TEXT_GetFileAttributes               ::GetFileAttributesA
+#define ACE_TEXT_GetModuleFileName               ::GetModuleFileNameA
+#define ACE_TEXT_GetTempPath                     ::GetTempPathA
+#define ACE_TEXT_GetUserName                     ::GetUserNameA
+#define ACE_TEXT_LoadLibrary                     ::LoadLibraryA
+#define ACE_TEXT_MoveFileEx                      ::MoveFileExA
+#define ACE_TEXT_WaitNamedPipe                   ::WaitNamedPipeA
+#define ACE_TEXT_OpenFileMapping                 ::OpenFileMappingA
+#define ACE_TEXT_OpenSCManager                   ::OpenSCManagerA
+#define ACE_TEXT_OpenService                     ::OpenServiceA
+#define ACE_TEXT_RegisterEventSource             ::RegisterEventSourceA
+#define ACE_TEXT_RegisterServiceCtrlHandler      ::RegisterServiceCtrlHandlerA
+#define ACE_TEXT_RegConnectRegistry              ::RegConnectRegistryA
+#define ACE_TEXT_RegCreateKeyEx                  ::RegCreateKeyExA
+#define ACE_TEXT_RegDeleteKey                    ::RegDeleteKeyA
+#define ACE_TEXT_RegDeleteValue                  ::RegDeleteValueA
+#define ACE_TEXT_RegEnumKeyEx                    ::RegEnumKeyExA
+#define ACE_TEXT_RegEnumValue                    ::RegEnumValueA
+#define ACE_TEXT_RegCreateKey                    ::RegCreateKeyA
+#define ACE_TEXT_RegOpenKey                      ::RegOpenKeyA
+#define ACE_TEXT_RegOpenKeyEx                    ::RegOpenKeyExA
+#define ACE_TEXT_RegQueryValueEx                 ::RegQueryValueExA
+#define ACE_TEXT_RegSetValueEx                   ::RegSetValueExA
+#define ACE_TEXT_ReportEvent                     ::ReportEventA
+#define ACE_TEXT_SearchPath                      ::SearchPathA
+#define ACE_TEXT_StartService                    ::StartServiceA
+#define ACE_TEXT_StartServiceCtrlDispatcher      ::StartServiceCtrlDispatcherA
+#endif /* ACE_USES_WCHAR */
diff --git a/ace/config-all.h b/ace/config-all.h
index 9c0f3bf6efc..3763d81dc8f 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -72,6 +72,9 @@
 #  include "ace/Trace.h"
 #endif /* ACE_OS_NTRACE */
 
+// Include the string conversion services here for backward compatibility
+#include "ace/String_Conversion_T.h"
+
 // These includes are here to avoid circular dependencies.
 // Keep this at the bottom of the file.  It contains the main macros.
 #include "ace/OS_main.h"
diff --git a/ace/config-borland-common.h b/ace/config-borland-common.h
index b692f07aecd..ab35738edca 100644
--- a/ace/config-borland-common.h
+++ b/ace/config-borland-common.h
@@ -64,7 +64,9 @@
 # define ACE_HAS_NEW_NOTHROW
 # define ACE_TEMPLATES_REQUIRE_SOURCE 1
 # define ACE_SIZEOF_LONG_DOUBLE 10
-# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Lu")
+# define ACE_TEMPLATES_REQUIRE_SOURCE 1
+# define ACE_UINT64_FORMAT_SPECIFIER_A "%Lu"
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 # define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld")
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 # define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 0
diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h
index d779436acd3..bb80a9c2b87 100644
--- a/ace/config-doxygen.h
+++ b/ace/config-doxygen.h
@@ -18,9 +18,6 @@
 /// Make sure that we always turn inlining on.
 #define __ACE_INLINE__
 
-/// Make the wchar_t interfaces available.
-#define ACE_HAS_WCHAR
-
 /// Make all the emulation versions of string operations visible
 // #define ACE_LACKS_WCSTOK
 #define ACE_LACKS_ITOW
diff --git a/ace/config-freebsd.h b/ace/config-freebsd.h
index 6ed6e250bcc..e4bd5543a7c 100644
--- a/ace/config-freebsd.h
+++ b/ace/config-freebsd.h
@@ -256,7 +256,6 @@ typedef union sigval sigval_t;
 
 #define ACE_LACKS_STROPTS_H
 
-// Needed when ACE_HAS_WCHAR is defined.
 #define ACE_LACKS_WCSNICMP
 #define ACE_LACKS_WCSICMP
 #define ACE_LACKS_WCSDUP
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index 38c5fe91bb0..c40ada25f69 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -147,8 +147,6 @@
 
 // Platform has XPG4 wide character support
 #    define ACE_HAS_XPG4_MULTIBYTE_CHAR
-#    define ACE_HAS_WCHAR
-#    define ACE_SIZEOF_WCHAR _WCHAR_T
 
 #  endif /* __cplusplus < 199707L */
 
diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h
new file mode 100644
index 00000000000..8b290109a96
--- /dev/null
+++ b/ace/config-kcc-common.h
@@ -0,0 +1,73 @@
+/* -*- C++ -*- */
+// $Id$
+
+// This configuration file is designed to be included by another,
+// specific configuration file.  It provides config information common
+// to all KAI C++ platforms (KCC version 3.3a).
+//
+// KAI C++ 3.2d for Linux had a known problem with being unable to call
+// static object constructors and destructors within shared libraries.
+//
+// KAI C++ 3.3a requires glibc 2. This configuration was tested with
+// egcs 1.0.2 and glibc-2.0.7-7. The KCC_BASE/bin/KCC script requires
+// the following settings for i386-linux to work:
+//
+//case i386-linux:
+//    set common_na = "-Dlinux -Dunix -Di386"
+//    set cpp_defines = "-D__CPLUSPLUS -D__inline__=inline -D__inline=inline -D__signed__=signed"
+//    set c_defines = "-D__inline__= -D__inline= -D__signed__=signed"
+//    set knr_c_defines = "-D__inline__= -D__inline= -D__signed__="
+//    set ansi_c_defines = ""
+//    breaksw
+//
+
+#ifndef ACE_KCC_COMMON_H
+#define ACE_KCC_COMMON_H
+#include /**/ "ace/pre.h"
+
+#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
+# define ACE_SIZEOF_LONG_DOUBLE 12
+#endif /* i386 */
+
+#if defined (i386) || defined (__i386__)
+  // If running an Intel, assume that it's a Pentium so that
+  // ACE_OS::gethrtime () can use the RDTSC instruction.  If
+  // running a 486 or lower, be sure to comment this out.
+  // (If not running an Intel CPU, this #define will not be seen
+  //  because of the i386 protection, so it can be ignored.)
+# define ACE_HAS_PENTIUM
+#endif /* i386 */
+
+// ****** Need to move this somewhere else
+// #define TAO_YY_BREAK
+
+#define ACE_SIZEOF_LONG_LONG 8
+#define ACE_TEMPLATES_REQUIRE_SOURCE
+
+#define ACE_HAS_TEMPLATE_SPECIALIZATION
+#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+
+// Compiler doesn't support static data member templates.
+//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+
+// Define this if you want to use the standard C++ library
+#define ACE_HAS_STANDARD_CPP_LIBRARY 1
+#define ACE_HAS_STRING_CLASS
+#define ACE_HAS_STDCPP_STL_INCLUDES 1
+#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#define ACE_LACKS_IOSTREAM_FX 1
+#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
+#define ACE_LACKS_UNBUFFERED_STREAMBUF 1
+#define ACE_HAS_EXCEPTIONS 1
+#define ACE_HAS_CPLUSPLUS_HEADERS
+#define ACE_NEW_THROWS_EXCEPTIONS
+
+// __KCC_VERSION is not defined before 3.4.
+#if !defined (__KCC_VERSION)
+#define ACE_AUTO_PTR_LACKS_RESET
+#endif /* !__KCC_VERSION */
+
+//#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
+
+#include /**/ "ace/post.h"
+#endif /* ACE_KCC_COMMON_H */
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index a0f91d1f175..7323735b3de 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -230,7 +230,7 @@
 #  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! __KCC */
 
-// Completely common part :-)
+// Completely common part  :-) 
 
 // Platform/compiler has the sigwait(2) prototype
 # define ACE_HAS_SIGWAIT
@@ -287,6 +287,12 @@
 
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
+// ACE WChar support
+#define ACE_SIZEOF_WCHAR 4
+#define ACE_WCHAR_MAX    0x7FFFFFFF
+#define ACE_LACKS_BUILTIN_WCHAR_T
+
+
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
@@ -384,9 +390,12 @@
 #if defined (__ia64) || defined(__alpha) || defined (__x86_64__)
 // On 64 bit platforms, the "long" type is 64-bits.  Override the
 // default 32-bit platform-specific format specifiers appropriately.
-# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
-# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld")
-# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
+# define ACE_UINT64_FORMAT_SPECIFIER_A "%lu"
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
+# define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%ld"
+# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A)
+# define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu"
+# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A)
 #endif /* __ia64 */
 
 #define ACE_SIZEOF_WCHAR 4
@@ -415,3 +424,4 @@
 #include /**/ "ace/post.h"
 
 #endif /* ACE_LINUX_COMMON_H */
+
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index bcb1635aac0..6f837b09f50 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -21,6 +21,11 @@
 # define ACE_NEEDS_IPC_1C_H
 #endif /* ACE_LYNXOS_MAJOR */
 
+// Describe the native wchar_t
+#define ACE_SIZEOF_WCHAR 4
+#define ACE_WCHAR_MAX 0x7fffffff
+#define ACE_LACKS_BUILTIN_WCHAR_T
+
 #if defined (__x86__)
 # define ACE_HAS_PENTIUM
 #elif defined (__powerpc__)
@@ -100,6 +105,32 @@
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_WCHAR_H
+#define ACE_LACKS_WCSLEN
+#define ACE_LACKS_WCSNCPY
+#define ACE_LACKS_WCSTOUL
+#define ACE_LACKS_WCSTOL
+#define ACE_LACKS_WCSTOD
+#define ACE_LACKS_ITOW
+#define ACE_LACKS_WCSTOK
+#define ACE_LACKS_WCSSTR
+#define ACE_LACKS_WCSSPN
+#define ACE_LACKS_WCSRCHR
+#define ACE_LACKS_WCSPBRK
+#define ACE_LACKS_WCSNCMP
+#define ACE_LACKS_WCSNCAT
+#define ACE_LACKS_WCSCSPN
+#define ACE_LACKS_WCSCPY
+#define ACE_LACKS_WCSCMP
+#define ACE_LACKS_WCSCHR
+#define ACE_LACKS_WCSCAT
+#define ACE_LACKS_TOWLOWER
+#define ACE_LACKS_TOWUPPER
+#define ACE_LACKS_FGETWC
+#define ACE_LACKS_UNGETWC
+#define ACE_LACKS_FGETWS
+#define ACE_LACKS_FPUTWS
+#define ACE_LACKS_WCSICMP
+#define ACE_LACKS_WCSNICMP
 #define ACE_LACKS_SUSECONDS_T
 #define ACE_LACKS_USECONDS_T
 #define ACE_MALLOC_ALIGN 8
diff --git a/ace/config-macosx-panther.h b/ace/config-macosx-panther.h
index 8807bdf17fa..c8308edb975 100644
--- a/ace/config-macosx-panther.h
+++ b/ace/config-macosx-panther.h
@@ -16,8 +16,9 @@
 
 #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 
+#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu"
+#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A)
 #define ACE_LACKS_SUSECONDS_T
-#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
 
 #if defined (ACE_HAS_PENTIUM)
 # undef ACE_HAS_PENTIUM
diff --git a/ace/config-macosx-tiger.h b/ace/config-macosx-tiger.h
index 1345bc18193..5b897b6d9ba 100644
--- a/ace/config-macosx-tiger.h
+++ b/ace/config-macosx-tiger.h
@@ -18,7 +18,8 @@
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 
-#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
+#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu"
+#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A)
 
 #if !defined (ACE_SIZEOF_LONG_DOUBLE)
 # if (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
diff --git a/ace/config-macosx.h b/ace/config-macosx.h
index 7238c440bfd..a6d1f1d7521 100644
--- a/ace/config-macosx.h
+++ b/ace/config-macosx.h
@@ -16,7 +16,8 @@
 
 #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 
-#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu")
+#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu"
+#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A)
 
 #if defined (ACE_HAS_PENTIUM)
 # undef ACE_HAS_PENTIUM
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index 1c7f52f3cf7..d92e16c32e4 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -84,7 +84,6 @@
 #define ACE_HAS_UCONTEXT_T 1
 #define ACE_HAS_VOIDPTR_MMAP 1
 #define ACE_HAS_VOIDPTR_SOCKOPT 1
-#define ACE_HAS_WCHAR 1
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR 1
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR 1
 #define ACE_IOCTL_TYPE_ARG2 u_long
@@ -135,8 +134,10 @@
 typedef unsigned long ACE_UINT64;
 typedef   signed long ACE_INT64;
 
-#define ACE_SSIZE_T_FORMAT_SPECIFIER	ACE_LIB_TEXT ("%ld")
-#define ACE_SIZE_T_FORMAT_SPECIFIER	ACE_LIB_TEXT ("%lu")
+#define ACE_SSIZE_T_FORMAT_SPECIFIER_A	"%ld"
+#define ACE_SSIZE_T_FORMAT_SPECIFIER	ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A)
+#define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu"
+#define ACE_SIZE_T_FORMAT_SPECIFIER	ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A)
 
 #elif defined(__i386__)
 #define ACE_HAS_PENTIUM 1
diff --git a/ace/config-pharlap.h b/ace/config-pharlap.h
index fa274e22383..928e3395f9c 100644
--- a/ace/config-pharlap.h
+++ b/ace/config-pharlap.h
@@ -54,7 +54,6 @@
 // Let the config-win32.h file do its thing
 #undef ACE_CONFIG_H
 #include "ace/config-win32.h"
-#undef ACE_HAS_WCHAR
 
 #include /**/ <embkern.h>
 #if defined (ACE_HAS_PHARLAP_RT)
diff --git a/ace/config-rtems.h b/ace/config-rtems.h
index cb93a725dec..81cb8778a8f 100644
--- a/ace/config-rtems.h
+++ b/ace/config-rtems.h
@@ -135,8 +135,6 @@ ACE_HAS_SEND_TIMEDWAIT
 ACE_HAS_SENDTO_TIMEDWAIT
 ACE_HAS_IP_MULTICAST
 ACE_HAS_NONCONST_SELECT_TIMEVAL
-ACE_HAS_WCHAR_TYPEDEFS_CHAR
-ACE_HAS_WCHAR_TYPEDEFS_USHORT
 ACE_HAS_SIGNAL_SAFE_OS_CALLS
 ACE_HAS_SIZET_SOCKET_LEN
 ACE_HAS_SOCKADDR_MSG_NAME
diff --git a/ace/config-tandem-nsk-mips-v2.h b/ace/config-tandem-nsk-mips-v2.h
index cba5b7b8148..fe35e30ba68 100644
--- a/ace/config-tandem-nsk-mips-v2.h
+++ b/ace/config-tandem-nsk-mips-v2.h
@@ -241,7 +241,8 @@ typedef enum CMA_T_SCHED_POLICY {
 #define ACE_HRTIME_T_IS_BASIC_TYPE
 
 // printf format specifiers for 64 bit integers
-# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld")
+# define ACE_UINT64_FORMAT_SPECIFIER_A "%Ld"
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 # define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld")
 
 //=========================================================================
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index ae13a39d880..146c5d65e86 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -36,6 +36,11 @@
 
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
+// ACE WChar support
+#define ACE_SIZEOF_WCHAR 4
+#define ACE_WCHAR_MAX    0xFFFFFFFF
+#undef ACE_LACKS_BUILTIN_WCHAR_T
+
 // An explicit check for Tornado 2.1, which had very limited release.
 // See include/makeinclude/platform_vxworks5.x_g++.GNU for details
 // on version conventions used by ACE for VxWorks.
@@ -140,8 +145,11 @@
 #define ACE_LACKS_ACCESS
 #define ACE_LACKS_EXEC
 #define ACE_LACKS_FCNTL
+#define ACE_LACKS_FGETWC
+#define ACE_LACKS_FGETWS
 #define ACE_LACKS_FILELOCKS
 #define ACE_LACKS_FORK
+#define ACE_LACKS_FPUTWS
 #define ACE_LACKS_FSYNC
 #define ACE_LACKS_GETHOSTENT
 #define ACE_LACKS_GETOPT
@@ -196,6 +204,7 @@
 #define ACE_LACKS_NATIVE_STRPTIME
 #define ACE_LACKS_WAIT
 #define ACE_LACKS_WAITPID
+#define ACE_LACKS_WCTYPE_H
 #define ACE_LACKS_DUP2
 #define ACE_LACKS_DUP
 #define ACE_LACKS_SUSECONDS_T
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index 9b53c7143fd..bc8964d2ab9 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -295,6 +295,13 @@
 #define ACE_UINT64_TYPE		unsigned long long
 #endif
 
+// ACE WChar support
+#define ACE_SIZEOF_WCHAR 2
+#define ACE_WCHAR_MAX    0xFFFF
+#if !defined(_NATIVE_WCHAR_T_DEFINED)
+#  define ACE_LACKS_BUILTIN_WCHAR_T
+#endif
+
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
@@ -302,12 +309,6 @@
 // is controlled in compiler configs since it's a compiler switch.
 // Additionally, if the user selected use of wide chars (by setting either
 // ACE_USES_WCHAR or UNICODE) make sure both are enabled.
-#define ACE_HAS_WCHAR
-#if defined (ACE_USES_WCHAR)
-#  ifndef UNICODE
-#    define UNICODE
-#  endif
-#endif /* ACE_USES_WCHAR */
 #if defined (UNICODE) && !defined (ACE_USES_WCHAR)
 #  define ACE_USES_WCHAR
 #endif /* UNICODE && !ACE_USES_WCHAR */
diff --git a/ace/config-win32-dmc.h b/ace/config-win32-dmc.h
index 6012e44620e..fa623098e74 100644
--- a/ace/config-win32-dmc.h
+++ b/ace/config-win32-dmc.h
@@ -23,7 +23,6 @@
 # undef ACE_LACKS_STRUCT_DIR
 #endif
 
-// Changed ACE_TEXT to ACE_LIB_TEXT in the following line
 # define ACE_CC_NAME ACE_LIB_TEXT ("Digital Mars")
 # define ACE_CC_MAJOR_VERSION (1)
 # define ACE_CC_MINOR_VERSION (8)
@@ -66,7 +65,6 @@
 //# define ACE_NEW_THROWS_EXCEPTIONS 1
 # define ACE_SIZEOF_LONG_DOUBLE 10
 # define ACE_TEMPLATES_REQUIRE_SOURCE 1
-// Changed ACE_TEXT to ACE_LIB_TEXT in the following two lines
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 # define ACE_HAS_STRBUF_T
 #define ACE_HAS_3_PARAM_WCSTOK
diff --git a/ace/config-win32-ghs.h b/ace/config-win32-ghs.h
index 2d332f58e16..e4c2ef327f4 100644
--- a/ace/config-win32-ghs.h
+++ b/ace/config-win32-ghs.h
@@ -25,11 +25,9 @@
 
 //Green Hills Native x86 does not support structural exceptions
 # undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS
-# undef ACE_HAS_WCHAR
 # define ACE_CONFIG_INCLUDE_GHS_COMMON
 # include "ace/config-ghs-common.h"
 
-// Changed ACE_TEXT to ACE_LIB_TEXT in the following line
 # define ACE_CC_NAME ACE_LIB_TEXT ("Green Hills C++")
 # define ACE_CC_MAJOR_VERSION (1)
 # define ACE_CC_MINOR_VERSION (8)
@@ -76,8 +74,8 @@
 //# define ACE_NEW_THROWS_EXCEPTIONS 1
 # define ACE_SIZEOF_LONG_DOUBLE 10
 # define ACE_TEMPLATES_REQUIRE_SOURCE 1
-// Changed ACE_TEXT to ACE_LIB_TEXT in the following two lines
-# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
+# define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u"
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 # define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d")
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 // Set the following to zero to placate SString.h ACE_WString CTOR
diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h
index 104b40c6c04..c49dcd97115 100644
--- a/ace/config-win32-mingw.h
+++ b/ace/config-win32-mingw.h
@@ -99,7 +99,8 @@
 #endif
 
 #define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d")
-#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
+#define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u"
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 
 #define ACE_ENDTHREADEX(STATUS)  ::_endthreadex ((DWORD) (STATUS))
 
diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h
new file mode 100644
index 00000000000..221a4989d43
--- /dev/null
+++ b/ace/config-win32-msvc-6.h
@@ -0,0 +1,184 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file   config-win32-msvc-6.h
+ *
+ *  $Id$
+ *
+ *  @brief  Microsoft Visual C++ 6.0 configuration file.
+ *
+ *  This file is the ACE configuration file for Microsoft Visual C++ version 6.
+ *
+ *  @note   Do not include this file directly, include config-win32.h instead.
+ *
+ *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef ACE_CONFIG_WIN32_MSVC_6_H
+#define ACE_CONFIG_WIN32_MSVC_6_H
+#include /**/ "ace/pre.h"
+
+#ifndef ACE_CONFIG_WIN32_H
+#error Use config-win32.h in config.h instead of this header
+#endif /* ACE_CONFIG_WIN32_H */
+
+// The std library that comes with VC6 is pre-standard, but
+// it's close enough that any discrepancies should be worked around
+// with individual hacks.
+# if !defined (ACE_HAS_STANDARD_CPP_LIBRARY)
+#   define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# endif
+
+// The STL that comes with ACE uses the std namespace. Note however, it is not
+// part of the standard C++ library
+# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+#  define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+
+# if !defined (ACE_HAS_BROKEN_NESTED_TEMPLATES)
+#  define ACE_HAS_BROKEN_NESTED_TEMPLATES
+# endif /* ACE_HAS_BROKEN_NESTED_TEMPLATES */
+
+// Keywords
+
+# define ACE_HAS_TYPENAME_KEYWORD
+
+// No support for member templates.
+#define ACE_LACKS_MEMBER_TEMPLATES
+
+#define ACE_HAS_ITOA
+
+#define ACE_ITOA_EQUIVALENT ::_itoa
+#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
+#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
+#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
+
+# if !defined (ACE_HAS_WINCE)
+#  define ACE_HAS_EXCEPTIONS
+#  define ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS
+#  define ACE_HAS_NO_THROW_SPEC
+#  define ACE_HAS_SIG_ATOMIC_T
+# endif /* ACE_HAS_WINCE */
+
+// CE SDKs didn't provide some errno values we need in eVC3 and 4 (which
+// are the same base compiler version as MSVC 6).
+#if defined (ACE_HAS_WINCE)
+#  define EMFILE WSAEMFILE
+#  define EINTR  WSAEINTR
+#  define EACCES ERROR_ACCESS_DENIED
+#  define ENOSPC ERROR_HANDLE_DISK_FULL
+#  define EEXIST ERROR_FILE_EXISTS
+#  define EPIPE  ERROR_BROKEN_PIPE
+#  define EFAULT WSAEFAULT
+#  define ENOENT WSAEINVAL
+#  define EINVAL WSAEINVAL
+#  define ERANGE WSAEINVAL
+#  define EAGAIN WSAEWOULDBLOCK
+#  define ENOMEM ERROR_OUTOFMEMORY
+#  define ENODEV ERROR_BAD_DEVICE
+#  define _MAX_FNAME 255
+//#endif  // UNDER_CE
+#endif /* ACE_HAS_WINCE */
+
+# define ACE_HAS_BROKEN_NAMESPACES
+# define ACE_HAS_BROKEN_IMPLICIT_CONST_CAST
+# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
+
+
+# define ACE_LACKS_INTPTR_T
+
+// Compiler doesn't support static data member templates.
+# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+
+# define ACE_LACKS_STRRECVFD
+
+// Compiler/platform has correctly prototyped header files.
+# define ACE_HAS_CPLUSPLUS_HEADERS
+
+// Platform supports POSIX timers via timestruc_t.
+# define ACE_HAS_STRPTIME
+# define ACE_LACKS_NATIVE_STRPTIME
+
+// Compiler/platform supports strerror ().
+# define ACE_HAS_STRERROR
+
+# define ACE_TEMPLATES_REQUIRE_SOURCE
+
+// Platform provides ACE_TLI function prototypes.
+// For Win32, this is not really true, but saves a lot of hassle!
+# define ACE_HAS_TLI_PROTOTYPES
+
+// Platform support linebuffered streaming is broken
+# define ACE_LACKS_LINEBUFFERED_STREAMBUF
+
+// Template specialization is supported.
+# define ACE_HAS_TEMPLATE_SPECIALIZATION
+
+
+// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to
+// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC.
+# define ACE_NEEDS_FUNC_DEFINITIONS
+
+// ----------------- "derived" defines and includes -----------
+
+# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
+
+// Platform has its Standard C++ library in the namespace std
+#   if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
+#    define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB       1
+#   endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+
+// Microsoft's auto_ptr in standard cpp library doesn't have reset ().
+#  define ACE_AUTO_PTR_LACKS_RESET
+
+// ace/iostream.h does not work with the standard cpp library (yet).
+#  if !defined (ACE_USES_OLD_IOSTREAMS)
+#   define ACE_LACKS_ACE_IOSTREAM
+#  endif /* ! ACE_USES_OLD_IOSTREAMS */
+# else
+// iostream header lacks ipfx (), isfx (), etc., declarations
+#  define ACE_LACKS_IOSTREAM_FX
+# endif
+
+// While digging the MSVC 4.0 include files, I found how to disable
+// MSVC warnings: --Amos Shapira
+
+
+// "C4355: 'this' : used in base member initializer list"
+# pragma warning(disable:4355) /* disable C4514 warning */
+//      #pragma warning(default:4355)   // use this to reenable, if desired
+
+# pragma warning(disable:4201)  /* winnt.h uses nameless structs */
+
+# pragma warning(disable:4231)
+// Disable warning of using Microsoft Extension.
+
+// MSVC allows throw keyword but complains about it.
+# pragma warning( disable : 4290 )
+
+// Inheritance by dominance is A-OK by us
+# pragma warning (disable:4250)
+
+// Disable warning about long names (due to templates).
+# pragma warning( disable : 4786 )
+
+# if !defined(ACE_HAS_WINCE)
+#  if defined(ACE_HAS_DLL) && (ACE_HAS_DLL != 0)
+#   if !defined(_DLL)
+// *** DO NOT *** DO NOT *** defeat this error message
+// by defining _DLL yourself.  RTFM and see who set _DLL.
+#    error You must link against (Debug) Multithreaded DLL run-time libraries.
+#   endif /* !_DLL */
+#  endif  /* ACE_HAS_DLL && ACE_HAS_DLL != 0 */
+# endif /* !ACE_HAS_WINCE */
+
+# pragma warning(default: 4201)  /* winnt.h uses nameless structs */
+
+# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d")
+# define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u"
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_MSVC_6_H */
diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h
index fd28598d0f4..2fbae1e20aa 100644
--- a/ace/config-win32-msvc-7.h
+++ b/ace/config-win32-msvc-7.h
@@ -66,7 +66,8 @@
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
 #define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d")
-#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
+#define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u"
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 
 // Platform provides ACE_TLI function prototypes.
 // For Win32, this is not really true, but saves a lot of hassle!
diff --git a/ace/config-win32-msvc-8.h b/ace/config-win32-msvc-8.h
index 6fbcca6de4c..897bf4b44f4 100644
--- a/ace/config-win32-msvc-8.h
+++ b/ace/config-win32-msvc-8.h
@@ -64,7 +64,8 @@
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
 #define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d")
-#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
+#define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u"
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 
 // Platform provides ACE_TLI function prototypes.
 // For Win32, this is not really true, but saves a lot of hassle!
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index 3fdcd7cda82..d9168124756 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -55,7 +55,7 @@
 #endif /* _CPPRTTI */
 
 #if ! defined(_NATIVE_WCHAR_T_DEFINED)
-  #define ACE_LACKS_NATIVE_WCHAR_T
+  #define ACE_LACKS_BUILTIN_WCHAR_T
 #endif
 
 // Win Mobile still does thread exits differently than PC Windows.
diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h
index 451687a00b2..1a3ac304e0c 100644
--- a/ace/config-win32-visualage.h
+++ b/ace/config-win32-visualage.h
@@ -74,7 +74,8 @@
 #define ACE_SIZEOF_LONG_DOUBLE 10
 #define ACE_TEMPLATES_REQUIRE_SOURCE 1
 #define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS 1
-#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u")
+#define ACE_UINT64_FORMAT_SPECIFIER_A "%I64u"
+# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A)
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 
 #define ACE_LACKS_NET_IF_H
diff --git a/ace/os_include/os_stddef.h b/ace/os_include/os_stddef.h
index 008a3f7ba1e..db1190d33f8 100644
--- a/ace/os_include/os_stddef.h
+++ b/ace/os_include/os_stddef.h
@@ -81,12 +81,6 @@ extern "C"
   value equal to its value when used as the lone character in an integer
   character constant.
 */
-#if defined (ACE_LACKS_WCHAR_T)
-#  if !defined (ACE_WCHAR_T_TYPE)
-#    define ACE_WCHAR_T_TYPE long;
-#  endif /* !ACE_WCHAR_T_TYPE */
-   typedef ACE_WCHAR_T_TYPE wchar_t;
-#endif /* ACE_LACKS_WCHAR_T */
 
 //  Unsigned integer type of the result of the sizeof operator.
 #if defined (ACE_LACKS_SIZE_T)
diff --git a/apps/FaCE/FaCE.cpp b/apps/FaCE/FaCE.cpp
index 7d7c50ffcd3..49f413065b1 100644
--- a/apps/FaCE/FaCE.cpp
+++ b/apps/FaCE/FaCE.cpp
@@ -18,7 +18,7 @@
 #include <sipapi.h>
 
 
-ACE_TCHAR* g_ParameterFileName = ACE_LIB_TEXT("Parameters.txt");
+ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt");
 
 /**
  * This simple and small class manages user-input command line
@@ -90,7 +90,7 @@ void ParameterList::addParameter(char* newParameter)
 
     delete w_output;
 #else
-    this->addParameter(ACE_TEXT_CHAR_TO_TCHAR(newParameter));
+    this->addParameter(ACE_TEXT_TO_TCHAR_IN(newParameter));
 #endif  // NO_ACE
 }
 
@@ -112,12 +112,12 @@ void ParameterList::addParameter(ACE_TCHAR* newParameter)
 void ParameterList::saveParameter(FILE* outputFile)
 {
     if ( (outputFile == 0) && (this->param_ != 0) ) {
-        outputFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("w+"));
+        outputFile = _wfopen(g_ParameterFileName, ACE_TEXT("w+"));
     }
 
     if (outputFile != 0) {
         if (this->param_ != 0) {
-            fwprintf(outputFile, ACE_LIB_TEXT("%s\n"), this->param_);
+            fwprintf(outputFile, ACE_TEXT("%s\n"), this->param_);
             this->next_->saveParameter(outputFile);
         }
         else {
@@ -173,7 +173,7 @@ void InitSetup()
 
 void LoadParameterHistory()
 {
-    FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("r"));
+    FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_TEXT("r"));
 
     if (parameterFile != NULL) {
         while (feof(parameterFile) == 0) {
@@ -328,12 +328,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 case ID_SETTING_RUN:
                     {
 #ifdef NO_ACE
-                        cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl;
+                        cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl;
                         CE_ARGV ce_argv(g_CommandLine);
                         main_i(ce_argv.argc(), ce_argv.argv());
-                        cout << ACE_LIB_TEXT("END") << endl << endl;
+                        cout << ACE_TEXT("END") << endl << endl;
 #else
-                        cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl;
+                        cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl;
                         ACE_CE_ARGV ce_argv(g_CommandLine);
                         ACE::init();
                         ACE_MAIN_OBJECT_MANAGER
@@ -341,7 +341,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                         ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK);  // set call back flag
                         ace_main_i(ce_argv.argc(), ce_argv.argv());
                         ACE::fini();
-                        cout << ACE_LIB_TEXT("END") << endl << endl;
+                        cout << ACE_TEXT("END") << endl << endl;
 #endif  // NO_ACE
                     }
                     break;
@@ -388,7 +388,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             GetClientRect(hWnd, &textRect);
             nCmdHt = CommandBar_Height(mbi.hwndMB);
 
-            hWndEdit = CreateWindow(ACE_LIB_TEXT("EDIT"),
+            hWndEdit = CreateWindow(ACE_TEXT("EDIT"),
                                     NULL,
                                     WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL,
                                     0,
@@ -457,7 +457,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     SHINITDLGINFO shidi;
 
-    ACE_TCHAR* copyrightNote = ACE_LIB_TEXT(
+    ACE_TCHAR* copyrightNote = ACE_TEXT(
 "ACE® and TAO® are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object \
 Computing at Washington University,© 1993-2002, all rights reserved.  \
 FaCE is copyrighted by Object Computing, Inc.,© 2002,\n all rights reserved.\n\
@@ -552,7 +552,7 @@ LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
             GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1);
             EndDialog(hDlg, wmId);
 
-            tempFile = _wfopen(tempBuffer, ACE_LIB_TEXT("r"));
+            tempFile = _wfopen(tempBuffer, ACE_TEXT("r"));
 
             if (tempFile != NULL)  // if file exists
             {
diff --git a/apps/FaCE/FaCE.h b/apps/FaCE/FaCE.h
index 8a4b80425d9..ef1842323c0 100644
--- a/apps/FaCE/FaCE.h
+++ b/apps/FaCE/FaCE.h
@@ -30,7 +30,7 @@
 #include "CE_Screen_Output.h"
 
 #define ACE_TCHAR wchar_t
-#define ACE_LIB_TEXT(STRING) L##STRING
+#define ACE_TEXT(STRING) L##STRING
 #define ACE_CE_Screen_Output CE_Screen_Output
 
 int main_i(int, wchar_t**);
diff --git a/apps/Gateway/Gateway/Config_Files.cpp b/apps/Gateway/Gateway/Config_Files.cpp
index f1b9e96dd23..12328282242 100644
--- a/apps/Gateway/Gateway/Config_Files.cpp
+++ b/apps/Gateway/Gateway/Config_Files.cpp
@@ -138,7 +138,7 @@ Connection_Config_File_Parser::read_entry (Connection_Config_Info &entry,
 
 #if defined (DEBUGGING)
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   FP_RETURN_TYPE result;
   int line_number = 0;
diff --git a/apps/Gateway/Gateway/Options.cpp b/apps/Gateway/Gateway/Options.cpp
index cc80ce06c7d..1408e5f4e41 100644
--- a/apps/Gateway/Gateway/Options.cpp
+++ b/apps/Gateway/Gateway/Options.cpp
@@ -173,7 +173,7 @@ int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   // Assign defaults.
-  ACE_Get_Opt get_opt (argc,
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc,
                        argv,
                        ACE_TEXT("a:bC:c:dm:P:p:q:r:t:vw:"),
                        0);
diff --git a/apps/Gateway/Peer/Options.cpp b/apps/Gateway/Peer/Options.cpp
index 0b33552e629..659fc38b5c9 100644
--- a/apps/Gateway/Peer/Options.cpp
+++ b/apps/Gateway/Peer/Options.cpp
@@ -108,7 +108,7 @@ Options::enabled (int option) const
 void
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:c:C:h:m:t:v"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:c:C:h:m:t:v"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/apps/JAWS/clients/Blobby/Blob_Handler.cpp
index 8dc842a2f5a..0c5fd166d04 100644
--- a/apps/JAWS/clients/Blobby/Blob_Handler.cpp
+++ b/apps/JAWS/clients/Blobby/Blob_Handler.cpp
@@ -279,7 +279,7 @@ ACE_Blob_Writer::send_request (void)
 
   // Create the header, store the actual length in mesglen.
   // NOTE! %lu is really what's wanted. ACE_SIZE_T_FORMAT_SPECIFIER is
-  // defined in terms of ACE_LIB_TEXT which is NOT what we want here.
+  // defined in terms of ACE_TEXT which is NOT what we want here.
   mesglen = ACE_OS::sprintf (mesg, "%s /%s %s %lu\n\n",
                              request_prefix_, filename_, request_suffix_,
                              (unsigned long)length_);
diff --git a/apps/JAWS/clients/Blobby/Options.cpp b/apps/JAWS/clients/Blobby/Options.cpp
index 08f7de4ad8b..5934bd59591 100644
--- a/apps/JAWS/clients/Blobby/Options.cpp
+++ b/apps/JAWS/clients/Blobby/Options.cpp
@@ -23,7 +23,7 @@ Options::instance (void)
 void
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("rwh:p:f:l:o:d"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("rwh:p:f:l:o:d"));
 
   int c;
 
diff --git a/apps/JAWS/clients/Caching/http_client.cpp b/apps/JAWS/clients/Caching/http_client.cpp
index f0bb20b6d56..b565dcb05be 100644
--- a/apps/JAWS/clients/Caching/http_client.cpp
+++ b/apps/JAWS/clients/Caching/http_client.cpp
@@ -58,7 +58,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 	  while (isspace (*s));
 
           // Shell command.
-          if (ACE_OS::system (ACE_TEXT_CHAR_TO_TCHAR (s)) == -1)
+          if (ACE_OS::system (ACE_TEXT_TO_TCHAR_IN (s)) == -1)
             ACE_ERROR ((LM_ERROR, ACE_TEXT (" ! Error executing: %C\n"), s));
         }
       else if (ACE_OS::strncmp (s, "http://", 7) == 0)
diff --git a/apps/JAWS/clients/Caching/http_handler.cpp b/apps/JAWS/clients/Caching/http_handler.cpp
index bfeda511176..cb8d0290937 100644
--- a/apps/JAWS/clients/Caching/http_handler.cpp
+++ b/apps/JAWS/clients/Caching/http_handler.cpp
@@ -137,7 +137,7 @@ HTTP_Handler::svc (void)
       && (::sscanf (contentlength, "\nContent-%*[lL]ength: %d ",
                     &this->response_size_) == 1))
     {
-      ACE_Filecache_Handle afh (ACE_TEXT_CHAR_TO_TCHAR (this->filename_),
+      ACE_Filecache_Handle afh (ACE_TEXT_TO_TCHAR_IN (this->filename_),
                                 this->response_size_);
 
       this->peer ().recv_n (afh.address (), this->response_size_);
@@ -189,7 +189,7 @@ HTTP_Connector::connect (const char * url)
   HTTP_Handler *hhptr = &hh;
 
   // First check the cache.
-  if (ACE_Filecache::instance ()->find (ACE_TEXT_CHAR_TO_TCHAR (hh.filename ())) == 0)
+  if (ACE_Filecache::instance ()->find (ACE_TEXT_TO_TCHAR_IN (hh.filename ())) == 0)
     {
       ACE_DEBUG ((LM_DEBUG, "  ``%s'' is already cached.\n",
                   hh.filename ()));
diff --git a/apps/JAWS/clients/Caching/test_URL.cpp b/apps/JAWS/clients/Caching/test_URL.cpp
index 7e81a359f45..13467f8eb4a 100644
--- a/apps/JAWS/clients/Caching/test_URL.cpp
+++ b/apps/JAWS/clients/Caching/test_URL.cpp
@@ -4,7 +4,7 @@
 
 ACE_RCSID(Caching, test_URL, "$Id$")
 
-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/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp
index 86ffea0542a..0f22cc78d7c 100644
--- a/apps/JAWS/server/HTTP_Server.cpp
+++ b/apps/JAWS/server/HTTP_Server.cpp
@@ -49,7 +49,7 @@ HTTP_Server::parse_args (int argc, ACE_TCHAR *argv[])
   this->throttle_ = 0;
   this->caching_ = true;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:n:t:i:b:c:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:n:t:i:b:c:"));
 
   while ((c = get_opt ()) != -1)
     switch (c)
diff --git a/apps/JAWS/server/main.cpp b/apps/JAWS/server/main.cpp
index 4f319f02727..dc9d8291549 100644
--- a/apps/JAWS/server/main.cpp
+++ b/apps/JAWS/server/main.cpp
@@ -33,7 +33,7 @@ handler (int)
 // JAWS as an ACE Service, as well.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Service_Config daemon;
 
diff --git a/apps/JAWS/stress_testing/benchd.cpp b/apps/JAWS/stress_testing/benchd.cpp
index ff17f669430..c5a06a6c8b2 100644
--- a/apps/JAWS/stress_testing/benchd.cpp
+++ b/apps/JAWS/stress_testing/benchd.cpp
@@ -174,7 +174,7 @@ Handle_Events::serve (char *buf)
 static void
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "i:u:q");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "i:u:q");
 
   int c;
 
@@ -205,7 +205,7 @@ handler (int)
 }
 
 int 
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
   ACE_OS::signal (SIGCLD, SIG_IGN);
@@ -231,7 +231,7 @@ main (int argc, char *argv[])
 }
 #else
 int 
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_ERROR ((LM_ERROR, "error: %s must be run on a platform that support IP multicast\n",
 	    argv[0]));
diff --git a/apps/JAWS/stress_testing/http_tester.cpp b/apps/JAWS/stress_testing/http_tester.cpp
index eb086262317..2a7366fde33 100644
--- a/apps/JAWS/stress_testing/http_tester.cpp
+++ b/apps/JAWS/stress_testing/http_tester.cpp
@@ -124,7 +124,7 @@ int driver(char *id, int total_num, float requests_sec, char *url1, float p1, ch
 }
 
 
-main(int argc, char **argv) 
+ACE_TMAIN(int argc, ACE_TCHAR **argv) 
 {
   // This will set the global scale factor if the ACE_SCALE_FACTOR
   // environment variable is set.
diff --git a/apps/JAWS2/JAWS/Server.cpp b/apps/JAWS2/JAWS/Server.cpp
index 4fbec0cd0f7..e65ca3b57d3 100644
--- a/apps/JAWS2/JAWS/Server.cpp
+++ b/apps/JAWS2/JAWS/Server.cpp
@@ -142,7 +142,7 @@ JAWS_Server::parse_args (int argc, char *argv[])
   int c;
   int t = 0;
 
-  ACE_Get_Opt getopt (argc, argv, "t" "p:c:d:n:m:f:r:");
+  ACE_Get_Arg_Opt<char> getopt (argc, argv, "t" "p:c:d:n:m:f:r:");
   while ((c = getopt ()) != -1)
     switch (c)
       {
diff --git a/apps/JAWS2/main.cpp b/apps/JAWS2/main.cpp
index d1bd6f46dcb..1d3198f8ba8 100644
--- a/apps/JAWS2/main.cpp
+++ b/apps/JAWS2/main.cpp
@@ -26,7 +26,7 @@ static JAWS_HTTP_10_Parse_Task HTTP_Parse;
 static JAWS_HTTP_10_Write_Task HTTP_Write;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_OS::signal (SIGCHLD, SIG_IGN);
 
diff --git a/apps/JAWS3/bench/mkfiles.cpp b/apps/JAWS3/bench/mkfiles.cpp
index 42bc2c969fa..c83b3c2582e 100644
--- a/apps/JAWS3/bench/mkfiles.cpp
+++ b/apps/JAWS3/bench/mkfiles.cpp
@@ -8,9 +8,9 @@
 static float gammln (float xx);
 static float poidev (float xm);
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt options (argc, argv, "m:s:x:n:");
+  ACE_Get_Arg_Opt<ACE_TCHAR> options (argc, argv, "m:s:x:n:");
   // m -- median file size in kB
   // x -- maximum file size in kB
   // n -- number of files
diff --git a/apps/JAWS3/bench/rqfiles.cpp b/apps/JAWS3/bench/rqfiles.cpp
index 49e6bf726d0..e6f88417a4d 100644
--- a/apps/JAWS3/bench/rqfiles.cpp
+++ b/apps/JAWS3/bench/rqfiles.cpp
@@ -161,7 +161,7 @@ typedef ACE_Select_Reactor_T<ACE_Select_Reactor_Noop_Token>
         ACE_Select_NULL_LOCK_Reactor;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Select_NULL_LOCK_Reactor *select_reactor;
   select_reactor = new ACE_Select_NULL_LOCK_Reactor;
@@ -173,7 +173,7 @@ main (int argc, char *argv[])
   ACE_Reactor::instance ()->register_handler (SIGINT, signal_handler);
   ACE_OS::signal (SIGPIPE, SIG_IGN);
 
-  ACE_Get_Opt options (argc, argv, "f:r:n:w:");
+  ACE_Get_Arg_Opt<ACE_TCHAR> options (argc, argv, "f:r:n:w:");
 
   // f -- file list
   // r -- request rate in requests per second
diff --git a/apps/JAWS3/http/HTTP_Service_Handler.cpp b/apps/JAWS3/http/HTTP_Service_Handler.cpp
index 56e2d2c7e92..bad847b48ca 100644
--- a/apps/JAWS3/http/HTTP_Service_Handler.cpp
+++ b/apps/JAWS3/http/HTTP_Service_Handler.cpp
@@ -37,7 +37,7 @@ JAWS_HTTP_Service_Handler::close (unsigned long)
 int
 JAWS_HTTP_Acceptor::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt opt (argc, argv, "p:");
+  ACE_Get_Arg_Opt<ACE_TCHAR> opt (argc, argv, "p:");
 
   unsigned short p = 0;
 
diff --git a/apps/JAWS3/jaws3/main.cpp b/apps/JAWS3/jaws3/main.cpp
index 4b5705abc2f..9ffa504a291 100644
--- a/apps/JAWS3/jaws3/main.cpp
+++ b/apps/JAWS3/jaws3/main.cpp
@@ -9,7 +9,7 @@
 #include "jaws3/Signal_Task.h"
 
 int
-main (int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_REACTOR_INSTANCE_INIT;
 
diff --git a/apps/JAWS3/small/SS_Service_Handler.cpp b/apps/JAWS3/small/SS_Service_Handler.cpp
index 627996a7b07..80acf90c725 100644
--- a/apps/JAWS3/small/SS_Service_Handler.cpp
+++ b/apps/JAWS3/small/SS_Service_Handler.cpp
@@ -37,7 +37,7 @@ TeraSS_Service_Handler::close (unsigned long)
 int
 TeraSS_Acceptor::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt opt (argc, argv, "p:");
+  ACE_Get_Arg_Opt<ACE_TCHAR> opt (argc, argv, "p:");
 
   unsigned short p = 0;
 
diff --git a/apps/drwho/Options.cpp b/apps/drwho/Options.cpp
index 076623c0e03..3a074ffc857 100644
--- a/apps/drwho/Options.cpp
+++ b/apps/drwho/Options.cpp
@@ -79,7 +79,7 @@ Options::set_options (int argc, char *argv[])
   int add_default_hosts = 1;
 
   Options::program_name = argv[0];
-  ACE_Get_Opt getopt (argc, argv, "?aA:bdF:f:hH:Llp:rRsSt:w:");
+  ACE_Get_Arg_Opt<char> getopt (argc, argv, "?aA:bdF:f:hH:Llp:rRsSt:w:");
 
   while ((c = getopt ()) != -1)
     {
diff --git a/apps/drwho/client.cpp b/apps/drwho/client.cpp
index 5b8f4fcf8ab..c2443720b4f 100644
--- a/apps/drwho/client.cpp
+++ b/apps/drwho/client.cpp
@@ -42,7 +42,7 @@ make_client (void)
 }
  
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Options::set_options (argc, argv);
 
diff --git a/apps/drwho/server.cpp b/apps/drwho/server.cpp
index aa4bea1349b..09bbe570f00 100644
--- a/apps/drwho/server.cpp
+++ b/apps/drwho/server.cpp
@@ -86,7 +86,7 @@ do_drwho (SMR_Server &smr_server)
 // debugging!
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_OS::signal (SIGTERM, (ACE_SignalHandler)exit_server);
   ACE_OS::signal (SIGINT, (ACE_SignalHandler)exit_server);
diff --git a/apps/gperf/src/Options.cpp b/apps/gperf/src/Options.cpp
index 4251d7c7c39..d433bbc8c9b 100644
--- a/apps/gperf/src/Options.cpp
+++ b/apps/gperf/src/Options.cpp
@@ -261,7 +261,7 @@ Options::parse_args (int argc, char *argv[])
   if (ACE_LOG_MSG->open (argv[0]) == -1)
     return -1;
 
-  ACE_Get_Opt getopt (argc, argv, "abBcCdDe:Ef:F:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:");
+  ACE_Get_Arg_Opt<char> getopt (argc, argv, "abBcCdDe:Ef:F:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:");
   int option_char;
 
   argc_ = argc;
diff --git a/apps/gperf/src/gperf.cpp b/apps/gperf/src/gperf.cpp
index de4ca87430d..c6a838e2874 100644
--- a/apps/gperf/src/gperf.cpp
+++ b/apps/gperf/src/gperf.cpp
@@ -38,7 +38,7 @@ ACE_RCSID(src, gperf, "$Id$")
 #include "ace/OS_main.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   struct tm *tm;
   time_t clock;
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
 }
 #else  /* ! ACE_HAS_GPERF */
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
diff --git a/apps/gperf/tests/tests.mpc b/apps/gperf/tests/tests.mpc
index f5ea29989fe..de8c7b9e0a8 100644
--- a/apps/gperf/tests/tests.mpc
+++ b/apps/gperf/tests/tests.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(cinset): gperf_test {
+  avoids      += uses_wchar
   exename = cout
 
   verbatim(gnuace, bottom) {
@@ -26,6 +27,7 @@ project(cinset): gperf_test {
 }
 
 project(adainset): gperf_test {
+  avoids      += uses_wchar
   exename = aout
 
   verbatim(gnuace, bottom) {
@@ -50,6 +52,7 @@ project(adainset): gperf_test {
 }
 
 project(cppinset): gperf_test {
+  avoids      += uses_wchar
   exename = cppout
 
   verbatim(gnuace, bottom) {
@@ -74,6 +77,7 @@ project(cppinset): gperf_test {
 }
 
 project(preinset): gperf_test {
+  avoids      += uses_wchar
   exename = preout
 
   verbatim(gnuace, bottom) {
@@ -98,6 +102,7 @@ project(preinset): gperf_test {
 }
 
 project(m3inset): gperf_test {
+  avoids      += uses_wchar
   exename = m3out
 
   verbatim(gnuace, bottom) {
@@ -122,6 +127,7 @@ project(m3inset): gperf_test {
 }
 
 project(pinset): gperf_test {
+  avoids      += uses_wchar
   exename = pout
 
   verbatim(gnuace, bottom) {
@@ -146,6 +152,7 @@ project(pinset): gperf_test {
 }
 
 project(iinset): gperf_test {
+  avoids      += uses_wchar
   exename = iout
 
   verbatim(gnuace, bottom) {
@@ -170,6 +177,7 @@ project(iinset): gperf_test {
 }
 
 project(iinset2): gperf_test {
+  avoids      += uses_wchar
   exename = iout2
   after  += iinset
 
@@ -196,6 +204,7 @@ project(iinset2): gperf_test {
 }
 
 project(tinset): gperf_test {
+  avoids      += uses_wchar
   exename = tout
 
   verbatim(gnuace, bottom) {
@@ -220,6 +229,7 @@ project(tinset): gperf_test {
 }
 
 project(taoinset): gperf_test {
+  avoids      += uses_wchar
   exename = taoout
 
   verbatim(gnuace, bottom) {
diff --git a/apps/mkcsregdb/mkcsregdb.cpp b/apps/mkcsregdb/mkcsregdb.cpp
index 388e9212dec..9d638725a10 100644
--- a/apps/mkcsregdb/mkcsregdb.cpp
+++ b/apps/mkcsregdb/mkcsregdb.cpp
@@ -312,7 +312,7 @@ csdb_generator::fini_output (const char *tgt)
 }
 
 int
-main (int argc, char ** argv)
+ACE_TMAIN (int argc, ACE_TCHAR ** argv)
 {
   ACE_CString srcname;
   if (argc > 1)
diff --git a/apps/soreduce/Library.cpp b/apps/soreduce/Library.cpp
index 6b5b2944ce2..b1b0c5b3e59 100644
--- a/apps/soreduce/Library.cpp
+++ b/apps/soreduce/Library.cpp
@@ -238,13 +238,13 @@ Library::load_modules ()
   ACE_CString subdir = path_ + "/.shobj";
 
   struct dirent **dent;
-  num_modules_ = ACE_OS::scandir(ACE_TEXT_CHAR_TO_TCHAR (subdir.c_str()),
+  num_modules_ = ACE_OS::scandir(ACE_TEXT_TO_TCHAR_IN (subdir.c_str()),
                                  &dent,selector,comparator);
 
   if (num_modules_ > 0) {
     modules_ = new Obj_Module * [num_modules_];
     for (int i = 0; i < num_modules_; i++) {
-      ACE_CString ent_name (ACE_TEXT_ALWAYS_CHAR (dent[i]->d_name));
+      ACE_CString ent_name (ACE_TEXT_TO_CHAR_IN (dent[i]->d_name));
       modules_[i] = new Obj_Module(ent_name);
       modules_[i]->add_source (ACE_CString(subdir + "/" + ent_name).c_str());
       ACE_OS::free(dent[i]);
@@ -302,7 +302,7 @@ Library::write_export_list (int show_ref_counts)
 
   if (show_ref_counts) {
     ACE_DEBUG ((LM_DEBUG, "Making directory %s\n",rcpath.c_str()));
-    if (ACE_OS::mkdir(ACE_TEXT_CHAR_TO_TCHAR (rcpath.c_str())) == -1 &&
+    if (ACE_OS::mkdir(ACE_TEXT_TO_TCHAR_IN (rcpath.c_str())) == -1 &&
         errno != EEXIST)
       ACE_ERROR ((LM_ERROR, "%p\n", "mkdir"));
   }
diff --git a/apps/soreduce/soreduce.cpp b/apps/soreduce/soreduce.cpp
index 4ac9e99aa16..b155ef24cef 100644
--- a/apps/soreduce/soreduce.cpp
+++ b/apps/soreduce/soreduce.cpp
@@ -32,7 +32,7 @@
 ACE_RCSID (src, soreduce, "$Id$")
 
 int
-main (int argc, char ** argv)
+ACE_TMAIN (int argc, ACE_TCHAR ** argv)
 {
   SO_Group group;
 
diff --git a/bin/MakeProjectCreator/config/ciao_events_dnc.mpb b/bin/MakeProjectCreator/config/ciao_events_dnc.mpb
index d7abd936f0c..cb10421b617 100644
--- a/bin/MakeProjectCreator/config/ciao_events_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_events_dnc.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : security, ifr_client, valuetype, pi, codecfactory, ciao_container_dnc, ciao_client_dnc, ciao_rtevent_dnc {
+project : security, ifr_client, valuetype, pi, codecfactory, ciao_container_dnc, ciao_client_dnc {
   includes   += $(CIAO_ROOT)/ciaosvcs/Events
   idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events -Sc
   libs     += CIAO_DnC_Events
diff --git a/bin/MakeProjectCreator/config/endpointpolicy.mpb b/bin/MakeProjectCreator/config/endpointpolicy.mpb
deleted file mode 100644
index 740b240e816..00000000000
--- a/bin/MakeProjectCreator/config/endpointpolicy.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : taolib, core, portableserver, pi {
-  after   += EndpointPolicy
-  libs    += TAO_EndpointPolicy
-}
diff --git a/bin/MakeProjectCreator/config/no_wchar.mpb b/bin/MakeProjectCreator/config/no_wchar.mpb
new file mode 100644
index 00000000000..07dbe0a1edc
--- /dev/null
+++ b/bin/MakeProjectCreator/config/no_wchar.mpb
@@ -0,0 +1,3 @@
+project {
+  avoids += uses_wchar
+}
diff --git a/bin/sandbox.cpp b/bin/sandbox.cpp
index fce69dedcb6..6b38aee0a6f 100644
--- a/bin/sandbox.cpp
+++ b/bin/sandbox.cpp
@@ -18,7 +18,7 @@ const char *child_name = 0;
 static int 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)
     return 1;
diff --git a/bin/tao_orb_tests.lst b/bin/tao_orb_tests.lst
index f76dfc6237f..c0d88be1c7f 100644
--- a/bin/tao_orb_tests.lst
+++ b/bin/tao_orb_tests.lst
@@ -88,8 +88,6 @@ TAO/tests/OBV/Factory/run_test.pl:
 TAO/tests/OBV/Forward/run_test.pl:
 TAO/tests/OBV/TC_Alignment/run_test.pl:
 TAO/tests/OBV/ValueBox/run_test.pl:
-TAO/tests/OBV/Truncatable/run_test.pl:
-TAO/tests/OBV/Simple/run_test.pl:
 TAO/tests/Hello/run_test.pl:
 TAO/tests/IPV6/run_test.pl: IPV6
 TAO/tests/AlternateIIOP/run_test.pl: !DISABLE_ToFix_LynxOS_x86
@@ -131,14 +129,11 @@ TAO/tests/POA/Default_Servant/run_test.pl: !MINIMUM
 TAO/tests/POA/Single_Threaded_POA/run_test.pl: !MINIMUM !ST
 TAO/tests/POA/Non_Servant_Upcalls/run_test.pl: !SUNCC5_1
 TAO/tests/POA/MT_Servant_Locator/run_test.pl: !MINIMUM !ST
-TAO/tests/POA/Bug_2511_Regression/run_test.pl: !MINIMUM
 TAO/tests/POA/Nested_Non_Servant_Upcalls/run_test.pl: !MINIMUM !ST
 TAO/tests/POA/Deactivate_Object/run_test.pl
 TAO/tests/POA/Reference_Counting/run_test.pl
 TAO/tests/POA/Current/run_test.pl:
 TAO/tests/POA/wait_for_completion/run_test.pl:
-TAO/tests/POA/POAManagerFactory/run_test.pl:
-TAO/tests/POA/EndpointPolicy/run_test.pl:
 TAO/tests/IORManipulation/run_test.pl:
 TAO/tests/Policies/run_test.pl: !MINIMUM !ST
 TAO/tests/Timeout/run_test.pl: !MINIMUM
@@ -181,7 +176,6 @@ TAO/tests/InterOp-Naming/run_test.pl: !MINIMUM
 TAO/tests/Multiple/run_test.pl: !VxWorks !SUNCC5_1
 TAO/tests/Exposed_Policies/run_test.pl: !MINIMUM !ST
 TAO/tests/Portable_Interceptors/Bug_1559/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Bug_2510_Regression/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/Collocated/Dynamic/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
 TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
 TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS !ST
@@ -243,4 +237,3 @@ TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl big: !ST !VxWorks
 TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: !STATIC !ST !VxWorks
 TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: !ST !VxWorks
 TAO/tests/Permanent_Forward/run_test.pl:
-TAO/tests/Parallel_Connect_Strategy/run_test.pl:
diff --git a/contrib/utility/Example/CommandLine/Foo/foo.cpp b/contrib/utility/Example/CommandLine/Foo/foo.cpp
index a389f8d822a..9c6c36daea5 100644
--- a/contrib/utility/Example/CommandLine/Foo/foo.cpp
+++ b/contrib/utility/Example/CommandLine/Foo/foo.cpp
@@ -48,7 +48,7 @@ int
 help (int argc, char* argv[]);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
 
   // Step 1: determine command
diff --git a/examples/APG/Config/ARGV_Example.cpp b/examples/APG/Config/ARGV_Example.cpp
index 92fb25cd30d..2e87b3caeba 100644
--- a/examples/APG/Config/ARGV_Example.cpp
+++ b/examples/APG/Config/ARGV_Example.cpp
@@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
   static const ACE_TCHAR cmdline[] =
     ACE_TEXT ("-f /home/managed.cfg -h $HOSTNAME");
   ACE_ARGV cmdline_args (cmdline);
-  ACE_Get_Opt cmd_opts (cmdline_args.argc (),
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (cmdline_args.argc (),
                         cmdline_args.argv (),
                         options,
                         0);          // Don't skip any args
diff --git a/examples/APG/Config/Get_Opt.cpp b/examples/APG/Config/Get_Opt.cpp
index 604dc38326e..aff6ad035ee 100644
--- a/examples/APG/Config/Get_Opt.cpp
+++ b/examples/APG/Config/Get_Opt.cpp
@@ -1,7 +1,7 @@
 /**
  * $Id$
  *
- * ACE_Get_Opt examples not in a larger program. Sample code from The ACE
+ * ACE_Get_Arg_Opt examples not in a larger program. Sample code from The ACE
  * Programmer's Guide, Copyright 2003 Addison-Wesley. All Rights Reserved.
  */
 
@@ -16,7 +16,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   // Example for a long option without a corresponding short option.
   // Just put some context here so the following compiles and runs.
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Opt cmd_opts (argc, argv, options);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options);
 
   // Listing 1 code/ch04
   cmd_opts.long_option (ACE_TEXT ("cool_option"));
diff --git a/examples/APG/Config/Get_Opt_Long.cpp b/examples/APG/Config/Get_Opt_Long.cpp
index 66baed05cdb..8b212b7a32a 100644
--- a/examples/APG/Config/Get_Opt_Long.cpp
+++ b/examples/APG/Config/Get_Opt_Long.cpp
@@ -1,7 +1,7 @@
 /**
  * $Id$
  *
- * ACE_Get_Opt long_only examples. Sample code from The ACE
+ * ACE_Get_Arg_Opt long_only examples. Sample code from The ACE
  * Programmer's Guide, Copyright 2003 Addison-Wesley. All Rights Reserved.
  */
 
@@ -14,10 +14,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Opt cmd_opts
-    (argc, argv, options, 1, 0, ACE_Get_Opt::PERMUTE_ARGS, 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts
+    (argc, argv, options, 1, 0, ACE_Get_Arg_Opt<ACE_TCHAR>::PERMUTE_ARGS, 1);
   if (cmd_opts.long_option
-      (ACE_TEXT ("config"), 'f', ACE_Get_Opt::ARG_REQUIRED) == -1)
+      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1)
     return -1;
 
   int option;
diff --git a/examples/APG/Config/HA_Status.cpp b/examples/APG/Config/HA_Status.cpp
index 1bad687be80..6fac607d8e6 100644
--- a/examples/APG/Config/HA_Status.cpp
+++ b/examples/APG/Config/HA_Status.cpp
@@ -27,14 +27,14 @@ int
 HA_Status::init (int argc, ACE_TCHAR *argv[])
 {
 
-  // Do ACE_Get_Opt and get conf file name, read out the sections
+  // Do ACE_Get_Arg_Opt and get conf file name, read out the sections
   // and print the names.
 
   // Listing 1 code/ch04
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Opt cmd_opts (argc, argv, options);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options);
   if (cmd_opts.long_option
-      (ACE_TEXT ("config"), 'f', ACE_Get_Opt::ARG_REQUIRED) == -1)
+      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1)
     return -1;
   int option;
   ACE_TCHAR config_file[MAXPATHLEN];
diff --git a/examples/APG/Logging/Callback-2.h b/examples/APG/Logging/Callback-2.h
index 906b2e43286..27cbdcd0ab7 100644
--- a/examples/APG/Logging/Callback-2.h
+++ b/examples/APG/Logging/Callback-2.h
@@ -22,20 +22,20 @@ public:
       const ACE_TCHAR *prio_name =
         ACE_Log_Record::priority_name (prio);
       cerr << "\tType:        "
-           << ACE_TEXT_ALWAYS_CHAR (prio_name)
+           << ACE_TEXT_TO_CHAR_IN (prio_name)
 	   << endl;
 
       cerr << "\tLength:      " << log_record.length () << endl;
 
       const time_t epoch = log_record.time_stamp ().sec ();
       cerr << "\tTime_Stamp:  "
-           << ACE_TEXT_ALWAYS_CHAR (ACE_OS::ctime (&epoch))
+           << ACE_TEXT_TO_CHAR_IN (ACE_OS::ctime (&epoch))
            << flush;
 
       cerr << "\tPid:         " << log_record.pid () << endl;
 
       ACE_CString data (">> ");
-      data += ACE_TEXT_ALWAYS_CHAR (log_record.msg_data ());
+      data += ACE_TEXT_TO_CHAR_IN (log_record.msg_data ());
 
       cerr << "\tMsgData:     " << data.c_str () << endl;
     }
diff --git a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
index 39f871a8bb3..990ab0906b4 100644
--- a/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
+++ b/examples/APG/Svc_Config/HA_Status_Dynamic.cpp
@@ -17,9 +17,9 @@ int
 HA_Status::init (int argc, ACE_TCHAR *argv[])
 {
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Opt cmd_opts (argc, argv, options, 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options, 0);
   if (cmd_opts.long_option
-      (ACE_TEXT ("config"), 'f', ACE_Get_Opt::ARG_REQUIRED) == -1)
+      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1)
     return -1;
   int option;
   ACE_TCHAR config_file[MAXPATHLEN];
diff --git a/examples/APG/Svc_Config/HA_Status_Static.cpp b/examples/APG/Svc_Config/HA_Status_Static.cpp
index ef09bcaa5cd..09f2d75fd59 100644
--- a/examples/APG/Svc_Config/HA_Status_Static.cpp
+++ b/examples/APG/Svc_Config/HA_Status_Static.cpp
@@ -17,9 +17,9 @@ int
 HA_Status::init (int argc, ACE_TCHAR *argv[])
 {
   static const ACE_TCHAR options[] = ACE_TEXT (":f:");
-  ACE_Get_Opt cmd_opts (argc, argv, options, 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> cmd_opts (argc, argv, options, 0);
   if (cmd_opts.long_option
-      (ACE_TEXT ("config"), 'f', ACE_Get_Opt::ARG_REQUIRED) == -1)
+      (ACE_TEXT ("config"), 'f', ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED) == -1)
     return -1;
   int option;
   ACE_TCHAR config_file[MAXPATHLEN];
diff --git a/examples/ASX/Event_Server/Event_Server/Options.cpp b/examples/ASX/Event_Server/Event_Server/Options.cpp
index 6ef846f2f31..ac98f1f45db 100644
--- a/examples/ASX/Event_Server/Event_Server/Options.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Options.cpp
@@ -108,7 +108,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:bdH:i:L:l:M:ns:t:T:v"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("c:bdH:i:L:l:M:ns:t:T:v"));
   int c;
 
   while ((c = get_opt ()) != EOF)
@@ -172,7 +172,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 		   "\t[-s supplier port]\n"
 		   "\t[-t number of threads]\n"
 		   "\t[-v] (verbose) \n",
-		   ACE_TEXT_ALWAYS_CHAR (argv[0]));
+		   ACE_TEXT_TO_CHAR_IN (argv[0]));
 	::exit (1);
 	/* NOTREACHED */
 	break;
@@ -181,17 +181,17 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
   // This is a major hack to get the size_t format spec to be a narrow
   // char, same as the other strings for printf() here. It only works
   // because this is the end of the source file. It makes the
-  // ACE_SIZE_T_FORMAT_SPECIFIER not use ACE_LIB_TEXT, effectively.
-#undef ACE_LIB_TEXT
-#define ACE_LIB_TEXT(A) A
+  // ACE_SIZE_T_FORMAT_SPECIFIER not use ACE_TEXT, effectively.
+#undef ACE_TEXT
+#define ACE_TEXT(A) A
   if (this->verbose ())
     ACE_OS::printf ("%8d = initial concurrency hint\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = thread count\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = low water mark\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = high water mark\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = message_size\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = initial queue length\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = total iterations\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = thread count\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = low water mark\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = high water mark\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = message_size\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = initial queue length\n"
 	      "%8d = THR_BOUND\n"
 	      "%8d = THR_NEW_LWP\n",
 	      ACE_Thread::getconcurrency (),
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 37bbaad7d3d..c1da28ddb74 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -24,7 +24,7 @@ ACE_RCSID (Transceiver,
 int
 Event_Transceiver::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("Ch:p:S"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("Ch:p:S"));
 
   this->port_number_ = ACE_DEFAULT_SERVER_PORT;
   this->host_name_ = ACE_DEFAULT_SERVER_HOST;
diff --git a/examples/ASX/Message_Queue/buffer_stream.cpp b/examples/ASX/Message_Queue/buffer_stream.cpp
index b1f918cfef5..cef4a62ae51 100644
--- a/examples/ASX/Message_Queue/buffer_stream.cpp
+++ b/examples/ASX/Message_Queue/buffer_stream.cpp
@@ -242,7 +242,7 @@ Filter::put (ACE_Message_Block *mb,
 
       // Prepend the line count in front of the buffer.
       ACE_OS::sprintf (mb->rd_ptr (),
-                       ACE_SIZE_T_FORMAT_SPECIFIER
+                       ACE_SIZE_T_FORMAT_SPECIFIER_A
                        ": %s",
                        this->count_++,
                        buf);
@@ -302,7 +302,7 @@ ACE_TMAIN (int, ACE_TCHAR *argv[])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("threads not supported on this platform\n")));
diff --git a/examples/ASX/UPIPE_Event_Server/Options.cpp b/examples/ASX/UPIPE_Event_Server/Options.cpp
index ca2cbbca887..2cec2691abd 100644
--- a/examples/ASX/UPIPE_Event_Server/Options.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Options.cpp
@@ -98,7 +98,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("C:c:bdH:i:L:l:M:nS:s:t:T:v"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("C:c:bdH:i:L:l:M:nS:s:t:T:v"));
   int c;
 
   while ((c = getopt ()) != -1)
@@ -170,27 +170,20 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 		   "\t[-s supplier port]\n"
 		   "\t[-t number of threads]\n"
 		   "\t[-v] (verbose) \n",
-		   ACE_TEXT_ALWAYS_CHAR (argv[0]));
+		   ACE_TEXT_TO_CHAR_IN (argv[0]));
 	::exit (1);
 	/* NOTREACHED */
 	break;
       }
 
-  // HACK! This needs to be done to avoid the mismatch from ACE_LIB_TEXT
-  // in ACE_SIZE_T_FORMAT_SPECIFIER to narrow-char on wide-char builds.
-  // It only works because it's at the end of the file.
-# if defined (ACE_LIB_TEXT)
-#  undef ACE_LIB_TEXT
-# endif
-# define ACE_LIB_TEXT(X) X
   if (this->verbose ())
     ACE_OS::printf ("%8d = initial concurrency hint\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = thread count\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = low water mark\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = high water mark\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = message_size\n"
-	      ACE_SIZE_T_FORMAT_SPECIFIER " = initial queue length\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = total iterations\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = thread count\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = low water mark\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = high water mark\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = message_size\n"
+	      ACE_SIZE_T_FORMAT_SPECIFIER_A " = initial queue length\n"
 	      "%8d = THR_BOUND\n"
 	      "%8d = THR_NEW_LWP\n",
 	      ACE_OS::thr_getconcurrency (),
diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
index 757eecedc33..19cfc8a8a57 100644
--- a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
@@ -26,7 +26,7 @@ ACE_RCSID(UPIPE_Event_Server, Peer_Router, "$Id$")
 template <class PH, class PK> int
 Acceptor_Factory<PH, PK>::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("df:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("df:"), 0);
   ACE_UPIPE_Addr addr;
 
   for (int c; (c = get_opt ()) != -1; )
diff --git a/examples/C++NPv1/Iterative_Logging_Server.cpp b/examples/C++NPv1/Iterative_Logging_Server.cpp
index f4c28f08da7..ca8a7478064 100644
--- a/examples/C++NPv1/Iterative_Logging_Server.cpp
+++ b/examples/C++NPv1/Iterative_Logging_Server.cpp
@@ -5,13 +5,15 @@
 */
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Iterative_Logging_Server.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Iterative_Logging_Server server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
   return 0;
 }
diff --git a/examples/C++NPv1/Logging_Client.cpp b/examples/C++NPv1/Logging_Client.cpp
index 56434d35699..764b0682f5b 100644
--- a/examples/C++NPv1/Logging_Client.cpp
+++ b/examples/C++NPv1/Logging_Client.cpp
@@ -12,6 +12,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/Log_Record.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
@@ -39,7 +40,7 @@ int operator<< (ACE_OutputCDR &cdr, const ACE_Log_Record &log_record)
   cdr << ACE_CDR::Long (log_record.time_stamp ().sec ());
   cdr << ACE_CDR::Long (log_record.time_stamp ().usec ());
   cdr << ACE_CDR::ULong (msglen);
-  cdr.write_char_array (nonconst_record.msg_data (), msglen);
+  cdr.write_char_array (ACE_TEXT_TO_CHAR_IN(nonconst_record.msg_data ()), msglen);
   return cdr.good_bit ();
 }
 
@@ -91,11 +92,15 @@ public:
 };
 
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *targv[])
 {
+  ACE_Argv_Type_Converter convert (argc, targv);
+  argc = convert.get_argc();
+  char** argv = convert.get_ASCII_argv();
+
   u_short logger_port = argc > 1 ? atoi (argv[1]) : 0;
   const char *logger_host =
-    argc > 2 ? argv[2] : ACE_DEFAULT_SERVER_HOST;
+    argc > 2 ? argv[2] : ACE_DEFAULT_SERVER_HOST_A;
   int result;
 
   ACE_INET_Addr server_addr;
@@ -150,7 +155,7 @@ int main (int argc, char *argv[])
 
     ACE_Time_Value now (ACE_OS::gettimeofday ());
     ACE_Log_Record log_record (LM_INFO, now, ACE_OS::getpid ());
-    log_record.msg_data (user_input.c_str ());
+    log_record.msg_data (ACE_TEXT_TO_TCHAR_IN(user_input.c_str ()));
     if (logging_client.send (log_record) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "%p\n", "logging_client.send()"), 1);
diff --git a/examples/C++NPv1/Logging_Handler.cpp b/examples/C++NPv1/Logging_Handler.cpp
index dc1d56b3190..e29faf77812 100644
--- a/examples/C++NPv1/Logging_Handler.cpp
+++ b/examples/C++NPv1/Logging_Handler.cpp
@@ -27,13 +27,13 @@ int operator>> (ACE_InputCDR &cdr, ACE_Log_Record &log_record)
   // Extract each field from input CDR stream into <log_record>.
   if ((cdr >> type) && (cdr >> pid) && (cdr >> sec) && (cdr >> usec)
       && (cdr >> buffer_len)) {
-    ACE_TCHAR log_msg[ACE_Log_Record::MAXLOGMSGLEN+1];
+    char log_msg[ACE_Log_Record::MAXLOGMSGLEN+1];
     log_record.type (type);
     log_record.pid (pid);
     log_record.time_stamp (ACE_Time_Value (sec, usec));
     cdr.read_char_array (log_msg, buffer_len);
     log_msg[buffer_len] = '\0';
-    log_record.msg_data (log_msg);
+    log_record.msg_data (ACE_TEXT_TO_TCHAR_IN(log_msg));
   }
   return cdr.good_bit ();
 }
@@ -113,7 +113,7 @@ int Logging_Handler::write_log_record (ACE_Message_Block *mblk)
     cdr >> length;
     ACE_Log_Record log_record;
     cdr >> log_record;  // Finally extract the <ACE_log_record>.
-    log_record.print (mblk->rd_ptr (), 1, cerr);
+    log_record.print (ACE_TEXT_TO_TCHAR_IN(mblk->rd_ptr ()), 1, cerr);
   }
   return mblk->total_length ();
 }
diff --git a/examples/C++NPv1/Logging_Server.cpp b/examples/C++NPv1/Logging_Server.cpp
index c685412c769..161adfa3ecc 100644
--- a/examples/C++NPv1/Logging_Server.cpp
+++ b/examples/C++NPv1/Logging_Server.cpp
@@ -52,16 +52,16 @@ int Logging_Server::open (u_short logger_port)
 int Logging_Server::make_log_file (ACE_FILE_IO &logging_file,
                                    ACE_SOCK_Stream *logging_peer)
 {
-  char filename[MAXHOSTNAMELEN + sizeof (".log")];
+  ACE_TCHAR filename[MAXHOSTNAMELEN + sizeof (ACE_TEXT(".log"))];
 
   if (logging_peer != 0) { // Use client's hostname as log file name.
     ACE_INET_Addr logging_peer_addr;
     logging_peer->get_remote_addr (logging_peer_addr);
     logging_peer_addr.get_host_name (filename, MAXHOSTNAMELEN);
-    ACE_OS::strcat (filename, ".log");
+    ACE_OS::strcat (filename, ACE_TEXT(".log"));
   }
   else
-    ACE_OS::strcpy (filename, "logging_server.log");
+    ACE_OS::strcpy (filename, ACE_TEXT("logging_server.log"));
 
   ACE_FILE_Connector connector;
   return connector.connect (logging_file,
diff --git a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
index 54d936962aa..f992ea824bc 100644
--- a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
@@ -9,6 +9,7 @@
 #include "ace/Signal.h"
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_fcntl.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "Process_Per_Connection_Logging_Server.h"
 #include "Logging_Handler.h"
@@ -164,15 +165,17 @@ Process_Per_Connection_Logging_Server::run_worker (int, char *argv[])
 }
 
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // Register to receive the <SIGTERM> signal.
   ACE_Sig_Action sa ((ACE_SignalHandler)sigterm_handler,
                      SIGTERM);
 
   Process_Per_Connection_Logging_Server server;
 
-  if (server.run (argc, argv) == -1 && errno != EINTR)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1 && errno != EINTR)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
 
   // Barrier synchronization.
diff --git a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
index febbf1964d5..577e606ed8f 100644
--- a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
@@ -10,6 +10,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/Signal.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "RT_Thread_Per_Connection_Logging_Server.h"
 #include "Logging_Handler.h"
@@ -114,15 +115,16 @@ Thread_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client)
 }
 
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   // Register to receive the <SIGTERM> signal.
   ACE_Sig_Action sa ((ACE_SignalHandler) sigterm_handler,
                      SIGTERM);
 
   RT_Thread_Per_Connection_Logging_Server server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
 
   // Cooperative thread cancellation and barrier synchronization.
diff --git a/examples/C++NPv1/Reactive_Logging_Server.cpp b/examples/C++NPv1/Reactive_Logging_Server.cpp
index 39d2c6b51be..2c493aecf8b 100644
--- a/examples/C++NPv1/Reactive_Logging_Server.cpp
+++ b/examples/C++NPv1/Reactive_Logging_Server.cpp
@@ -5,13 +5,15 @@
 */
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Reactive_Logging_Server.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Reactive_Logging_Server server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
   return 0;
 }
diff --git a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
index b8bc363180a..08f29422bed 100644
--- a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
+++ b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
@@ -6,14 +6,16 @@
 
 #include "ace/Functor.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "Reactive_Logging_Server_Ex.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Reactive_Logging_Server_Ex server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
   return 0;
 }
diff --git a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
index 3737957ff70..493628ab436 100644
--- a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
@@ -9,6 +9,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/Signal.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "Thread_Per_Connection_Logging_Server.h"
 #include "Logging_Handler.h"
@@ -75,15 +76,16 @@ Thread_Per_Connection_Logging_Server::handle_data (ACE_SOCK_Stream *client)
 }
 
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   // Register to receive the <SIGTERM> signal.
   ACE_Sig_Action sa ((ACE_SignalHandler) sigterm_handler,
                      SIGTERM);
 
   Thread_Per_Connection_Logging_Server server;
 
-  if (server.run (argc, argv) == -1)
+  if (server.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server.run()"), 1);
 
   // Cooperative thread cancellation and barrier synchronization.
diff --git a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
index 759dcb44861..dd70afabcf2 100644
--- a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
@@ -388,13 +388,13 @@ int AC_Client_Logging_Daemon::init
   ACE_TCHAR sld_host[MAXHOSTNAMELEN];
   ACE_OS::strcpy (sld_host, ACE_LOCALHOST);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
   get_opt.long_option (ACE_TEXT ("client_port"), 'p',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_port"), 'r',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_name"), 's',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
 
   for (int c; (c = get_opt ()) != -1;)
     switch (c) {
diff --git a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
index 56983e8f89a..841feaaa54f 100644
--- a/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
@@ -287,13 +287,13 @@ int AIO_Client_Logging_Daemon::init
   ACE_TCHAR sld_host[MAXHOSTNAMELEN];
   ACE_OS::strcpy (sld_host, ACE_LOCALHOST);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
   get_opt.long_option (ACE_TEXT ("client_port"), 'p',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_port"), 'r',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_name"), 's',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
 
   for (int c; (c = get_opt ()) != -1;)
     switch (c) {
diff --git a/examples/C++NPv2/Client_Logging_Daemon.cpp b/examples/C++NPv2/Client_Logging_Daemon.cpp
index 5fc0d554cbd..1bc2b5ea1d8 100644
--- a/examples/C++NPv2/Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/Client_Logging_Daemon.cpp
@@ -336,13 +336,13 @@ int Client_Logging_Daemon::init (int argc, ACE_TCHAR *argv[]) {
   ACE_TCHAR sld_host[MAXHOSTNAMELEN];
   ACE_OS::strcpy (sld_host, ACE_LOCALHOST);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:r:s:"), 0);
   get_opt.long_option (ACE_TEXT ("client_port"), 'p',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_port"), 'r',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
   get_opt.long_option (ACE_TEXT ("server_name"), 's',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
 
   for (int c; (c = get_opt ()) != -1;)
     switch (c) {
diff --git a/examples/C++NPv2/Logging_Event_Handler.cpp b/examples/C++NPv2/Logging_Event_Handler.cpp
index d805e776390..3bac6208b27 100644
--- a/examples/C++NPv2/Logging_Event_Handler.cpp
+++ b/examples/C++NPv2/Logging_Event_Handler.cpp
@@ -12,8 +12,8 @@
 
 int Logging_Event_Handler::open () {
 
-  static const char LOGFILE_SUFFIX[] = ".log";
-  char filename[MAXHOSTNAMELEN + sizeof (LOGFILE_SUFFIX)];
+  static const ACE_TCHAR LOGFILE_SUFFIX[] = ACE_TEXT(".log");
+  ACE_TCHAR filename[MAXHOSTNAMELEN + sizeof (LOGFILE_SUFFIX)];
   ACE_INET_Addr logging_peer_addr;
 
   logging_handler_.peer ().get_remote_addr (logging_peer_addr);
diff --git a/examples/C++NPv2/Reactor_Logging_Server.cpp b/examples/C++NPv2/Reactor_Logging_Server.cpp
index b36539c2a6d..269e158d243 100644
--- a/examples/C++NPv2/Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/Reactor_Logging_Server.cpp
@@ -11,7 +11,7 @@
 typedef Reactor_Logging_Server<Logging_Acceptor_Ex>
         Server_Logging_Daemon;
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Reactor reactor;
   Server_Logging_Daemon *server;
diff --git a/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp b/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp
index 128ad5cabd3..9c6f89db458 100644
--- a/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp
+++ b/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp
@@ -23,7 +23,7 @@ Reactor_Logging_Server_Adapter<ACCEPTOR>::init (int argc,
   ACE_Auto_Array_Ptr<char *> char_argv (array);
 
   for (i = 0; i < argc; ++i)
-    char_argv[i] = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (argv[i]));
+    char_argv[i] = ACE::strnew (ACE_TEXT_TO_CHAR_IN (argv[i]));
   ACE_NEW_NORETURN (server_, Reactor_Logging_Server<ACCEPTOR>
                                (i, char_argv.get (),
                                 ACE_Reactor::instance ()));
diff --git a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
index 24123c3b3c6..2361ad8d871 100644
--- a/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/Select_Reactor_Logging_Server.cpp
@@ -87,7 +87,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) {
 }
 
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Select_Reactor select_reactor;
   ACE_Reactor reactor (&select_reactor);
diff --git a/examples/C++NPv2/Service_Reporter.cpp b/examples/C++NPv2/Service_Reporter.cpp
index ad9cd05d26c..022ae96944f 100644
--- a/examples/C++NPv2/Service_Reporter.cpp
+++ b/examples/C++NPv2/Service_Reporter.cpp
@@ -20,10 +20,10 @@ int Service_Reporter::init (int argc, ACE_TCHAR *argv[]) {
   ACE_INET_Addr local_addr (Service_Reporter::DEFAULT_PORT);
 
   // Start at argv[0].
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0);
   get_opt.long_option (ACE_TEXT ("port"),
                        'p',
-                       ACE_Get_Opt::ARG_REQUIRED);
+                       ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c) {
diff --git a/examples/C++NPv2/TP_Logging_Server.h b/examples/C++NPv2/TP_Logging_Server.h
index 9c4869cdcee..cb98be5e353 100644
--- a/examples/C++NPv2/TP_Logging_Server.h
+++ b/examples/C++NPv2/TP_Logging_Server.h
@@ -107,7 +107,7 @@ public:
     ACE_Auto_Array_Ptr<char *> char_argv (array);
 
     for (i = 0; i < argc; ++i)
-      char_argv[i] = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (argv[i]));
+      char_argv[i] = ACE::strnew (ACE_TEXT_TO_CHAR_IN (argv[i]));
     ACE_NEW_NORETURN
       (logging_dispatcher_,
        TP_Logging_Server::LOGGING_DISPATCHER
diff --git a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
index 0d3216fe4e5..41d363af060 100644
--- a/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/TP_Reactor_Logging_Server.cpp
@@ -93,7 +93,7 @@ static ACE_THR_FUNC_RETURN controller (void *arg) {
 }
 
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   const size_t N_THREADS = 4;
   ACE_TP_Reactor tp_reactor;
diff --git a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
index 2174cd20412..46fff8bf083 100644
--- a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
@@ -119,7 +119,7 @@ typedef Reactor_Logging_Server<Logging_Acceptor_WFMO>
         Server_Logging_Daemon;
 
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   const size_t N_THREADS = 4;
   ACE_WFMO_Reactor wfmo_reactor;
@@ -138,7 +138,7 @@ int main (int argc, char *argv[])
 }
 
 #else /* !ACE_WIN32 */
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/examples/C++NPv2/display_logfile.cpp b/examples/C++NPv2/display_logfile.cpp
index 19f251e9463..d884662090d 100644
--- a/examples/C++NPv2/display_logfile.cpp
+++ b/examples/C++NPv2/display_logfile.cpp
@@ -277,7 +277,7 @@ public:
     char timestamp[26]; // Max size of ctime_r() string.
     time_t time_secs (secs);
     ACE_OS::ctime_r (&time_secs, timestamp_t, sizeof timestamp_t);
-    ACE_OS::strcpy (timestamp, ACE_TEXT_ALWAYS_CHAR (timestamp_t));
+    ACE_OS::strcpy (timestamp, ACE_TEXT_TO_CHAR_IN (timestamp_t));
     mblk->size (26); // Max size of ctime_r() string.
     mblk->reset ();
     timestamp[19] = '\0'; // NUL-terminate after the time.
diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp
index 8885b0353cd..85f8acc6156 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -123,7 +123,7 @@ IPC_Server::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("ut:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("ut:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index 6618b64f0cb..9b2ea043c77 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -187,7 +187,7 @@ IPC_Client::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("ui:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("ui:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/examples/Connection/blocking/test_spipe_acceptor.cpp b/examples/Connection/blocking/test_spipe_acceptor.cpp
index 549690ebf43..83003eb1c85 100644
--- a/examples/Connection/blocking/test_spipe_acceptor.cpp
+++ b/examples/Connection/blocking/test_spipe_acceptor.cpp
@@ -25,7 +25,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 #else
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Asynchronous IO is unsupported.\n")));
diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp
index 23c85b283a3..bc786f428fe 100644
--- a/examples/Connection/misc/test_upipe.cpp
+++ b/examples/Connection/misc/test_upipe.cpp
@@ -113,7 +113,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "your platform does not support threads\n"),
diff --git a/examples/Connection/non_blocking/test_tli_acceptor.cpp b/examples/Connection/non_blocking/test_tli_acceptor.cpp
index 8f281c26bd1..270f4cc3c47 100644
--- a/examples/Connection/non_blocking/test_tli_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_tli_acceptor.cpp
@@ -16,7 +16,7 @@ typedef Svc_Handler<ACE_TLI_STREAM> SVC_HANDLER;
 typedef IPC_Server<SVC_HANDLER, ACE_TLI_ACCEPTOR> IPC_SERVER;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Perform Service_Config initializations
   ACE_Service_Config daemon (argv[0]);
diff --git a/examples/Connection/non_blocking/test_tli_connector.cpp b/examples/Connection/non_blocking/test_tli_connector.cpp
index 67756fe795d..eb8bdf23c3f 100644
--- a/examples/Connection/non_blocking/test_tli_connector.cpp
+++ b/examples/Connection/non_blocking/test_tli_connector.cpp
@@ -14,7 +14,7 @@ typedef Peer_Handler<ACE_TLI_STREAM> PEER_HANDLER;
 typedef IPC_Client<PEER_HANDLER, ACE_TLI_CONNECTOR> IPC_CLIENT;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Perform Service_Config initializations
   ACE_Service_Config daemon (argv[0]);
diff --git a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
index e4cf8997857..082dfb1f6dc 100644
--- a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
@@ -49,7 +49,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
 
   // Determine IP address of the server.
-  if ((hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR(host))) == 0)
+  if ((hp = ACE_OS::gethostbyname (ACE_TEXT_TO_CHAR_IN(host))) == 0)
     ACE_OS::perror (ACE_TEXT("gethostbyname")), ACE_OS::exit (1);
 
   // Set up the address information to contact the server.
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index 3428b02cd12..e91668e205f 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -115,7 +115,7 @@ Options::read (void *buf, size_t len, size_t &iteration)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("2h:i:m:p:q:st:T:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("2h:i:m:p:q:st:T:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index 43df0572f74..46dd0049da2 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -163,7 +163,7 @@ Options::Options (void)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("p:r:v"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("p:r:v"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
index 31f76d4826a..e6778984b40 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
@@ -105,7 +105,7 @@ Options::read (void *buf, size_t len, size_t &iteration)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:sT:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:sT:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -127,7 +127,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
         break;
       case 'q':
         ACE_OS::strncpy (this->quit_string_,
-                         ACE_TEXT_ALWAYS_CHAR (getopt.opt_arg ()),
+                         ACE_TEXT_TO_CHAR_IN (getopt.opt_arg ()),
                          QUIT_STRING_SIZE);
         break;
       case 's':
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
index 539b97c931c..7ab033550d1 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
@@ -110,7 +110,7 @@ Options::read (void *buf, size_t len, size_t &iteration)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:st:T:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:st:T:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -132,7 +132,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
         break;
       case 'q':
         ACE_OS::strncpy (this->quit_string_,
-                         ACE_TEXT_ALWAYS_CHAR (getopt.opt_arg ()),
+                         ACE_TEXT_TO_CHAR_IN (getopt.opt_arg ()),
                          QUIT_STRING_SIZE);
         break;
       case 's':
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
index e2d2c8ad0c1..e1a9177e56b 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
@@ -173,7 +173,7 @@ Options::Options (void)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("p:r:v"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("p:r:v"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
index 83333ccc357..23a53a7e7c7 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
@@ -170,7 +170,7 @@ handle_connections (ACE_SSL_SOCK_Acceptor &peer_acceptor,
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   u_short port = ACE_DEFAULT_SERVER_PORT + 1;
 
@@ -204,7 +204,7 @@ main (int, char *[])
 }
 #else
 #include "ace/OS_NS_stdio.h"
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_OS::fprintf (stderr, "This feature is not supported\n");
   return 0;
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
index 22535160cf0..6be3ce47b9e 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
@@ -355,7 +355,7 @@ run_event_loop (u_short port)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   u_short port = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
index 8563067af03..c1f173cd72f 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
@@ -414,7 +414,7 @@ run_event_loop (u_short port)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_SSL_Context *context = ACE_SSL_Context::instance ();
 
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
index 6990763a8b0..35dda19f05e 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(TLI_SAP, CPP_ATM_client, "$Id$")
 
 /* ACE_XTI/ATM Client */
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (argc < 2)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
index d4d3dec813c..5f45d465b49 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(TLI_SAP, CPP_ATM_server, "$Id$")
 // ACE_TLI Server
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Time_Value timeout (ACE_DEFAULT_TIMEOUT);
 
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
index b027315ef26..b955faa75f0 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
@@ -13,7 +13,7 @@ ACE_RCSID(TLI_SAP, CPP_client, "$Id$")
 
 /* ACE_TLI Client */
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   const char *host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
   u_short r_port = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT;
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
index 4ed8c0bf643..a85070ccb9e 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(TLI_SAP, CPP_server, "$Id$")
 // ACE_TLI Server
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT;
   ACE_Time_Value timeout (argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_TIMEOUT);
diff --git a/examples/IPC_SAP/TLI_SAP/db-client.cpp b/examples/IPC_SAP/TLI_SAP/db-client.cpp
index 51858b5f0cc..9051db43c21 100644
--- a/examples/IPC_SAP/TLI_SAP/db-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/db-client.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(TLI_SAP, db_client, "$Id$")
 const int MAXLINE = 255;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (argc < 2)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/examples/IPC_SAP/TLI_SAP/db-server.cpp b/examples/IPC_SAP/TLI_SAP/db-server.cpp
index 145c4a13ad0..3b547e154a3 100644
--- a/examples/IPC_SAP/TLI_SAP/db-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/db-server.cpp
@@ -86,7 +86,7 @@ lookup_name (ACE_HANDLE handle)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT;
   ACE_INET_Addr l_addr (port);
diff --git a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
index f12da575039..c544641fd5b 100644
--- a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(TLI_SAP, ftp_client, "$Id$")
 #if defined (ACE_HAS_TLI)
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (argc < 2)
     ACE_OS::fprintf (stderr, "Usage: %s filename [server-host port-number]\n", argv[0]), ACE_OS::exit (1);
diff --git a/examples/IPC_SAP/TLI_SAP/ftp-server.cpp b/examples/IPC_SAP/TLI_SAP/ftp-server.cpp
index 23596a84dd4..601a90987ff 100644
--- a/examples/IPC_SAP/TLI_SAP/ftp-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/ftp-server.cpp
@@ -42,7 +42,7 @@ read_file (void *fd)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT;
   ACE_TLI_Acceptor server;
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index fac6447d898..ea265241bcf 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -42,7 +42,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
   this->port_ = ACE_DEFAULT_SERVER_PORT;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
@@ -138,9 +138,9 @@ Logging_Handler::handle_input (ACE_HANDLE)
           {
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ")));
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-            lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->peer_name_), 1, cerr);
+            lp.print (ACE_TEXT_TO_TCHAR_IN (this->peer_name_), 1, cerr);
 #else
-            lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->peer_name_), 1, stderr);
+            lp.print (ACE_TEXT_TO_TCHAR_IN (this->peer_name_), 1, stderr);
 #endif
           }
         else
diff --git a/examples/Logger/simple-server/Logging_Handler.cpp b/examples/Logger/simple-server/Logging_Handler.cpp
index 111a26248fc..2ca0b8558a7 100644
--- a/examples/Logger/simple-server/Logging_Handler.cpp
+++ b/examples/Logger/simple-server/Logging_Handler.cpp
@@ -87,7 +87,7 @@ Logging_Handler::handle_input (ACE_HANDLE)
         if (lp.length () == n)
           {
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ")));
-            lp.print (ACE_TEXT_CHAR_TO_TCHAR (this->host_name_), 1);
+            lp.print (ACE_TEXT_TO_TCHAR_IN (this->host_name_), 1);
           }
         else
           ACE_ERROR ((LM_ERROR,
diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp
index f323a2f3826..7420aeb637e 100644
--- a/examples/Logger/simple-server/server_loggerd.cpp
+++ b/examples/Logger/simple-server/server_loggerd.cpp
@@ -41,7 +41,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_INET_Addr addr (PORT);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"));
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Mem_Map/IO-tests/test_io.cpp b/examples/Mem_Map/IO-tests/test_io.cpp
index b60401cc813..11cdceee15f 100644
--- a/examples/Mem_Map/IO-tests/test_io.cpp
+++ b/examples/Mem_Map/IO-tests/test_io.cpp
@@ -40,7 +40,7 @@ print_usage_and_die (void)
 {
   ACE_OS::fprintf (stderr, "usage: %s"
                    " [-i input_file] [-o output_file] [-n iteration_count] [-r]\n",
-                   ACE_TEXT_ALWAYS_CHAR (program_name));
+                   ACE_TEXT_TO_CHAR_IN (program_name));
   ACE_OS::exit (1);
 }
 
@@ -59,7 +59,7 @@ cleanup (int = 0)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:n:o:r"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:n:o:r"));
 
   for (int c; ((c = get_opt ()) != -1); )
     switch (c)
@@ -162,7 +162,7 @@ run_tests (int iterations, FILE *input_fp, FILE *output_fp)
 }
 
 int
-main (int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   program_name = ACE::basename (argv[0],
                                 ACE_DIRECTORY_SEPARATOR_CHAR);
diff --git a/examples/Misc/test_get_opt.cpp b/examples/Misc/test_get_opt.cpp
index 3fd0a16ac80..dcb12e5eeff 100644
--- a/examples/Misc/test_get_opt.cpp
+++ b/examples/Misc/test_get_opt.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-// Test the ACE_Get_Opt class.
+// Test the ACE_Get_Arg_Opt class.
 
 #include "ace/OS_main.h"
 #include "ace/Get_Opt.h"
@@ -11,7 +11,7 @@ ACE_RCSID(Misc, test_get_opt, "$Id$")
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("ab:cd:ef:gh:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("ab:cd:ef:gh:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/NT_Service/main.cpp b/examples/NT_Service/main.cpp
index fbbf4a60cf4..5f10e209df1 100644
--- a/examples/NT_Service/main.cpp
+++ b/examples/NT_Service/main.cpp
@@ -95,7 +95,7 @@ Process::print_usage_and_die (void)
 void
 Process::parse_args (int argc, ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("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)
diff --git a/examples/OS/Process/imore.cpp b/examples/OS/Process/imore.cpp
index 181254e0cb4..3740725a690 100644
--- a/examples/OS/Process/imore.cpp
+++ b/examples/OS/Process/imore.cpp
@@ -60,7 +60,7 @@ usage (void)
 static int
 parse_args (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("un"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("un"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/examples/OS/Process/process.cpp b/examples/OS/Process/process.cpp
index de0f2db0d57..e5a30ce1c4a 100644
--- a/examples/OS/Process/process.cpp
+++ b/examples/OS/Process/process.cpp
@@ -58,7 +58,7 @@ static int run_wait = 0;
 static int
 parse_args (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dlx:p:e:gastuw"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("dlx:p:e:gastuw"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
index 0ef3b353248..b36a4a79341 100644
--- a/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
+++ b/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp
@@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void)
 int
 QoS_Util::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
diff --git a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
index 0ef3b353248..b36a4a79341 100644
--- a/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
+++ b/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp
@@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void)
 int
 QoS_Util::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
diff --git a/examples/QOS/Simple/QoS_Util.cpp b/examples/QOS/Simple/QoS_Util.cpp
index 0ef3b353248..b36a4a79341 100644
--- a/examples/QOS/Simple/QoS_Util.cpp
+++ b/examples/QOS/Simple/QoS_Util.cpp
@@ -36,7 +36,7 @@ QoS_Util::~QoS_Util (void)
 int
 QoS_Util::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
diff --git a/examples/Reactor/Misc/notification.cpp b/examples/Reactor/Misc/notification.cpp
index a04663b28ad..e276791fc47 100644
--- a/examples/Reactor/Misc/notification.cpp
+++ b/examples/Reactor/Misc/notification.cpp
@@ -377,7 +377,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
 		     "threads must be supported to run this application\n"), -1);
diff --git a/examples/Reactor/Misc/pingpong.cpp b/examples/Reactor/Misc/pingpong.cpp
index f4a3bc0630e..803b98c24cd 100644
--- a/examples/Reactor/Misc/pingpong.cpp
+++ b/examples/Reactor/Misc/pingpong.cpp
@@ -53,7 +53,7 @@ ACE_RCSID(Misc, pingpong, "$Id$")
 class Ping_Pong : public ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>
 {
 public:
-  Ping_Pong (char b[], ACE_HANDLE f);
+  Ping_Pong (const char* b, ACE_HANDLE f);
   virtual ACE_HANDLE get_handle (void) const;
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_output (ACE_HANDLE);
@@ -75,7 +75,7 @@ private:
   // Open handle.
 };
 
-Ping_Pong::Ping_Pong (char b[], ACE_HANDLE f)
+Ping_Pong::Ping_Pong (const char* b, ACE_HANDLE f)
   : buflen_ (ACE_OS::strlen (b) + 1 + (2 * sizeof (int))),
     pid_ (ACE_OS::getpid ()),
     handle_ (f)
@@ -198,7 +198,7 @@ run_svc (ACE_HANDLE handle)
 {
   Ping_Pong *callback = 0;
   ACE_NEW (callback,
-           Ping_Pong (ACE_TEXT_ALWAYS_CHAR (string_name),
+           Ping_Pong (ACE_TEXT_TO_CHAR_IN (string_name),
                       handle));
 
   ACE_Reactor reactor;
diff --git a/examples/Reactor/Misc/test_reactors.cpp b/examples/Reactor/Misc/test_reactors.cpp
index a08580672e0..1676703118e 100644
--- a/examples/Reactor/Misc/test_reactors.cpp
+++ b/examples/Reactor/Misc/test_reactors.cpp
@@ -187,7 +187,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
   return 0;
diff --git a/examples/Reactor/Misc/test_signals_2.cpp b/examples/Reactor/Misc/test_signals_2.cpp
index 466ab58482f..00886ed6549 100644
--- a/examples/Reactor/Misc/test_signals_2.cpp
+++ b/examples/Reactor/Misc/test_signals_2.cpp
@@ -282,7 +282,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *[])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "The HP C++ compiler is too lame to support this feature\n"),
diff --git a/examples/Reactor/Misc/test_time_value.cpp b/examples/Reactor/Misc/test_time_value.cpp
index a1c1c874b78..6557a0716de 100644
--- a/examples/Reactor/Misc/test_time_value.cpp
+++ b/examples/Reactor/Misc/test_time_value.cpp
@@ -23,7 +23,7 @@ operator<< (ostream &stream, const ACE_Time_Value &tv)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_Time_Value tv1;
   ACE_Time_Value tv2 (2);
diff --git a/examples/Reactor/Multicast/Log_Wrapper.cpp b/examples/Reactor/Multicast/Log_Wrapper.cpp
index 055b57b9975..b3f84071a32 100644
--- a/examples/Reactor/Multicast/Log_Wrapper.cpp
+++ b/examples/Reactor/Multicast/Log_Wrapper.cpp
@@ -33,7 +33,7 @@ Log_Wrapper::open (const int port, const char *mcast_addr)
 
 #if defined (ACE_LACKS_UTSNAME_T)
   if ((host_info = ACE_OS::gethostbyname
-       (ACE_TEXT_ALWAYS_CHAR(host_data.nodename))) == NULL)
+       (ACE_TEXT_TO_CHAR_IN(host_data.nodename))) == NULL)
 #else
   if ((host_info = ACE_OS::gethostbyname (host_data.nodename)) == NULL)
 #endif
diff --git a/examples/Reactor/Multicast/client.cpp b/examples/Reactor/Multicast/client.cpp
index 25b18c2ae6c..3356540c880 100644
--- a/examples/Reactor/Multicast/client.cpp
+++ b/examples/Reactor/Multicast/client.cpp
@@ -32,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   ACE_LOG_MSG->open (argv[0]);
 
   // Start at argv[1]
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("m:ui:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("m:ui:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/Reactor/Multicast/server.cpp b/examples/Reactor/Multicast/server.cpp
index 65e39b97d1a..c3cef116638 100644
--- a/examples/Reactor/Multicast/server.cpp
+++ b/examples/Reactor/Multicast/server.cpp
@@ -238,7 +238,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 }
 #else
 int
-main (int, char *argv[])
+ACE_TMAIN (int, ACE_TCHAR *argv[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "error: %s must be run on a platform that support IP multicast\n",
diff --git a/examples/Reactor/Ntalker/ntalker.cpp b/examples/Reactor/Ntalker/ntalker.cpp
index 80873ead1a9..88454d8ebd4 100644
--- a/examples/Reactor/Ntalker/ntalker.cpp
+++ b/examples/Reactor/Ntalker/ntalker.cpp
@@ -180,7 +180,7 @@ Handler::Handler (u_short udp_port,
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:u"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:u"));
 
   int c;
 
diff --git a/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp b/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp
index be720fdef40..f68d91e7b6e 100644
--- a/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp
+++ b/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp
@@ -127,7 +127,7 @@ have_asynchio (void)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   if (have_asynchio () == 0)
     printf ("Test successful\n");
diff --git a/examples/Reactor/Proactor/post_completions.cpp b/examples/Reactor/Proactor/post_completions.cpp
index e6545241953..636f2c7f3fa 100644
--- a/examples/Reactor/Proactor/post_completions.cpp
+++ b/examples/Reactor/Proactor/post_completions.cpp
@@ -295,7 +295,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_DEBUG ((LM_DEBUG,
               "This example cannot work with AIOCB_Proactor.\n"));
diff --git a/examples/Reactor/Proactor/simple_test_proactor.cpp b/examples/Reactor/Proactor/simple_test_proactor.cpp
index 1f4557d7df5..56cdecfe0cc 100644
--- a/examples/Reactor/Proactor/simple_test_proactor.cpp
+++ b/examples/Reactor/Proactor/simple_test_proactor.cpp
@@ -224,7 +224,7 @@ Simple_Tester::handle_write_file (const ACE_Asynch_Write_File::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("f:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("f:d:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_aiocb.cpp b/examples/Reactor/Proactor/test_aiocb.cpp
index c9c0d280f1b..cb3a5139832 100644
--- a/examples/Reactor/Proactor/test_aiocb.cpp
+++ b/examples/Reactor/Proactor/test_aiocb.cpp
@@ -216,7 +216,7 @@ Test_Aio::do_aio (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   Test_Aio test_aio;
 
diff --git a/examples/Reactor/Proactor/test_aiocb_ace.cpp b/examples/Reactor/Proactor/test_aiocb_ace.cpp
index 17705de1f03..2ae450968ea 100644
--- a/examples/Reactor/Proactor/test_aiocb_ace.cpp
+++ b/examples/Reactor/Proactor/test_aiocb_ace.cpp
@@ -231,7 +231,7 @@ Test_Aio::do_aio (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
 
   ACE_UNUSED_ARG (argc);
diff --git a/examples/Reactor/Proactor/test_aiosig.cpp b/examples/Reactor/Proactor/test_aiosig.cpp
index 1746a10a49c..683753280e6 100644
--- a/examples/Reactor/Proactor/test_aiosig.cpp
+++ b/examples/Reactor/Proactor/test_aiosig.cpp
@@ -282,7 +282,7 @@ null_handler (int         /* signal_number */,
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   if (test_aio_calls () == 0)
     printf ("RT SIG test successful:\n"
diff --git a/examples/Reactor/Proactor/test_aiosig_ace.cpp b/examples/Reactor/Proactor/test_aiosig_ace.cpp
index 34c1b9b5ab2..acde4d6f90e 100644
--- a/examples/Reactor/Proactor/test_aiosig_ace.cpp
+++ b/examples/Reactor/Proactor/test_aiosig_ace.cpp
@@ -346,7 +346,7 @@ null_handler (int signal_number,
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   if (test_aio_calls () == 0)
     printf ("RT SIG test successful:\n"
diff --git a/examples/Reactor/Proactor/test_cancel.cpp b/examples/Reactor/Proactor/test_cancel.cpp
index c10f8e9be2c..c225af561b0 100644
--- a/examples/Reactor/Proactor/test_cancel.cpp
+++ b/examples/Reactor/Proactor/test_cancel.cpp
@@ -184,7 +184,7 @@ Receiver::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:s:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:s:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_end_event_loop.cpp b/examples/Reactor/Proactor/test_end_event_loop.cpp
index 096f77b089d..964088ad629 100644
--- a/examples/Reactor/Proactor/test_end_event_loop.cpp
+++ b/examples/Reactor/Proactor/test_end_event_loop.cpp
@@ -157,7 +157,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_DEBUG ((LM_DEBUG,
               "This example cannot work with AIOCB_Proactor.\n"));
diff --git a/examples/Reactor/Proactor/test_multiple_loops.cpp b/examples/Reactor/Proactor/test_multiple_loops.cpp
index ac4228ab641..40a51ecd58f 100644
--- a/examples/Reactor/Proactor/test_multiple_loops.cpp
+++ b/examples/Reactor/Proactor/test_multiple_loops.cpp
@@ -133,7 +133,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp
index 53a9fb7b474..1d0951658f4 100644
--- a/examples/Reactor/Proactor/test_proactor.cpp
+++ b/examples/Reactor/Proactor/test_proactor.cpp
@@ -604,7 +604,7 @@ Sender::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("h:p:f:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("h:p:f:d:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_proactor2.cpp b/examples/Reactor/Proactor/test_proactor2.cpp
index cd5cbf7092e..2fac76990d5 100644
--- a/examples/Reactor/Proactor/test_proactor2.cpp
+++ b/examples/Reactor/Proactor/test_proactor2.cpp
@@ -637,7 +637,7 @@ Sender::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:p:d:h:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:p:d:h:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_proactor3.cpp b/examples/Reactor/Proactor/test_proactor3.cpp
index c47468276c8..dc5bfa128d5 100644
--- a/examples/Reactor/Proactor/test_proactor3.cpp
+++ b/examples/Reactor/Proactor/test_proactor3.cpp
@@ -669,7 +669,7 @@ set_proactor_type (const char *ptype)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("t:o:n:p:d:h:s:u"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("t:o:n:p:d:h:s:u"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/Proactor/test_timeout.cpp b/examples/Reactor/Proactor/test_timeout.cpp
index 39351717db9..ab15f33dc5a 100644
--- a/examples/Reactor/Proactor/test_timeout.cpp
+++ b/examples/Reactor/Proactor/test_timeout.cpp
@@ -119,7 +119,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 #else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_DEBUG ((LM_DEBUG,
               "This example is multithreaded version of test_timeout_st.cpp\n"
diff --git a/examples/Reactor/Proactor/test_udp_proactor.cpp b/examples/Reactor/Proactor/test_udp_proactor.cpp
index bffb9acbaf7..b605d0b8e82 100644
--- a/examples/Reactor/Proactor/test_udp_proactor.cpp
+++ b/examples/Reactor/Proactor/test_udp_proactor.cpp
@@ -368,7 +368,7 @@ Sender::handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("h:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("h:p:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
index 9eb6d7c727a..a5fb49207eb 100644
--- a/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
+++ b/examples/Reactor/WFMO_Reactor/Handle_Close.cpp
@@ -261,7 +261,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   int result = 0;
 
   // Parse args
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("swmc"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("swmc"), 1);
   for (int c; (c = getopt ()) != -1; )
     switch (c)
       {
diff --git a/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/examples/Reactor/WFMO_Reactor/Multithreading.cpp
index 0778f375251..bc80e1bebe1 100644
--- a/examples/Reactor/WFMO_Reactor/Multithreading.cpp
+++ b/examples/Reactor/WFMO_Reactor/Multithreading.cpp
@@ -58,7 +58,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("t:h:s:i:e:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("t:h:s:i:e:"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/examples/Reactor/WFMO_Reactor/Talker.cpp b/examples/Reactor/WFMO_Reactor/Talker.cpp
index 32438088614..d9a20157dad 100644
--- a/examples/Reactor/WFMO_Reactor/Talker.cpp
+++ b/examples/Reactor/WFMO_Reactor/Talker.cpp
@@ -271,7 +271,7 @@ Peer_Handler::Peer_Handler (int argc, ACE_TCHAR *argv[])
   // then notifies us.
   this->msg_queue ()->notification_strategy (&this->strategy_);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("h:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("h:p:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
index 4cbb964cd74..22f287b7a2b 100644
--- a/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp
@@ -31,7 +31,7 @@ print_usage_and_die (void)
 void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
index 3f8ed3db866..ab157f18775 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp
@@ -39,7 +39,7 @@ print_usage_and_die (void)
 void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:f:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("c:f:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
index 9fb26b4088e..e90890fddc1 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp
@@ -39,7 +39,7 @@ parse_arguments (int argc, ACE_TCHAR *argv[])
   int tracing = 1;
   program_name = argv[0];
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("df:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("df:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
index 7193440b440..42065f10b1d 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp
index 77406f9bada..518c7aebf33 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp
@@ -36,7 +36,7 @@ static void
 parse_arguments (int argc, char *argv[])
 {
   program_name = argv[0];
-  ACE_Get_Opt get_opt (argc, argv, "dr:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dr:");
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
index 390b14e19b8..15977728f43 100644
--- a/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp
@@ -35,7 +35,7 @@ void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:r:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:r:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
index e5bec64d8c6..5ee3361da62 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("f:h:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("f:h:p:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
index cee8ca1469f..6e12812a4fe 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp
@@ -33,7 +33,7 @@ print_usage_and_die (void)
 void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:h:r"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:h:r"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
index d7d4ef7346c..12f3941de51 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp
@@ -40,7 +40,7 @@ void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
   program_name = argv[0];
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("f:h:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("f:h:p:"));
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
index 5b7784d4e44..4f42beb5674 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
@@ -39,7 +39,7 @@ void
 parse_args (int argc, char *argv[])
 {
   program_name = argv[0];
-  ACE_Get_Opt get_opt (argc, argv, "f:h:p:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:h:p:");
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
index ce7f42617e7..8fb87258041 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
@@ -50,7 +50,7 @@ ACE_INLINE int
 Handle_Broadcast::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_INET_Addr sba (Handle_Broadcast::DEFAULT_PORT);
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
index a77d75e1fa8..159cf410cb3 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
@@ -31,7 +31,7 @@ Handle_L_CODgram::info (ACE_TCHAR **strp, size_t length) const
   if (ACE_LSOCK_CODgram::get_local_addr (sa) == -1)
     return -1;
   
-  ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ()));
+  ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ()));
   ACE_OS::strcat (buf, ACE_TEXT (" # tests local connected datagram\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
@@ -45,7 +45,7 @@ ACE_INLINE int
 Handle_L_CODgram::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr  sucd;
-  ACE_Get_Opt    get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT ("r:"), 0);
   const ACE_TCHAR *r = Handle_L_CODgram::DEFAULT_RENDEZVOUS;
 
   for (int c; (c = get_opt ()) != -1; )
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
index 3b2ab29331f..5e225fafd9e 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
@@ -31,7 +31,7 @@ Handle_L_Dgram::info (ACE_TCHAR **strp, size_t length) const
   if (this->ACE_LSOCK_Dgram::get_local_addr (sa) == -1)
     return -1;
 
-  ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ()));
+  ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ()));
   ACE_OS::strcat (buf, ACE_TEXT (" # tests local datagram\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
@@ -45,7 +45,7 @@ ACE_INLINE int
 Handle_L_Dgram::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr  sudg;
-  ACE_Get_Opt    get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT ("r:"), 0);
   const ACE_TCHAR *r = Handle_L_Dgram::DEFAULT_RENDEZVOUS;
 
   for (int c; (c = get_opt ()) != -1; )
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
index f6cd0cda734..8e8a3e1f960 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
@@ -43,7 +43,7 @@ ACE_INLINE int
 Handle_L_FIFO::init (int argc, ACE_TCHAR *argv[])
 {
   const ACE_TCHAR *rendezvous_fifo = Handle_L_FIFO::DEFAULT_RENDEZVOUS;
-  ACE_Get_Opt    get_opt (argc, argv, ACE_TEXT("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT("r:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
index ce978aa85ea..72325011053 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
@@ -36,7 +36,7 @@ Handle_L_Pipe::info (ACE_TCHAR **strp, size_t length) const
   if (ACE_LSOCK_Acceptor::get_local_addr (sa) == -1)
     return -1;
 
-  ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ()));
+  ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ()));
   ACE_OS::strcat (buf, ACE_TEXT (" # tests local pipe\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
@@ -51,7 +51,7 @@ Handle_L_Pipe::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr sup;
   const ACE_TCHAR *r = Handle_L_Pipe::DEFAULT_RENDEZVOUS;
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
index 1dcb739b0ab..6f59b5d18a2 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
@@ -51,7 +51,7 @@ Handle_L_SPIPE::init (int argc, char *argv[])
 {
   ACE_SPIPE_Addr susp;
   const char     *rendezvous = Handle_L_SPIPE::DEFAULT_RENDEZVOUS;
-  ACE_Get_Opt    get_opt (argc, argv, "r:", 0);
+  ACE_Get_Arg_Opt<char>   get_opt (argc, argv, "r:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
index 80b21852293..8da839253be 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
@@ -40,7 +40,7 @@ Handle_L_Stream::info (ACE_TCHAR **strp, size_t length) const
   if (this->get_local_addr (sa) == -1)
     return -1;
   
-  ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ()));
+  ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ()));
   ACE_OS::strcat (buf, ACE_TEXT (" # tests local ACE_Stream\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
@@ -55,7 +55,7 @@ Handle_L_Stream::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNIX_Addr sus;
   const ACE_TCHAR *r = Handle_L_Stream::DEFAULT_RENDEZVOUS;
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
@@ -130,7 +130,7 @@ Handle_L_Stream::handle_input (ACE_HANDLE)
   if (new_local_stream.send (4,
 			     Handle_L_Stream::login_name, 
 			     ACE_OS::strlen (Handle_L_Stream::login_name),
-			     ACE_TEXT_ALWAYS_CHAR (cs), 
+			     ACE_TEXT_TO_CHAR_IN (cs), 
 			     ACE_OS::strlen (cs)) == -1)
     return -1;
   else if (ACE_OS::close (handle) == -1)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
index 88212a988f0..df58c0173b8 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
@@ -45,7 +45,7 @@ ACE_INLINE int
 Handle_R_Dgram::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_INET_Addr sidg (Handle_R_Dgram::DEFAULT_PORT);
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
index f126cd13aee..33045a3e44c 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
@@ -52,7 +52,7 @@ ACE_INLINE int
 Handle_R_Stream::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_INET_Addr sis (Handle_R_Stream::DEFAULT_PORT);
-  ACE_Get_Opt   get_opt (argc, argv, ACE_TEXT("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
index fb53c0f8d70..0a15478caed 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -61,7 +61,7 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[])
   ACE_INET_Addr local_addr (ACE_DEFAULT_THR_PORT);
   int n_threads = ACE_DEFAULT_THREADS;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:t:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:t:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     switch (c)
@@ -154,7 +154,7 @@ CLI_Stream<PR_ST_2>::svc (void)
   ACE_OS::cuserid (login_name);
   ACE_OS::sprintf (buf, "user %s %s",
 		   login_name,
-		   ACE_TEXT_ALWAYS_CHAR (ACE_OS::ctime ((const time_t *) &t)));
+		   ACE_TEXT_TO_CHAR_IN (ACE_OS::ctime ((const time_t *) &t)));
 
   if (this->peer ().send_n (buf, ACE_OS::strlen (buf) + 1) == -1)
     return -1;
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
index 346a22e773c..d23d1a26caa 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
@@ -30,7 +30,7 @@ Handle_Timeout::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_Time_Value delta (10);
   ACE_Time_Value interval (1);
-  ACE_Get_Opt    get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR>   get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0);
   int        arg = 0;
 
   for (int c; (c = get_opt ()) != -1; )
diff --git a/examples/Shared_Malloc/Options.cpp b/examples/Shared_Malloc/Options.cpp
index 6716fa66c31..bd08e7a57ba 100644
--- a/examples/Shared_Malloc/Options.cpp
+++ b/examples/Shared_Malloc/Options.cpp
@@ -133,9 +133,9 @@ Options::Options (void)
 void
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dehlL:mn:pst:T"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("dehlL:mn:pst:T"));
 
-  ACE_OS::strcpy (this->program_name_, ACE_TEXT_ALWAYS_CHAR (argv[0]));
+  ACE_OS::strcpy (this->program_name_, ACE_TEXT_TO_CHAR_IN (argv[0]));
   ACE_LOG_MSG->open (argv[0]);
 
   // Put in a special-case check for child process.
diff --git a/examples/Shared_Malloc/test_malloc.cpp b/examples/Shared_Malloc/test_malloc.cpp
index b6143aa989c..ead20c17b63 100644
--- a/examples/Shared_Malloc/test_malloc.cpp
+++ b/examples/Shared_Malloc/test_malloc.cpp
@@ -110,7 +110,7 @@ spawn (void)
 #endif /* ACE_HAS_THREADS */
     }
 #if !defined (ACE_WIN32)
-  else if (ACE_OS::fork (ACE_TEXT_CHAR_TO_TCHAR (Options::instance ()->program_name ())) == 0)
+  else if (ACE_OS::fork (ACE_TEXT_TO_TCHAR_IN (Options::instance ()->program_name ())) == 0)
     {
       if (Options::instance ()->exec_slave ())
         {
diff --git a/examples/Shared_Malloc/test_position_independent_malloc.cpp b/examples/Shared_Malloc/test_position_independent_malloc.cpp
index b4c66e54957..c6d3111e06f 100644
--- a/examples/Shared_Malloc/test_position_independent_malloc.cpp
+++ b/examples/Shared_Malloc/test_position_independent_malloc.cpp
@@ -119,7 +119,7 @@ initialize (TEST_MALLOC *allocator)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("a:T"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("a:T"));
 
   for (int c;
        (c = get_opt ()) != -1;
diff --git a/examples/Synch/proc_sema.cpp b/examples/Synch/proc_sema.cpp
index d9da687ca6a..0c405fa52f7 100644
--- a/examples/Synch/proc_sema.cpp
+++ b/examples/Synch/proc_sema.cpp
@@ -46,7 +46,7 @@ int consumer (ACE_SYNCH_PROCESS_SEMAPHORE &sema,
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("csn:xi:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("csn:xi:d:"));
 
   int is_consumer = 1;          // By default, make us a consumer.
   int delete_sema = 0;
diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp
index 547e4175121..5f26eb583b4 100644
--- a/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp
@@ -16,7 +16,7 @@ ACE_RCSID(SV_Message_Queues, MQ_Client, "$Id$")
 #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM)
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   long pid = long (ACE_OS::getpid ());
   ACE_SV_Message_Queue msgque (SRV_KEY);
diff --git a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp
index 57c7502cabd..a685f2e67f7 100644
--- a/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp
@@ -27,7 +27,7 @@ handler (int)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   long pid = long (ACE_OS::getpid ());
   Message_Block recv_msg (SRV_ID);
diff --git a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
index 02c41602b9f..bda5e1bafa6 100644
--- a/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
+++ b/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp
@@ -29,7 +29,7 @@ handler (int)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   char *username = ACE_OS::cuserid (static_cast<char *> (0));
   Message_Data msg_data ((int) ACE_OS::getpid (), username, "I received your message.");
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp
index 2331ea772ec..581dff8f7f6 100644
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp
+++ b/examples/System_V_IPC/SV_Semaphores/Semaphores_1.cpp
@@ -67,7 +67,7 @@ child (char *shm)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   char *shm = (char *) alloc.malloc (27);
 
diff --git a/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp b/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
index e0ae9cd2bb5..933bd09a3bf 100644
--- a/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
+++ b/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp
@@ -83,7 +83,7 @@ child (char *shm)
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   char *shm = (char *) my_alloc.malloc (27);
 
diff --git a/examples/TMCast/Member/member.cpp b/examples/TMCast/Member/member.cpp
index f89c68564ea..fbbbe6b9f13 100644
--- a/examples/TMCast/Member/member.cpp
+++ b/examples/TMCast/Member/member.cpp
@@ -32,7 +32,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
     ACE_INET_Addr address (argv[3]);
 
-    ACE_TMCast::Group group (address, ACE_TEXT_ALWAYS_CHAR (argv[2]));
+    ACE_TMCast::Group group (address, ACE_TEXT_TO_CHAR_IN (argv[2]));
 
     if (receiver)
     {
diff --git a/examples/Threads/process_manager.cpp b/examples/Threads/process_manager.cpp
index b8c2455b469..7a03afca362 100644
--- a/examples/Threads/process_manager.cpp
+++ b/examples/Threads/process_manager.cpp
@@ -129,7 +129,7 @@ static int exit_code = 0;
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:e:cu"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:e:cu"));
 
   int c;
 
diff --git a/examples/Threads/reader_writer.cpp b/examples/Threads/reader_writer.cpp
index 5344ba4d5b4..b8a523cc827 100644
--- a/examples/Threads/reader_writer.cpp
+++ b/examples/Threads/reader_writer.cpp
@@ -53,7 +53,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("r:w:n:l:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("r:w:n:l:"));
 
   int c;
 
diff --git a/examples/Threads/recursive_mutex.cpp b/examples/Threads/recursive_mutex.cpp
index 3c915682d90..20cec4a7e82 100644
--- a/examples/Threads/recursive_mutex.cpp
+++ b/examples/Threads/recursive_mutex.cpp
@@ -33,7 +33,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:t:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:t:"));
 
   int c;
 
diff --git a/examples/Threads/task_one.cpp b/examples/Threads/task_one.cpp
index ea4fd71dcf8..c2c23306152 100644
--- a/examples/Threads/task_one.cpp
+++ b/examples/Threads/task_one.cpp
@@ -94,7 +94,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
   return 0;
diff --git a/examples/Web_Crawler/Command_Processor.cpp b/examples/Web_Crawler/Command_Processor.cpp
index 9f4141f3c6c..afe234926d3 100644
--- a/examples/Web_Crawler/Command_Processor.cpp
+++ b/examples/Web_Crawler/Command_Processor.cpp
@@ -23,7 +23,7 @@ URL_Command::execute (void)
 {
 
   ACE_CString check_string
-    (ACE_TEXT_ALWAYS_CHAR (this->url_->url_addr ().get_path_name ()));
+    (ACE_TEXT_TO_CHAR_IN (this->url_->url_addr ().get_path_name ()));
   if (check_string.find ("news:") >= 0)
     return 0;
 
diff --git a/examples/Web_Crawler/HTTP_URL.cpp b/examples/Web_Crawler/HTTP_URL.cpp
index 44ceea324d4..351a3a7ac7d 100644
--- a/examples/Web_Crawler/HTTP_URL.cpp
+++ b/examples/Web_Crawler/HTTP_URL.cpp
@@ -43,7 +43,7 @@ HTTP_URL::send_request (void)
 
   ACE_OS::sprintf (cmd_ptr.get (),
                    "GET /%s HTTP/1.1\r\n",
-                   ACE_TEXT_ALWAYS_CHAR (this->url_addr ().get_path_name ()));
+                   ACE_TEXT_TO_CHAR_IN (this->url_addr ().get_path_name ()));
 
   // Send the GET command to the connected server.
   if (this->stream ().send_n (cmd_ptr.get (),
diff --git a/examples/Web_Crawler/Options.cpp b/examples/Web_Crawler/Options.cpp
index 389cbfa0733..b010a3a24ea 100644
--- a/examples/Web_Crawler/Options.cpp
+++ b/examples/Web_Crawler/Options.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(Web_Crawler, Options, "$Id$")
 int 
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("df:h:i:l:rt:u:vo:p:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("df:h:i:l:rt:u:vo:p:"));
 
   ACE_LOG_MSG->open (argv[0]);
 
diff --git a/examples/Web_Crawler/URL_Addr.cpp b/examples/Web_Crawler/URL_Addr.cpp
index 5a630e387fb..b65c5c7ba4a 100644
--- a/examples/Web_Crawler/URL_Addr.cpp
+++ b/examples/Web_Crawler/URL_Addr.cpp
@@ -39,7 +39,7 @@ ACE_URL_Addr::addr_to_string (ACE_TCHAR *s,
   else
     {
       ACE_OS::sprintf (s, ACE_TEXT ("%s:%d/%s"),
-                       ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
+                       ACE_TEXT_TO_TCHAR_IN (ipaddr_format == 0
                                                ? this->get_host_name ()
                                                : this->get_host_addr ()),
                        this->get_port_number (),
@@ -73,7 +73,7 @@ ACE_URL_Addr::addr_to_string (int ipaddr_format) const
     }
   ACE_OS::sprintf (this->addr_string_,
                    ACE_TEXT ("%s:%d/%s"),
-                   ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0
+                   ACE_TEXT_TO_TCHAR_IN (ipaddr_format == 0
                                            ? this->get_host_name ()
                                           : this->get_host_addr ()),
                    this->get_port_number (),
diff --git a/examples/Web_Crawler/URL_Visitor.cpp b/examples/Web_Crawler/URL_Visitor.cpp
index 1422665ffb0..b4cd8138212 100644
--- a/examples/Web_Crawler/URL_Visitor.cpp
+++ b/examples/Web_Crawler/URL_Visitor.cpp
@@ -119,7 +119,7 @@ HTML_Body_Validation_Strategy::execute (void)
   char temp[BUFSIZ + 1];
   ACE_CString prev_location (temp);
 
-  prev_location.set (ACE_TEXT_ALWAYS_CHAR (this->url_.url_addr ().get_path_name ()),
+  prev_location.set (ACE_TEXT_TO_CHAR_IN (this->url_.url_addr ().get_path_name ()),
                      ACE_OS::strlen (this->url_.url_addr ().get_path_name ()),
                      1);
   int index = prev_location.rfind ('/', prev_location.length ());
@@ -164,7 +164,7 @@ HTML_Body_Validation_Strategy::execute (void)
                       ACE_URL_Addr,
                       0);
       Auto_Destroyer<ACE_URL_Addr> url_addr_ptr (url_addr);
-      if (url_addr_ptr->string_to_addr (ACE_TEXT_CHAR_TO_TCHAR (url.c_str ())) == 0)
+      if (url_addr_ptr->string_to_addr (ACE_TEXT_TO_TCHAR_IN (url.c_str ())) == 0)
         {
           HTTP_URL *http_url;
           ACE_NEW_RETURN (http_url,
diff --git a/include/makeinclude/platform_hpux_kcc.GNU b/include/makeinclude/platform_hpux_kcc.GNU
new file mode 100644
index 00000000000..b9f75c2865a
--- /dev/null
+++ b/include/makeinclude/platform_hpux_kcc.GNU
@@ -0,0 +1,123 @@
+# $Id$
+#
+# This is for HP-UX 11.x using the KCC compiler.
+#
+# HP-UX 11 supports both 32-bit and 64-bit builds, regardless of which
+# architecture the build is done on.  This file is set up to build native
+# to the machine it's running on.  To cross-build for another platform, add
+# "buildbits=32" to make a 32-bit build, and "buildbits=64" to do a 64-bit
+# build.  Note that if you explicitly specify a 64-bit build, the option
+#  -Wl,+vnocompatwarnings is added to shut up the "At least one PA 2.0 object
+# file detected..." messages.
+#
+# NOTE: This has only been tested with "buildbits" left as the default.
+#
+
+ifeq (,$(buildbits))
+  buildbits = 0
+endif
+ifeq (,$(debug))
+  debug = 1
+endif
+ifeq (,$(distrib))
+  distrib = 0
+endif
+ifeq (,$(optimize))
+  optimize = 0
+endif
+ifeq (,$(threads))
+  threads = 1
+endif
+
+# The only way we can disable exceptions is to also disable threads
+ifeq ($(threads),1)
+  THR_DEFS   = --thread_safe -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L
+  LDFLAGS    = --thread_safe
+  ARFLAGS    = --thread_safe
+  exceptions = 1
+else
+  THR_DEFS   = -DACE_HAS_THREADS=0
+  LDFLAGS    =
+  ARFLAGS    =
+  ifeq (0,$(exceptions))
+    CCFLAGS += --no_exceptions
+    LDFLAGS += --no_exceptions
+  endif
+endif
+
+
+CC           = cc
+CXX          = KCC
+CCFLAGS     += $(CFLAGS) $(THR_DEFS) -DACE_LACKS_PRAGMA_ONCE --one_instantiation_per_object
+DCFLAGS     += +K0 -g
+DLD          = $(CXX) $(CCFLAGS)
+LD           = $(CXX)
+OCCFLAGS     = +K3 -O
+PIC          = +Z
+LDFLAGS     += -Wl,+s -z
+SOFLAGS      =
+SOEXT        = sl
+
+# Please note that KCC can not replace object files within a
+# static library.  You must rebuild the library with all of the .o's
+# The ar rule will require you to touch all of the object files in .obj,
+# including the ones under .obj/ti_files, to do this.
+AR           = KCC
+ARFLAGS     += -Bstatic -o
+
+# KCC allows suppresion of warnings and errors.
+# Warning #111 statement is unreachable
+CCFLAGS     += --diag_suppress 111
+
+# KCC always uses the standard cpp library
+CCFLAGS     += -DACE_HAS_STANDARD_CPP_LIBRARY=1
+
+#
+# libpthread is automatically linked in by KCC if we use --thread_safe,
+# therefore we do not need to explicitly supply it.
+# If we link statically and libpthread is supplied with $(LIBS), the
+# program will core dump.
+#
+LIBS        += -Bdynamic -lxti -lrt
+
+ifdef static_libs_only
+  ifneq ($(static_libs_only),0)
+    static_libs=1
+  endif
+endif
+# Kind of a hack since LDFLAGS is used for both non-static
+# library generation and binary generation.  LD is only used for
+# binary generation.
+ifneq ($(static_libs),0)
+  CCFLAGS   += --one_instantiation_per_object
+  LD        += -Bstatic
+  # libc is also automatically linked in by KCC, but when we are linking
+  # statically libc must be linked dynamically or gethostbyname does not
+  # function properly.
+  LIBS      += -lc -Bstatic
+endif
+
+#
+# This section has not been tested.
+#
+ifeq ($(distrib),1)
+  ifeq ($(buildbits),32)
+    SOFLAGS += -Wl,-x -Wl,+h/usr/lib/$(@F)
+  endif
+  ifeq ($(buildbits),64)
+    SOFLAGS += -Wl,-x -Wl,+h/usr/lib/pa20_64/$(@F)
+  endif
+endif
+ifeq ($(buildbits),32)
+  CCFLAGS   += +DA1.1 +DS1.1
+else
+  ifeq ($(buildbits),64)
+    CCFLAGS += +DA2.0 +DS2.0
+    LDFLAGS += -Wl,+vnocompatwarnings
+  else
+    CCFLAGS += +DAportable
+  endif
+endif
+
+SONAME		=
+SOVERSION	=
diff --git a/include/makeinclude/platform_irix6.x_kcc.GNU b/include/makeinclude/platform_irix6.x_kcc.GNU
new file mode 100644
index 00000000000..f68058a9cf5
--- /dev/null
+++ b/include/makeinclude/platform_irix6.x_kcc.GNU
@@ -0,0 +1,41 @@
+# $Id$
+
+# Irix 6.x with KCC 3.4d
+
+include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU
+
+# WARNING_FLAGS +=
+# 111: statement is unreachable.    There's a whole bunch of these
+#                                   in the ace code.
+# 280: declaration of a member with the same name as its class
+#                                   Get this from <netinet/in.h>.
+# 608: this pragma must immediately precede a declaration or statement
+#                                   Get this from <ucontext.h>
+WARNING_FLAGS += --diag_suppress 111,280,608
+
+debug = 1
+optimize = 1
+
+CC              = KCC
+CXX             = $(CC)
+CFLAGS          += -n32
+KCCOPTS         = --thread_safe --one_per
+CCFLAGS         += $(CFLAGS) -DNULL=0 $(WARNING_FLAGS) $(KCCOPTS)
+ifeq ($(optimize),1)
+DCFLAGS         += -g
+else
+DCFLAGS         += +K0 -g
+endif
+DLD             = $(CC)
+LD              = $(CC)
+# warning 84: "" is not used for resolving any symbol.
+LDFLAGS         += -n32 -L$(ACE_ROOT)/lib -L. --backend -Wl,-woff,84
+#LIBS            += -lpthread
+OCFLAGS         += +K3 -O2
+PIC             =
+AR              = $(CC)
+ARFLAGS         = $(KCCOPTS) -o
+RANLIB          = @true
+SOFLAGS         += $(CPPFLAGS) $(KCCOPTS) -L$(ACE_ROOT)/lib $(ACELIB)
+SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
+PRELIB          = @true
diff --git a/include/makeinclude/platform_linux_kcc.GNU b/include/makeinclude/platform_linux_kcc.GNU
new file mode 100644
index 00000000000..6b57898c6dd
--- /dev/null
+++ b/include/makeinclude/platform_linux_kcc.GNU
@@ -0,0 +1,72 @@
+# $Id$
+
+# According to Ben Eng <ben@jetpen.com>, this file
+# should allow ACE to be built on Linux using KAI C++ 3.3a.
+#
+# NOTE:  evaluation copies of KCC might include libraries that
+# were compiled with exception handling enabled.  To enable link
+# compatibility with those libraries, you must build ACE with
+# exception handling enabled, as well.  To do that, either set
+# the exceptions macro below to 1, or build with:
+# make exceptions=1
+
+ifeq (,$(debug))
+  debug=0
+endif
+ifeq (,$(optimize))
+  optimize=1
+endif
+ifeq (,$(threads))
+  threads = 1
+endif
+
+CC      = KCC
+CXX     = $(CC)
+CPPFLAGS  += -D_REENTRANT -D_GNU_SOURCE
+
+CCFLAGS += $(CFLAGS) -DNULL=0 --one_instantiation_per_object
+DCFLAGS += +K0 -g
+OCFLAGS += +K3 -O
+DLD     = $(CC)
+LD      = $(CC)
+# Using just -ldl results in a very annoying warning (nm: no symbols),
+# because the prelinker searches for missing templates in the libdl
+# library.  Passing the option directly to the linker fixes the
+# warning.
+LIBS    += -Wl,-ldl
+MATHLIB = -lm
+
+ifeq (,$(exceptions))
+  exceptions=0
+endif # exceptions
+
+ifeq ($(exceptions),0)
+  CCFLAGS += --no_exceptions
+endif # ! exceptions
+
+ifeq ($(threads),1)
+  CFLAGS += --thread_safe
+  LDFLAGS += --thread_safe
+endif # threads
+
+# KCC allows suppresion of warnings and errors.
+# Warning #280 declaration of a member with the same name as its class
+CCFLAGS += --diag_suppress 280
+
+ifdef static_libs_only
+  ifneq ($(static_libs_only),0)
+    static_libs=1
+  endif
+endif
+ifneq ($(static_libs),0)
+  CCFLAGS   += --one_instantiation_per_object
+endif
+
+PIC     = -fPIC
+AR      = $(CC)
+ARFLAGS = $(CCFLAGS) $(CPPFLAGS) -Bstatic -o
+RANLIB  = @true
+SOFLAGS += $(PIC) $(CCFLAGS) $(CPPFLAGS)
+SOBUILD = $(COMPILE.cc) $(SOFLAGS) -o $(VSHDIR)$*.o $<
+PRELIB  = @true
+PRELIB_USES_OBJ_ONLY = 1
diff --git a/include/makeinclude/platform_osf1_4.x_kcc.GNU b/include/makeinclude/platform_osf1_4.x_kcc.GNU
new file mode 100644
index 00000000000..a3a3178239d
--- /dev/null
+++ b/include/makeinclude/platform_osf1_4.x_kcc.GNU
@@ -0,0 +1,65 @@
+# $Id$
+
+# This platform macros file is intended to work with Digital UNIX 4.x
+# (OSF/1 4.x) and KAI C++ 3.3f.
+
+ifeq (,$(debug))
+  debug = 1
+endif
+
+ifeq (,$(exceptions))
+  exceptions = 1
+endif
+
+ifeq (,$(rtti))
+   rtti = 1
+endif
+
+ifeq (,$(threads))
+  threads = 1
+endif
+
+ifeq (,$(optimize))
+  optimize = 1
+endif
+
+# WARNING_FLAGS +=
+#   9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
+#                                   and /usr/include/net/if_types.h
+# 111: statement is unreachable.    There's a whole bunch of these
+#                                   in the ace code.
+WARNING_FLAGS += --display_error_number --diag_suppress 9,111
+
+CC              = KCC
+CXX             = $(CC)
+CFLAGS          += -D_REENTRANT
+KCCOPTS         = --thread_safe --one_per
+CCFLAGS         += $(CFLAGS) -DNULL=0 $(WARNING_FLAGS) $(KCCOPTS)
+ifeq ($(optimize),1)
+DCFLAGS         += -g3
+else
+DCFLAGS         += +K0 -g
+endif
+LD              = $(CC)
+DLD             = $(CC)
+LIBS            += -lpthread -lmach -lexc -lxti  -lrt -lm
+OCFLAGS         += +K3 -O
+PIC             =
+AR              = $(CC)
+ARFLAGS         = $(KCCOPTS) -o
+# When libraries are archived, a hash index is automatically created so there
+# is no need for ranlib
+RANLIB          = /usr/bin/true
+SOFLAGS         += $(CPPFLAGS) $(KCCOPTS) -L$(ACE_ROOT)/lib $(ACELIB) -lc
+
+# With kcc 4, if it does template splitting and ends up with more than
+# a certain number of templates, it can screw up the link command so that
+# the entry point for the program gets set to one of the template
+# instantiations!  This forces the correct entry point.
+LDFLAGS         += --backend -Wl,-e,__start
+
+# Work around kcc overflowing the arg list...
+SHLIBBUILD      = $(AR) $(ARFLAGS) $@-tmp.a $(VSHOBJS1) $(LDFLAGS) $(LIBS); $(filter-out -c,$(COMPILE.cc) $(PIC)) -o $@ -all $@-tmp.a -none $(LDFLAGS) $(LIBS) -lc --COMPO_ln_dy -expect_unresolved --COMPO_ln_dy '*'; rm $@-tmp.a
+
+SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
+PRELIB          = @true
diff --git a/include/makeinclude/platform_sunos5_kcc.GNU b/include/makeinclude/platform_sunos5_kcc.GNU
new file mode 100644
index 00000000000..80554e48bb1
--- /dev/null
+++ b/include/makeinclude/platform_sunos5_kcc.GNU
@@ -0,0 +1,111 @@
+# $Id$  -*- Makefile -*-
+
+# SunOS 5.x (Solaris 2.x) with KAI C++ 3.3e
+
+debug = 1
+distrib = 0
+threads = 1
+exceptions = 1
+
+# I(kitty) don't know anything about this combination. Making it explicit.
+# XXX: Get the flags from the Kai web-site and fill it in.
+templates = explicit
+
+# Turn on the proper flags for explicit template instantiation.
+#
+ifeq ($(templates),explicit)
+  ifeq ($(TEMPLATES_FLAG),) # Turn on flags if none is speficied.
+    TEMPLATES_FLAG=
+  endif
+  CPPFLAGS += -DACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+endif
+
+# These are required for KCC 3.4g compiler.
+LDFLAGS += --one_instantiation_per_object
+CCFLAGS += --one_instantiation_per_object
+
+ifeq ($(threads),1)
+  CFLAGS += --thread_safe
+  LDFLAGS += --thread_safe
+  ARFLAGS = --thread_safe
+else
+  ARFLAGS =
+  CCFLAGS += -DACE_HAS_THREADS=0
+endif # threads
+
+CC              = KCC
+CXX             = KCC
+
+DCFLAGS         += +K0 -g
+DLD             = $(CXX)
+LD              = $(CXX)
+
+ifeq (1,$(exceptions))
+  CCFLAGS += --exceptions
+else
+  CCFLAGS   += --no_exceptions
+  LDFLAGS   += --no_exceptions
+endif
+
+
+
+LIBS        += -Bdynamic -lsocket -lnsl -lgen -ldl -lposix4
+MATHLIB	     = -lm
+CPPFLAGS    += $(CFLAGS)
+OCFLAGS     += +K3 -o
+PIC          = -KPIC
+AR           = KCC
+ARFLAGS     += -Bstatic -o
+RANLIB       = echo
+SOFLAGS      += -G $(CPPFLAGS)
+
+
+ifdef static_libs_only
+  ifneq ($(static_libs_only),0)
+    static_libs=1
+  endif
+endif
+ifneq ($(static_libs),0)
+  CCFLAGS   += --one_instantiation_per_object
+endif
+
+
+
+#### Create template repository to avoid compiler warning.
+TEMPLATE_REPOSITORY = Templates.DB
+
+ifdef CLEANUP_BIN
+  #### Builds .shobj/$*.o file, then .shobj/$*.so file.  The .o files
+  #### are used for building libraries and executables.  But, it seems
+  #### to be necessary to build the .so files (with -G) in order to get
+  #### all template instantiations.
+  SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
+            $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
+else
+  #### Optimize builds when no executables are built in the current
+  #### directory.  Only a library is being created, and -G is used
+  #### in that step.  Therefore, all templates instantations are
+  #### included in the library.  This optimization saves almost 11 Mb
+  #### (2.6 percent) and 27 minutes (22 percent) on the entire ACE
+  #### build on a 168 MHz Sun Ultra2.
+  ####
+  #### Sun C++ won't allow the output from a compile to be named with
+  #### a .so extension.  Rather than muck with the ACE build rules and
+  #### risk upsetting builds on other platforms, just ln the output
+  #### after building it.
+  SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
+                      /bin/ln $(VSHDIR)$*.o $@
+endif # CLEANUP_BIN
+
+#### The following macro overrides enable creation of fast executables.
+#### They _don't_ support fast compilation :-)
+#### To use, add fast=1 to your "make" invocation.
+####
+#### -g is incompatible with -fast.  If you need -g, you can
+#### use "-fast -O3".
+####
+ifeq (1,$(fast))
+  CFLAGS += -fast +K3
+  DCFLAGS =
+  LDFLAGS += -fast +K3
+endif # fast
diff --git a/include/makeinclude/platform_tru64_kcc.GNU b/include/makeinclude/platform_tru64_kcc.GNU
new file mode 100644
index 00000000000..0fe62b9c24d
--- /dev/null
+++ b/include/makeinclude/platform_tru64_kcc.GNU
@@ -0,0 +1,35 @@
+# $Id$
+
+# This platform macros file is intended to work with
+# Digital UNIX using the KAI compiler.
+
+# Include the common macros for all compilers
+#
+include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU
+
+# Include the macro file for osf1_4.x
+#
+include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_kcc.GNU
+
+ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
+  ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION)))
+    # variable "" was declared but never referenced.
+    # Get these from PTHREAD_THIS_CATCH_NP.
+    WARNING_FLAGS += --diag_suppress 177
+  endif # ! 4.0F
+
+else # ! 4.x
+ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
+  # variable "" was declared but never referenced.
+  # Get these from PTHREAD_THIS_CATCH_NP.
+  WARNING_FLAGS += --diag_suppress 177
+
+  # KCC makes a lot of these warnings from the C compiler.
+  WARNING_FLAGS += --backend -msg_disable --backend nonstandcast,missingreturn,uninit1,ptrmismatch
+
+endif # 5.x
+endif # ! 4.x
+
+# Include the common macros for all compilers
+#
+include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU
diff --git a/include/makeinclude/platform_vxworks5.5.x.GNU b/include/makeinclude/platform_vxworks5.5.x.GNU
index df071f82675..aa660e49100 100644
--- a/include/makeinclude/platform_vxworks5.5.x.GNU
+++ b/include/makeinclude/platform_vxworks5.5.x.GNU
@@ -230,7 +230,7 @@ else
 endif
 else
 ifeq ("$(TOOL)","gnu")
-C++FLAGS += -ftemplate-depth-50
+C++FLAGS += -ftemplate-depth-34
 ifeq ($(exceptions),1)
   C++FLAGS += -fexceptions
 else
diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index 0cc05964720..1357af3a6cd 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -407,7 +407,7 @@ Client_Test::set_host (const char *hostname, int port)
 
   this->name_options_->context (ACE_Naming_Context::NET_LOCAL);
   // Set Name Options
-  this->name_options_->nameserver_host (ACE_TEXT_CHAR_TO_TCHAR (hostname));
+  this->name_options_->nameserver_host (ACE_TEXT_TO_TCHAR_IN (hostname));
   this->name_options_->nameserver_port (port);
 
   return NAMING_CONTEXT ()->open (ACE_Naming_Context::NET_LOCAL);
diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
index bfda59cd09f..c3aba7ee354 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
@@ -98,7 +98,7 @@ Dump_Restore::handle_input (ACE_HANDLE)
     case 'h' :
       if (::scanf ("%s %hu", buf1, &port) <= 0)
         break;
-      set_host (ACE_TEXT_CHAR_TO_TCHAR (buf1), port);
+      set_host (ACE_TEXT_TO_TCHAR_IN (buf1), port);
       break;
     case 'F':
     case 'f':
diff --git a/netsvcs/clients/Naming/Dump_Restore/createfile.cpp b/netsvcs/clients/Naming/Dump_Restore/createfile.cpp
index 25bf2fb803c..0e9f08889fc 100644
--- a/netsvcs/clients/Naming/Dump_Restore/createfile.cpp
+++ b/netsvcs/clients/Naming/Dump_Restore/createfile.cpp
@@ -7,7 +7,7 @@
 ACE_RCSID(Dump_Restore, createfile, "$Id$")
 
 int 
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   FILE *infile, *outfile;
   char buf[BUFSIZ];
diff --git a/netsvcs/clients/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp
index 8df0ae625fc..5853c5afd91 100644
--- a/netsvcs/clients/Tokens/collection/collection.cpp
+++ b/netsvcs/clients/Tokens/collection/collection.cpp
@@ -92,7 +92,7 @@ parse_args (int argc, char *argv[])
 {
   ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE);
 
-  ACE_Get_Opt get_opt (argc, argv, "un:dp:h:", 1);
+  ACE_Get_Arg_Opt get_opt (argc, argv, "un:dp:h:", 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -129,7 +129,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) == -1)
     return -1;
@@ -202,7 +202,7 @@ main (int argc, char* argv[])
 
 #else
 int 
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR, 
 		     "threads not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/collection/rw_locks.cpp b/netsvcs/clients/Tokens/collection/rw_locks.cpp
index 2670f99214f..81923e630c4 100644
--- a/netsvcs/clients/Tokens/collection/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/collection/rw_locks.cpp
@@ -74,7 +74,7 @@ parse_args (int argc, char *argv[])
 {
   ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE);
 
-  ACE_Get_Opt get_opt (argc, argv, "t:iun:drR:sp:h:", 1);
+  ACE_Get_Arg_Opt get_opt (argc, argv, "t:iun:drR:sp:h:", 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -127,7 +127,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) == -1)
     return -1;
@@ -165,7 +165,7 @@ main (int argc, char* argv[])
 
 #else
 int 
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR, 
 		     "threads not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
index e1a9d60ccd6..0ca8c13df54 100644
--- a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+++ b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
@@ -170,7 +170,7 @@ parse_args (int argc, char *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, "iuh:rp:n:", 1);
+  ACE_Get_Arg_Opt get_opt (argc, argv, "iuh:rp:n:", 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -317,7 +317,7 @@ rwlock_test (void)
 }
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   if (parse_args (argc, argv) == -1)
     return -1;
@@ -332,7 +332,7 @@ main (int argc, char* argv[])
 }
 #else
 int 
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR, 
 		     "threads not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/invariant/invariant.cpp b/netsvcs/clients/Tokens/invariant/invariant.cpp
index cda1f54f6f7..cc9e643a0e2 100644
--- a/netsvcs/clients/Tokens/invariant/invariant.cpp
+++ b/netsvcs/clients/Tokens/invariant/invariant.cpp
@@ -157,7 +157,7 @@ run_final_test (void)
 }
 
 int
-main (int /* argc */, char* /* argv */ [])
+ACE_TMAIN (int /* argc */, ACE_TCHAR* /* argv */ [])
 {
   ACE_Thread_Manager mgr;
 
@@ -188,7 +188,7 @@ main (int /* argc */, char* /* argv */ [])
 
 #else
 int 
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR, 
 		     "threads not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/manual/manual.cpp b/netsvcs/clients/Tokens/manual/manual.cpp
index d75c2b543b1..f8a5e18a5a1 100644
--- a/netsvcs/clients/Tokens/manual/manual.cpp
+++ b/netsvcs/clients/Tokens/manual/manual.cpp
@@ -103,7 +103,7 @@ STDIN_Token::parse_args (int argc, char *argv[])
 {
   ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR);
 
-  ACE_Get_Opt get_opt (argc, argv, "h:p:diu", 1);
+  ACE_Get_Arg_Opt get_opt (argc, argv, "h:p:diu", 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -349,7 +349,7 @@ STDIN_Token::create_proxy (const char *token, char type)
 }
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   STDIN_Token st;
   return st.open (argc, argv);
@@ -357,7 +357,7 @@ main (int argc, char* argv[])
 
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR,
 		     "threads or ACE_HAS_TOKENS_LIBRARY not supported on this platform\n"), -1);
diff --git a/netsvcs/clients/Tokens/mutex/test_mutex.cpp b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
index 73a33cb6c6e..5697b1aa426 100644
--- a/netsvcs/clients/Tokens/mutex/test_mutex.cpp
+++ b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
@@ -69,7 +69,7 @@ parse_args (int argc, char *argv[])
 {
   ACE_LOG_MSG->open (argv[0]);
 
-  ACE_Get_Opt get_opt (argc, argv, "t:uh:p:n:", 1);
+  ACE_Get_Arg_Opt get_opt (argc, argv, "t:uh:p:n:", 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -107,7 +107,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Thread_Manager thread_mgr;
 
@@ -135,7 +135,7 @@ main (int argc, char *argv[])
   return 0;
 }
 #else
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR, "you must have threads to run this test program\n"), -1);
 }
diff --git a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
index 5d0d95af876..a4d0ddb5ecd 100644
--- a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
@@ -142,7 +142,7 @@ parse_args (int argc, char *argv[])
 {
   ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::STDERR); // | ACE_Log_Msg::VERBOSE);
 
-  ACE_Get_Opt get_opt (argc, argv, "t:iun:dr:sp:h:R", 1);
+  ACE_Get_Arg_Opt get_opt (argc, argv, "t:iun:dr:sp:h:R", 1);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -204,7 +204,7 @@ parse_args (int argc, char *argv[])
 #endif
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   if (parse_args (argc, argv) == -1)
     return -1;
@@ -244,7 +244,7 @@ main (int argc, char* argv[])
 
 #else
 int 
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR_RETURN ((LM_ERROR, 
 		     "threads not supported on this platform\n"), -1);
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 714d9744d68..6e90646b786 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -500,7 +500,7 @@ ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[])
 int
 ACE_Client_Logging_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:k:p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("h:k:p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index 7d085c1c3cc..40c1899a67f 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -34,7 +34,7 @@ ACE_Name_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 
   ACE_LOG_MSG->open (ACE_TEXT ("Name Service"));
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -364,9 +364,9 @@ ACE_Name_Handler::shared_bind (int rebind)
 {
   ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::shared_bind"));
   ACE_NS_WString a_name (this->name_request_.name (),
-                         this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
+                         this->name_request_.name_len () / sizeof (wchar_t));
   ACE_NS_WString a_value (this->name_request_.value (),
-                          this->name_request_.value_len () / sizeof (ACE_WCHAR_T));
+                          this->name_request_.value_len () / sizeof (wchar_t));
   int result;
   if (rebind == 0)
     {
@@ -404,7 +404,7 @@ ACE_Name_Handler::resolve (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for RESOLVE \n")));
 #endif /* 0 */
   ACE_NS_WString a_name (this->name_request_.name (),
-                         this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
+                         this->name_request_.name_len () / sizeof (wchar_t));
 
   // The following will deliver our reply back to client we
   // pre-suppose success (indicated by type RESOLVE).
@@ -413,12 +413,12 @@ ACE_Name_Handler::resolve (void)
   char *atype;
   if (NAMING_CONTEXT::instance ()->resolve (a_name, avalue, atype) == 0)
     {
-      ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> avalue_urep (avalue.rep ());
+      ACE_Auto_Basic_Array_Ptr<wchar_t> avalue_urep (avalue.rep ());
       ACE_Name_Request nrq (ACE_Name_Request::RESOLVE,
                             0,
                             0,
                             avalue_urep.get (),
-                            avalue.length () * sizeof (ACE_WCHAR_T),
+                            avalue.length () * sizeof (wchar_t),
                             atype, ACE_OS::strlen (atype));
       delete[] atype;
       return this->send_request (nrq);
@@ -437,7 +437,7 @@ ACE_Name_Handler::unbind (void)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for UNBIND \n")));
 #endif /* 0 */
   ACE_NS_WString a_name (this->name_request_.name (),
-                         this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
+                         this->name_request_.name_len () / sizeof (wchar_t));
 
   if (NAMING_CONTEXT::instance ()->unbind (a_name) == 0)
     return this->send_reply (0);
@@ -449,10 +449,10 @@ ACE_Name_Request
 ACE_Name_Handler::name_request (ACE_NS_WString *one_name)
 {
   ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::name_request"));
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_name_urep (one_name->rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> one_name_urep (one_name->rep ());
   return ACE_Name_Request (ACE_Name_Request::LIST_NAMES,
                            one_name_urep.get (),
-                           one_name->length () * sizeof (ACE_WCHAR_T),
+                           one_name->length () * sizeof (wchar_t),
                            0, 0,
                            0, 0);
 }
@@ -461,11 +461,11 @@ ACE_Name_Request
 ACE_Name_Handler::value_request (ACE_NS_WString *one_value)
 {
   ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::value_request"));
-  ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T> one_value_urep (one_value->rep ());
+  ACE_Auto_Basic_Array_Ptr<wchar_t> one_value_urep (one_value->rep ());
   return ACE_Name_Request (ACE_Name_Request::LIST_VALUES,
                            0, 0,
                            one_value_urep.get (),
-                           one_value->length () * sizeof (ACE_WCHAR_T),
+                           one_value->length () * sizeof (wchar_t),
                            0, 0);
 }
 
@@ -487,7 +487,7 @@ ACE_Name_Handler::lists (void)
 
   ACE_PWSTRING_SET set;
   ACE_NS_WString pattern (this->name_request_.name (),
-                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
+                          this->name_request_.name_len () / sizeof (wchar_t));
 
   // Get the index into the list table
   int index = ACE_LIST_MAP (this->name_request_.msg_type (),
@@ -537,7 +537,7 @@ ACE_Name_Handler::lists_entries (void)
   ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::lists_entries"));
   ACE_BINDING_SET set;
   ACE_NS_WString pattern (this->name_request_.name (),
-                          this->name_request_.name_len () / sizeof (ACE_WCHAR_T));
+                          this->name_request_.name_len () / sizeof (wchar_t));
 
   int result = -1;
 
@@ -586,15 +586,15 @@ ACE_Name_Handler::lists_entries (void)
            set_iterator.next (one_entry) !=0;
            set_iterator.advance())
         {
-           ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T>
+           ACE_Auto_Basic_Array_Ptr<wchar_t>
              name_urep (one_entry->name_.rep ());
-           ACE_Auto_Basic_Array_Ptr<ACE_WCHAR_T>
+           ACE_Auto_Basic_Array_Ptr<wchar_t>
              value_urep (one_entry->value_.rep ());
            ACE_Name_Request mynrq (this->name_request_.msg_type (),
                                   name_urep.get (),
-                                  one_entry->name_.length () * sizeof (ACE_WCHAR_T),
+                                  one_entry->name_.length () * sizeof (wchar_t),
                                   value_urep.get (),
-                                  one_entry->value_.length () * sizeof (ACE_WCHAR_T),
+                                  one_entry->value_.length () * sizeof (wchar_t),
                                   one_entry->type_,
                                   ACE_OS::strlen (one_entry->type_));
 
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index aca7492c985..e65769994cf 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -163,10 +163,10 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::op
 
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
   this->receiver_.m_ =
-    ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ()));
+    ACE_TString (ACE_TEXT_TO_TCHAR_IN (client_addr.get_host_name ()));
 #else
   this->host_name_ =
-    ACE_TString (ACE_TEXT_CHAR_TO_TCHAR (client_addr.get_host_name ()));
+    ACE_TString (ACE_TEXT_TO_TCHAR_IN (client_addr.get_host_name ()));
 #endif /* ! ACE_HAS_BROKEN_HPUX_TEMPLATES && ! __GNUG__ */
 
   ACE_DEBUG ((LM_DEBUG,
@@ -249,7 +249,7 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, ACE_TCHAR *a
 
   ACE_LOG_MSG->open (ACE_TEXT ("Logging Service"));
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp
index 221ee1690fa..572c56af965 100644
--- a/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -568,7 +568,7 @@ ACE_TS_Clerk_Processor::parse_args (int argc, ACE_TCHAR *argv[])
   ACE_INET_Addr server_addr;
   ACE_TS_Clerk_Handler *handler;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("h:t:p:b"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("h:t:p:b"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp
index cdc78b1d3bd..9e7cd78ea4c 100644
--- a/netsvcs/lib/TS_Server_Handler.cpp
+++ b/netsvcs/lib/TS_Server_Handler.cpp
@@ -20,7 +20,7 @@ ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 
   ACE_LOG_MSG->open (ACE_TEXT ("Time Service"));
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp
index 806f91c52c5..885ec72d52a 100644
--- a/netsvcs/lib/Token_Handler.cpp
+++ b/netsvcs/lib/Token_Handler.cpp
@@ -23,7 +23,7 @@ ACE_Token_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 
   ACE_LOG_MSG->open (ACE_TEXT ("Token Service"));
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0);
+  ACE_Get_Arg_Opt get_opt (argc, argv, "p:", 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
diff --git a/performance-tests/Misc/basic_perf.cpp b/performance-tests/Misc/basic_perf.cpp
index d084e84e1b2..0aa04d3b007 100644
--- a/performance-tests/Misc/basic_perf.cpp
+++ b/performance-tests/Misc/basic_perf.cpp
@@ -498,7 +498,7 @@ static
 unsigned int
 get_options (int argc, ACE_TCHAR *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:?"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:?"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
diff --git a/performance-tests/Misc/childbirth_time.cpp b/performance-tests/Misc/childbirth_time.cpp
index 739d676a5fb..b497ab004d1 100644
--- a/performance-tests/Misc/childbirth_time.cpp
+++ b/performance-tests/Misc/childbirth_time.cpp
@@ -336,7 +336,7 @@ prof_mutex_base (size_t iteration)
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:l:pftahmxe"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:l:pftahmxe"));
   int c;
   size_t iteration = 10;
   Profiler profiler = 0;
diff --git a/performance-tests/Misc/context_switch_time.cpp b/performance-tests/Misc/context_switch_time.cpp
index 084d85eaca6..a14f918bc93 100644
--- a/performance-tests/Misc/context_switch_time.cpp
+++ b/performance-tests/Misc/context_switch_time.cpp
@@ -1085,7 +1085,7 @@ static
 u_int
 get_options (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("c:n?"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("c:n?"));
   int opt;
   while ((opt = get_opt ()) != EOF) {
     switch (opt) {
@@ -1307,7 +1307,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
   return 0;
diff --git a/performance-tests/Misc/preempt.cpp b/performance-tests/Misc/preempt.cpp
index 56a961031e8..2c68e817385 100644
--- a/performance-tests/Misc/preempt.cpp
+++ b/performance-tests/Misc/preempt.cpp
@@ -293,7 +293,7 @@ Low_Priority_Task::svc (void)
 static int
 get_options (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("fh:l:n:p:y?"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("fh:l:n:p:y?"));
   int opt;
   while ((opt = get_opt ()) != EOF) {
     switch (opt) {
diff --git a/performance-tests/Misc/test_guard.cpp b/performance-tests/Misc/test_guard.cpp
index 507f22bfff7..7d2707d3e58 100644
--- a/performance-tests/Misc/test_guard.cpp
+++ b/performance-tests/Misc/test_guard.cpp
@@ -50,10 +50,10 @@ char *test_name[TEST_END] = { "ACE_Guard", "ACE_Thread_Mutex_Guard" };
 guard_func test_function=guard;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Profile_Timer timer;
-  ACE_Get_Opt getopt (argc, argv, "gtn:");
+  ACE_Get_Arg_Opt getopt (argc, argv, "gtn:");
   int iterations = DEFAULT_ITERATIONS;
   int c, i;
 
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
 }
 #else
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
   return 0;
diff --git a/performance-tests/RPC/client.cpp b/performance-tests/RPC/client.cpp
index b0f4a476600..ef85b9fa559 100644
--- a/performance-tests/RPC/client.cpp
+++ b/performance-tests/RPC/client.cpp
@@ -7,13 +7,13 @@
 
 #include "ping.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   const char* host = 0;
   int nsamples = 10000;
   int c;
 
-  ACE_Get_Opt getopt (argc, argv, "h:i:");
+  ACE_Get_Arg_Opt getopt (argc, argv, "h:i:");
 
   while ((c = getopt ()) != -1)
     {
diff --git a/performance-tests/SCTP/Options_Manager.cpp b/performance-tests/SCTP/Options_Manager.cpp
index 6d28a393fdf..dcf3f740072 100644
--- a/performance-tests/SCTP/Options_Manager.cpp
+++ b/performance-tests/SCTP/Options_Manager.cpp
@@ -67,45 +67,45 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
       __program_name[Options_Manager::string_len - 1] = '\0';
     }
 
-    // Declare options with ACE_Get_Opt
+    // Declare options with ACE_Get_Arg_Opt
     int c;
-    ACE_Get_Opt * get_opt = 0;
+    ACE_Get_Arg_Opt<ACE_TCHAR> * get_opt = 0;
     if (!ACE_OS::strcmp(ACE_TEXT ("client-opts"), opts_set)){
-      get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h"));
+      get_opt = new ACE_Get_Arg_Opt<ACE_TCHAR>(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h"));
 
       get_opt->long_option (ACE_TEXT ("test_iterations"),         'c',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("test_enable_nagle"),       'n');
       get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("histogram_min_bin"),       'm',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("histogram_max_bin"),       'M',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("histogram_num_outliers"),  'x',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("histogram_bin_count"),     'b',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("client_port"),             'C',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("client_accept_addr"),      'i',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("server_port"),             'p',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("server_host"),             'H',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("payload_size_power_of_2"), 's',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("help"),                    'h');
     } else if (!ACE_OS::strcmp (ACE_TEXT ("server-opts"), opts_set)){
-      get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("nt:p:a:u"));
+      get_opt = new ACE_Get_Arg_Opt<ACE_TCHAR>(argc, argv, ACE_TEXT("nt:p:a:u"));
       get_opt->long_option (ACE_TEXT ("test_enable_nagle"),       'n');
       get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("server_port"),             'p',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("server_accept_addr"),      'a',
-                            ACE_Get_Opt::ARG_REQUIRED);
+                            ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
       get_opt->long_option (ACE_TEXT ("help"),                    'h');
     } else {
       _error = 1;
@@ -114,7 +114,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
       return;
     }
 
-    // Parse options with ACE_Get_Opt
+    // Parse options with ACE_Get_Arg_Opt
     while ((c = (*get_opt)()) != -1)
       {
         switch ((char) c)
@@ -173,7 +173,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
             // Obtain the 32-bit, host-byte-order representation of
             // the primary address.
             struct in_addr foo;
-            int aton_retval = ACE_OS::inet_aton(ACE_TEXT_ALWAYS_CHAR (str),
+            int aton_retval = ACE_OS::inet_aton(ACE_TEXT_TO_CHAR_IN (str),
                                                 &foo);
 
             // If this representation was not obtained, terminate with
@@ -231,7 +231,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
               // Obtain the 32-bit, host-byte-order representation of
               // a secondary address.
               aton_retval =
-                ACE_OS::inet_aton(ACE_TEXT_ALWAYS_CHAR (next_secondary_addr),
+                ACE_OS::inet_aton(ACE_TEXT_TO_CHAR_IN (next_secondary_addr),
                                   &foo);
 
               // If the representation was obtained without error,
@@ -290,7 +290,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
             // Obtain the 32-bit, host-byte-order representation of
             // the primary address.
             struct in_addr foo;
-            int aton_retval = ACE_OS::inet_aton (ACE_TEXT_ALWAYS_CHAR (str),
+            int aton_retval = ACE_OS::inet_aton (ACE_TEXT_TO_CHAR_IN (str),
                                                  &foo);
 
             // If this representation was not obtained, terminate with
@@ -348,7 +348,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
               // Obtain the 32-bit, host-byte-order representation of
               // a secondary address.
               aton_retval =
-                ACE_OS::inet_aton (ACE_TEXT_ALWAYS_CHAR (next_secondary_addr),
+                ACE_OS::inet_aton (ACE_TEXT_TO_CHAR_IN (next_secondary_addr),
                                    &foo);
 
               // If the representation was obtained without error,
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
index 7f98883bfad..9dd12ef4a72 100644
--- a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
+++ b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
@@ -61,7 +61,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
   // check that valid options were specified
   if (optsMgr._error) {
-    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
+    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message));
     return 1;
   }
 
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
index 84db9afc541..7677c317ed6 100644
--- a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
+++ b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
@@ -231,7 +231,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
   // check that valid options were specified
   if (optsMgr._error) {
-    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
+    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message));
     return 1;
   }
 
diff --git a/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/performance-tests/SCTP/SOCK_STREAM_clt.cpp
index 365890265b1..f98836bedfb 100644
--- a/performance-tests/SCTP/SOCK_STREAM_clt.cpp
+++ b/performance-tests/SCTP/SOCK_STREAM_clt.cpp
@@ -65,7 +65,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
   // check that valid options were specified
   if (optsMgr._error) {
-    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
+    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message));
     return 1;
   }
 
diff --git a/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/performance-tests/SCTP/SOCK_STREAM_srv.cpp
index c2d3cceb1fc..c3bb001f2db 100644
--- a/performance-tests/SCTP/SOCK_STREAM_srv.cpp
+++ b/performance-tests/SCTP/SOCK_STREAM_srv.cpp
@@ -244,7 +244,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
 
   // check that valid options were specified
   if (optsMgr._error) {
-    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
+    ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message));
     return 1;
   }
 
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
index 59b6844836a..b081ff9b4d3 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
+++ b/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp
@@ -246,7 +246,7 @@ Leader_Follower_Task::svc (void)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:t:d:s:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:t:d:s:"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
index 5703ff2a1af..5ba6738013d 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
+++ b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
@@ -192,7 +192,7 @@ Leader_Follower_Task::svc (void)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
index 7f90fc62012..098407be216 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
@@ -396,7 +396,7 @@ Output_Task::put (ACE_Message_Block *mb, ACE_Time_Value *)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:s:t:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:s:t:d:"));
   int c;
 
   while ((c = get_opt ()) != -1)
@@ -577,7 +577,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 #else /*ACE_HAS_THREADS*/
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Not supported in single threaded builds \n"));
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
index 5bb58d42397..c6ad34f828d 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
@@ -235,7 +235,7 @@ IO_Task::svc (void)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
index ed2703e7401..256ad60b902 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
@@ -40,7 +40,7 @@ Baseline_Test_Base::init (int argc, ACE_TCHAR *argv[])
 int
 Baseline_Test_Base::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("i:ylrw"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("i:ylrw"), 0);
   int c;
 
   while ((c = getopt ()) != -1)
@@ -102,7 +102,7 @@ Baseline_Test_Options::Baseline_Test_Options (void)
 int
 Baseline_Test_Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("tv"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("tv"), 0);
   int c;
 
   while ((c = getopt ()) != -1)
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
index d2f5305de07..9a5dfdf354f 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
@@ -74,7 +74,7 @@ Performance_Test_Options::Performance_Test_Options (void)
 void
 Performance_Test_Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("a:A:bBc:C:dDe:F:g:H:i:L:l:M:m:n:Np:P:s:S:t:T:uvX:Z:"), 0);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("a:A:bBc:C:dDe:F:g:H:i:L:l:M:m:n:Np:P:s:S:t:T:uvX:Z:"), 0);
   int c;
 
   while ((c = get_opt ()) != -1)
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
index e1824f3d4ac..429bd97a031 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
@@ -37,7 +37,7 @@ ACE_Thread_Mutex Guard_Test::mutex_;
 int
 Guard_Test::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("gt"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("gt"));
   int c;
 
   while ((c = getopt()) != -1)
diff --git a/performance-tests/TCP/tcp_test.cpp b/performance-tests/TCP/tcp_test.cpp
index 182914e14b7..a08f475e62f 100644
--- a/performance-tests/TCP/tcp_test.cpp
+++ b/performance-tests/TCP/tcp_test.cpp
@@ -528,7 +528,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
 
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("hxwvb:I:p:sci:m:at:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("hxwvb:I:p:sci:m:at:"));
 
   while ((c = getopt ()) != -1)
     {
@@ -655,7 +655,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       if (remote_addr.set (dstport,
                            (ACE_UINT32) ACE_OS::inet_addr
-                           (ACE_TEXT_ALWAYS_CHAR(argv[getopt.opt_ind ()]))) == -1)
+                           (ACE_TEXT_TO_CHAR_IN(argv[getopt.opt_ind ()]))) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "invalid IP address: %s\n",
                            argv[getopt.opt_ind ()]),
diff --git a/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp b/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
index 975048a4a7e..27d66a906b6 100644
--- a/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
+++ b/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
@@ -216,7 +216,7 @@ char *title = 0;
 int new_line = 0;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_SOCK_Stream connection_stream;
   int c;
diff --git a/performance-tests/TTCP/C/new-ttcp.cpp b/performance-tests/TTCP/C/new-ttcp.cpp
index a897f5b39a3..997d44063fa 100644
--- a/performance-tests/TTCP/C/new-ttcp.cpp
+++ b/performance-tests/TTCP/C/new-ttcp.cpp
@@ -215,7 +215,7 @@ char *title = 0;
 int new_line = 0;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_SOCK_Stream connection_stream;
   unsigned long addr_tmp;
diff --git a/performance-tests/UDP/udp_test.cpp b/performance-tests/UDP/udp_test.cpp
index 449c998f3ae..1d3b773061a 100644
--- a/performance-tests/UDP/udp_test.cpp
+++ b/performance-tests/UDP/udp_test.cpp
@@ -609,7 +609,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   cmd = argv;
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("x:w:f:vs:I:p:rtn:b:a"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT("x:w:f:vs:I:p:rtn:b:a"));
 
   while ((c = getopt ()) != -1)
     {
@@ -725,7 +725,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           if (remote_addr.set (dstport,
                                (ACE_UINT32) ACE_OS::inet_addr
-                                 (ACE_TEXT_ALWAYS_CHAR(argv[getopt.opt_ind ()]))) == -1)
+                                 (ACE_TEXT_TO_CHAR_IN(argv[getopt.opt_ind ()]))) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "invalid IP address: %s\n",
                                argv[getopt.opt_ind ()]),
diff --git a/protocols/ace/HTBP/HTBP_Addr.cpp b/protocols/ace/HTBP/HTBP_Addr.cpp
index aff894e80dc..1ee03ce991d 100644
--- a/protocols/ace/HTBP/HTBP_Addr.cpp
+++ b/protocols/ace/HTBP/HTBP_Addr.cpp
@@ -76,7 +76,7 @@ ACE::HTBP::Addr::addr_to_string (ACE_TCHAR buffer[],
   if (size < htid_.length())
     return -1;
   ACE_OS::strncpy (buffer,
-                   ACE_TEXT_CHAR_TO_TCHAR(htid_.c_str()),
+                   ACE_TEXT_TO_TCHAR_IN(htid_.c_str()),
                    size);
   return 0;
 }
diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
index d46b16d0e3b..85e2931c0ec 100644
--- a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
+++ b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
@@ -83,7 +83,7 @@ ACE::HTBP::ID_Requestor::send_request (ACE_SOCK_Stream *cli_stream)
   char *buffer;
   ACE_NEW_RETURN (buffer, char[this->url_.length()+16],-1);
   ACE_OS::sprintf (buffer,"GET %s HTTP/1.0\n\n",
-                   ACE_TEXT_ALWAYS_CHAR(url_.c_str()));
+                   ACE_TEXT_TO_CHAR_IN(url_.c_str()));
   int result = cli_stream->send_n (buffer,ACE_OS::strlen(buffer));
   delete [] buffer;
   if (result == -1)
@@ -114,7 +114,7 @@ ACE::HTBP::ID_Requestor::get_HTID ()
       ACE_Utils::UUID_Generator gen;
       ACE_Utils::UUID *uuid = gen.generateUUID ();
       const ACE_CString *uuidstr = uuid->to_string();
-      ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_CHAR_TO_TCHAR (uuidstr->c_str());
+      ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_TO_TCHAR_IN (uuidstr->c_str());
       delete uuid;
       return ACE::HTBP::ID_Requestor::htid_.rep();
     }
@@ -130,7 +130,7 @@ ACE::HTBP::ID_Requestor::get_HTID ()
         start = 0;
       else
         start++;
-      ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_CHAR_TO_TCHAR(answer.substr (start).c_str());
+      ACE::HTBP::ID_Requestor::htid_ = ACE_TEXT_TO_TCHAR_IN(answer.substr (start).c_str());
       htid = ACE::HTBP::ID_Requestor::htid_.rep();
     }
   return htid;
diff --git a/protocols/ace/HTBP/HTBP_Session.cpp b/protocols/ace/HTBP/HTBP_Session.cpp
index f2bae3fde73..37e7258f3b7 100644
--- a/protocols/ace/HTBP/HTBP_Session.cpp
+++ b/protocols/ace/HTBP/HTBP_Session.cpp
@@ -70,7 +70,7 @@ ACE::HTBP::Session::Session (void)
 {
   ACE::HTBP::ID_Requestor req;
   ACE_TCHAR * htid = req.get_HTID();
-  session_id_.local_ = ACE_TEXT_ALWAYS_CHAR(htid);
+  session_id_.local_ = ACE_TEXT_TO_CHAR_IN(htid);
   delete[] htid;
   session_id_.id_ = ACE::HTBP::Session::next_session_id();
   ACE_NEW (inbound_, ACE::HTBP::Channel (this));
diff --git a/protocols/ace/RMCast/Makefile.am b/protocols/ace/RMCast/Makefile.am
index cfc1c88914b..1a121915c62 100644
--- a/protocols/ace/RMCast/Makefile.am
+++ b/protocols/ace/RMCast/Makefile.am
@@ -35,7 +35,8 @@ libACE_RMCast_la_SOURCES = \
   Retransmit.cpp \
   Simulator.cpp \
   Socket.cpp \
-  Stack.cpp
+  Stack.cpp \
+  Template_Instantiations.cpp
 
 libACE_RMCast_la_LDFLAGS = \
  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
diff --git a/protocols/ace/RMCast/Template_Instantiations.cpp b/protocols/ace/RMCast/Template_Instantiations.cpp
new file mode 100644
index 00000000000..262a8e5b36a
--- /dev/null
+++ b/protocols/ace/RMCast/Template_Instantiations.cpp
@@ -0,0 +1,128 @@
+// $Id$
+
+// Note: this file is here only until support for explicit template
+// instantiations is removed from ACE, after ACE 5.5 is released.
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# include "ace/Array_Base.h"
+# include "ace/Condition_T.h"
+# include "ace/Functor_T.h"
+# include "ace/Hash_Map_Manager.h"
+# include "ace/INET_Addr.h"
+# include "ace/Refcounted_Auto_Ptr.h"
+# include "ace/Thread_Mutex.h"
+# include "ace/Unbounded_Queue.h"
+# include "ace/Vector_T.h"
+
+# include "Acknowledge.h"
+# include "Protocol.h"
+# include "Retransmit.h"
+
+#endif
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Array_Base<unsigned char>;
+template class ACE_Array_Base<ACE_RMCast::u64>;
+template class ACE_Array_Base<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Array_Base<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Condition<ACE_Thread_Mutex>;
+template class ACE_Equal_To<ACE_INET_Addr>;
+template class ACE_Hash_Map_Const_Iterator_Base_Ex<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Hash<unsigned short>, ACE_Equal_To<unsigned short>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Const_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Const_Iterator_Base_Ex<ACE_INET_Addr, ACE_RMCast::u64, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr>;
+template class ACE_Hash_Map_Entry<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr>;
+template class ACE_Hash_Map_Entry<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex> >;
+template class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_RMCast::u64>;
+template class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex> >;
+template class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue>;
+template class ACE_Hash_Map_Manager<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex>, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_RMCast::u64, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Hash<unsigned short>, ACE_Equal_To<unsigned short>, ACE_Null_Mutex>;
+template class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::NAK, ACE_Thread_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::NRTM, ACE_Thread_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>;
+template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Vector<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Vector<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+template class ACE_Vector<unsigned char>;
+template class ACE_Vector<ACE_RMCast::u64>;
+template class ACE_Vector_Iterator<unsigned char>;
+template class ACE_Vector_Iterator<ACE_RMCast::u64>;
+template class ACE_Vector_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >;
+template class ACE_Vector_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate class ACE_Array_Base<unsigned char>
+# pragma instantiate class ACE_Array_Base<ACE_RMCast::u64>
+# pragma instantiate class ACE_Array_Base<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Array_Base<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Condition<ACE_Thread_Mutex>
+# pragma instantiate class ACE_Equal_To<ACE_INET_Addr>
+# pragma instantiate class ACE_Hash_Map_Const_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Const_Iterator_Base_Ex<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Hash<unsigned short>, ACE_Equal_To<unsigned short>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Const_Iterator_Base_Ex<ACE_INET_Addr, ACE_RMCast::u64, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Iterator_Base_Ex<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr>
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr>
+# pragma instantiate class ACE_Hash_Map_Entry<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_RMCast::u64>
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue>
+# pragma instantiate class ACE_Hash_Map_Manager<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex>, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_RMCast::Acknowledge::Queue, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_RMCast::u64, ACE_RMCast::AddressHasher, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_RMCast::u64, ACE_RMCast::Acknowledge::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<ACE_RMCast::u64, ACE_RMCast::Retransmit::Descr, ACE_Hash<ACE_RMCast::u64>, ACE_Equal_To<ACE_RMCast::u64>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Hash_Map_Manager_Ex<unsigned short, ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>, ACE_Hash<unsigned short>, ACE_Equal_To<unsigned short>, ACE_Null_Mutex>
+# pragma instantiate class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Data, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::NAK, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::NRTM, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_RMCast::Profile, ACE_Thread_Mutex>
+# pragma instantiate class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Vector<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Vector<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+# pragma instantiate class ACE_Vector<unsigned char>
+# pragma instantiate class ACE_Vector<ACE_RMCast::u64>
+# pragma instantiate class ACE_Vector_Iterator<unsigned char>
+# pragma instantiate class ACE_Vector_Iterator<ACE_RMCast::u64>
+# pragma instantiate class ACE_Vector_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Null_Mutex> >
+# pragma instantiate class ACE_Vector_Iterator<ACE_Refcounted_Auto_Ptr<ACE_RMCast::Message, ACE_Thread_Mutex> >
+
+#elif defined (__HP_aCC)
+// Make aC++ stop complaining about an empty translation unit
+static int shut_up_aCC = 0;
+#endif
diff --git a/protocols/ace/TMCast/Group.cpp b/protocols/ace/TMCast/Group.cpp
index 1f2b2a60dfd..29187838a85 100644
--- a/protocols/ace/TMCast/Group.cpp
+++ b/protocols/ace/TMCast/Group.cpp
@@ -504,3 +504,8 @@ namespace ACE_TMCast
   }
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Condition<ACE_Thread_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Condition<ACE_Thread_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/protocols/ace/TMCast/MTQueue.cpp b/protocols/ace/TMCast/MTQueue.cpp
index 9f08db5843d..32d10eb23b7 100644
--- a/protocols/ace/TMCast/MTQueue.cpp
+++ b/protocols/ace/TMCast/MTQueue.cpp
@@ -5,3 +5,20 @@
 #include "LinkListener.hpp"
 #include "MTQueue.hpp"
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >;
+template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >;
+template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >;
+template class ACE_Node<ACE_Condition<ACE_Thread_Mutex>* >;
+template class ACE_Unbounded_Set<ACE_Condition<ACE_Thread_Mutex>* >;
+template class ACE_Unbounded_Set_Iterator<ACE_Condition<ACE_Thread_Mutex> *>;
+template class ACE_Unbounded_Set_Const_Iterator<ACE_Condition<ACE_Thread_Mutex> *>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Node<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >
+#pragma instantiate ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >
+#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message,ACE_Null_Mutex> >
+#pragma instantiate ACE_Node<ACE_Condition<ACE_Thread_Mutex> *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Condition<ACE_Thread_Mutex> *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Condition<ACE_Thread_Mutex> *>
+#pragma instantiate ACE_Unbounded_Set_Const_Iterator<ACE_Condition<ACE_Thread_Mutex> *>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/protocols/ace/TMCast/Makefile.am b/protocols/ace/TMCast/Makefile.am
index 3a1f1e54ea9..3338e4a8f64 100644
--- a/protocols/ace/TMCast/Makefile.am
+++ b/protocols/ace/TMCast/Makefile.am
@@ -25,7 +25,8 @@ libACE_TMCast_la_CPPFLAGS = \
 libACE_TMCast_la_SOURCES = \
   Group.cpp \
   MTQueue.cpp \
-  Protocol.cpp
+  Protocol.cpp \
+  Template_Instantiations.cpp
 
 libACE_TMCast_la_LDFLAGS = \
  -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@
diff --git a/protocols/ace/TMCast/Template_Instantiations.cpp b/protocols/ace/TMCast/Template_Instantiations.cpp
new file mode 100644
index 00000000000..62e9b24a8bc
--- /dev/null
+++ b/protocols/ace/TMCast/Template_Instantiations.cpp
@@ -0,0 +1,31 @@
+// $Id$
+
+// Note: this file is here only until support for explicit template
+// instantiations is removed from ACE, after ACE 5.5 is released.
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# include "ace/Null_Mutex.h"
+# include "ace/Refcounted_Auto_Ptr.h"
+
+# include "TransactionController.hpp"
+
+#endif
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message, ACE_Null_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Recv, ACE_Null_Mutex>;
+template class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Send, ACE_Null_Mutex>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Message, ACE_Null_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Recv, ACE_Null_Mutex>
+# pragma instantiate class ACE_Refcounted_Auto_Ptr<ACE_TMCast::Send, ACE_Null_Mutex>
+
+#elif defined (__HP_aCC)
+// Make aC++ stop complaining about an empty translation unit
+static int shut_up_aCC = 0;
+#endif
diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp
index 64d77320e07..ee783ca7704 100644
--- a/tests/ACE_Init_Test.cpp
+++ b/tests/ACE_Init_Test.cpp
@@ -79,7 +79,7 @@ CACE_Init_TestApp theApp;
 
 BOOL CACE_Init_TestApp::InitInstance()
 {
-  // This is needed because there's no overridden main(int, char *[])
+  // This is needed because there's no overridden ACE_TMAIN(int, ACE_TCHAR *[])
   // which would normally handle the initialization.  Also see the
   // corresponding ACE::fini, below.
   ACE::init();
diff --git a/tests/ACE_Init_Test.rc b/tests/ACE_Init_Test.rc
index 647f04a1ba6..c6ab2e54233 100644
--- a/tests/ACE_Init_Test.rc
+++ b/tests/ACE_Init_Test.rc
@@ -7,6 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
+#include "afxres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -15,6 +16,10 @@
 // English (U.S.) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -22,18 +27,18 @@
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
     "#define _AFX_NO_OLE_RESOURCES\r\n"
@@ -46,6 +51,7 @@ BEGIN
     "#pragma code_page(1252)\r\n"
     "#endif\r\n"
     "#include ""res\\ACE_Init_Test.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\0"
 END
 
@@ -66,9 +72,8 @@ IDR_MAINFRAME           ICON    DISCARDABLE     "ACE_Init_Test.ico"
 // Dialog
 //
 
-#ifdef APSTUDIO_INVOKED
 IDD_ACE_INIT_TEST_DIALOG DIALOGEX 0, 0, 185, 92
-STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "ACE_Init_Test"
 FONT 8, "MS Sans Serif"
@@ -78,7 +83,6 @@ BEGIN
     LTEXT           "This box will auto-dismiss.",IDC_STATIC,13,7,113,
                     8
 END
-#endif    // APSTUDIO_INVOKED
 
 
 #ifndef _MAC
@@ -130,7 +134,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO DISCARDABLE 
 BEGIN
     IDD_ACE_INIT_TEST_DIALOG, DIALOG
     BEGIN
@@ -163,6 +167,7 @@ LANGUAGE 9, 1
 #pragma code_page(1252)
 #endif
 #include "ACE_Init_Test.rc2"  // non-Microsoft Visual C++ edited resources
+#include "afxres.rc"         // Standard components
 #endif
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
diff --git a/tests/ARGV_Test.cpp b/tests/ARGV_Test.cpp
index bb06c6b8d31..a2eb057d5d4 100644
--- a/tests/ARGV_Test.cpp
+++ b/tests/ARGV_Test.cpp
@@ -70,7 +70,7 @@ test_argv_type_converter (void)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT (" (%d) %s\n"),
                   i,
-                  ACE_TEXT_CHAR_TO_TCHAR (argv[i])));
+                  ACE_TEXT_TO_TCHAR_IN (argv[i])));
   }
 
   for (size_t i = 0; save_argv[i]; ++i) 
diff --git a/tests/Array_Map_Test.cpp b/tests/Array_Map_Test.cpp
index 7b5c1842c8d..791f7280631 100644
--- a/tests/Array_Map_Test.cpp
+++ b/tests/Array_Map_Test.cpp
@@ -13,6 +13,21 @@
 
 #include "test_config.h"
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+int
+run_main (int, ACE_TCHAR *[])
+{
+  ACE_START_TEST (ACE_TEXT ("Array_Map_Test"));
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("This test requires implicit templates\n")));
+  ACE_END_TEST;
+
+  return 0;
+}
+
+#else
+
 #include "ace/SString.h"
 #include "ace/Array_Map.h"
 
@@ -483,3 +498,4 @@ run_main (int, ACE_TCHAR *[])
   return (success ? 0 : -1);
 }
 
+#endif /* Requires explicit instantiation */
diff --git a/tests/Atomic_Op_Test.cpp b/tests/Atomic_Op_Test.cpp
index 310c12aa89e..c3c41bbff24 100644
--- a/tests/Atomic_Op_Test.cpp
+++ b/tests/Atomic_Op_Test.cpp
@@ -201,6 +201,14 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Auto_Event_Test.cpp b/tests/Auto_Event_Test.cpp
index a31b8a9f6a1..b507e70f259 100644
--- a/tests/Auto_Event_Test.cpp
+++ b/tests/Auto_Event_Test.cpp
@@ -114,7 +114,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:n:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("w:n:"));
 
   int c;
 
diff --git a/tests/Auto_IncDec_Test.cpp b/tests/Auto_IncDec_Test.cpp
index 3308a35445b..6d889d6ed06 100644
--- a/tests/Auto_IncDec_Test.cpp
+++ b/tests/Auto_IncDec_Test.cpp
@@ -66,6 +66,22 @@ worker (void *)
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+template class ACE_Auto_IncDec<ACE_Atomic_Op<ACE_Thread_Mutex, int> >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Auto_IncDec<ACE_Atomic_Op<ACE_Thread_Mutex, int> >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#else
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Auto_IncDec<int>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Auto_IncDec<int>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_THREADS */
 
 // Spawn off threads.
diff --git a/tests/Based_Pointer_Test.cpp b/tests/Based_Pointer_Test.cpp
index a25cad4c728..143511170ac 100644
--- a/tests/Based_Pointer_Test.cpp
+++ b/tests/Based_Pointer_Test.cpp
@@ -410,6 +410,16 @@ run_main (int, ACE_TCHAR *[])
     return retval == 0 ? 0 : 1;
 }
 
+# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>;
+
+# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#  pragma instantiate class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block>
+
+# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else /* ! ACE_HAS_POSITION_INDEPENDENT_POINTERS */
 // Nothing to test !
 int
diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp
index 90fbf04a991..7602eb1a8c9 100644
--- a/tests/Basic_Types_Test.cpp
+++ b/tests/Basic_Types_Test.cpp
@@ -74,10 +74,8 @@ run_main (int, ACE_TCHAR *[])
 
   errors += check (ACE_TEXT ("ACE_SIZEOF_CHAR: %u%s"),
                    sizeof (char), ACE_SIZEOF_CHAR);
-#if defined (ACE_HAS_WCHAR)
   errors += check (ACE_TEXT ("ACE_SIZEOF_WCHAR: %u%s"),
                    sizeof (wchar_t), ACE_SIZEOF_WCHAR);
-#endif /* ACE_HAS_WCHAR */
   errors += check (ACE_TEXT ("ACE_SIZEOF_SHORT: %u%s"),
                    sizeof (short), ACE_SIZEOF_SHORT);
   errors += check (ACE_TEXT ("ACE_SIZEOF_INT: %u%s"),
diff --git a/tests/Bound_Ptr_Test.cpp b/tests/Bound_Ptr_Test.cpp
index e2d85c27d31..95d6bb77cd9 100644
--- a/tests/Bound_Ptr_Test.cpp
+++ b/tests/Bound_Ptr_Test.cpp
@@ -145,6 +145,18 @@ void Child::do_something (void)
     strong_parent->do_something ();
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Strong_Bound_Ptr<Parent, ACE_Null_Mutex>;
+template class ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex>;
+template class ACE_Strong_Bound_Ptr<Child_Base, ACE_Null_Mutex>;
+template class ACE_Bound_Ptr_Counter<ACE_Null_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Strong_Bound_Ptr<Parent, ACE_Null_Mutex>
+#pragma instantiate ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex>
+#pragma instantiate ACE_Strong_Bound_Ptr<Child_Base, ACE_Null_Mutex>
+#pragma instantiate ACE_Bound_Ptr_Counter<ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 size_t Printer::instance_count_ = 0;
 
 Printer::Printer (const char *message)
@@ -167,7 +179,7 @@ Printer::print (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%t) %s\n"),
-              ACE_TEXT_CHAR_TO_TCHAR(this->message_)));
+              ACE_TEXT_TO_TCHAR_IN(this->message_)));
 }
 
 #if defined (ACE_HAS_THREADS)
@@ -342,8 +354,39 @@ Scheduler::print (Printer_var &printer)
 // Total number of loops.
 static int n_loops = 10;
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Strong_Bound_Ptr<Printer, ACE_Thread_Mutex>;
+template class ACE_Weak_Bound_Ptr<Printer, ACE_Thread_Mutex>;
+template class ACE_Bound_Ptr_Counter<ACE_Thread_Mutex>;
+template class ACE_Auto_Basic_Ptr<Printer>;
+template class auto_ptr<Printer>;
+template class ACE_Strong_Bound_Ptr<Scheduler, ACE_Null_Mutex>;
+template class ACE_Strong_Bound_Ptr<ACE_Method_Request, ACE_Null_Mutex>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Strong_Bound_Ptr<Printer, ACE_Thread_Mutex>
+#pragma instantiate ACE_Weak_Bound_Ptr<Printer, ACE_Thread_Mutex>
+#pragma instantiate ACE_Bound_Ptr_Counter<ACE_Thread_Mutex>
+#pragma instantiate ACE_Auto_Basic_Ptr<Printer>
+#pragma instantiate auto_ptr<Printer>
+#pragma instantiate ACE_Strong_Bound_Ptr<Scheduler, ACE_Null_Mutex>
+#pragma instantiate ACE_Strong_Bound_Ptr<ACE_Method_Request, ACE_Null_Mutex>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Strong_Bound_Ptr<Printer, ACE_Null_Mutex>;
+template class ACE_Weak_Bound_Ptr<Printer, ACE_Null_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Strong_Bound_Ptr<Printer, ACE_Null_Mutex>
+#pragma instantiate ACE_Weak_Bound_Ptr<Printer, ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
 int
 run_main (int, ACE_TCHAR *[])
 {
diff --git a/tests/Bug_2368_Regression_Test.cpp b/tests/Bug_2368_Regression_Test.cpp
deleted file mode 100644
index 8441abe346f..00000000000
--- a/tests/Bug_2368_Regression_Test.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * @file Bug_2368_Regression_Test.cpp
- *
- * $Id$
- *
- * Reproduces the problems reported in bug 2368:
- *   http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2368
- *
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-
-#include "test_config.h"
-#include "ace/Service_Config.h"
-#include "ace/Reactor.h"
-#include "ace/Log_Msg.h"
-#include "ace/Signal.h"
-
-ACE_RCSID (tests,
-           Bug_2368_Regression_Test,
-           "$Id$")
-
-static bool handleA_close_called = false;
-static bool handleB_close_called = false;
-
-class My_HandlerA : public ACE_Event_Handler
-{
-public:
-  virtual int handle_close (ACE_HANDLE,
-                            ACE_Reactor_Mask)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Handle close called\n"));
-    handleA_close_called = true;
-
-    return 0;
-  }
-
-  virtual int handle_signal (int,
-                             siginfo_t *,
-                             ucontext_t *)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Handle signal called\n"));
-
-    return 0;
-  }
-};
-
-class My_HandlerB : public ACE_Event_Handler
-{
-public:
-  virtual int handle_close (ACE_HANDLE,
-                            ACE_Reactor_Mask)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Handle close called\n"));
-    handleB_close_called = true;
-
-    return 0;
-  }
-
-  virtual int handle_signal (int,
-                             siginfo_t *,
-                             ucontext_t *)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Handle signal called\n"));
-
-    return 0;
-  }
-};
-
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("Bug_2368_Regression_Test"));
-
-  My_HandlerA my_handlerA;
-  My_HandlerB my_handlerB;
-
-  // Set up an ACE signal handler.
-  if (ACE_Reactor::instance ()->register_handler
-      (SIGINT,
-       &my_handlerA) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "%p\n",
-                       "register_handlerA"),
-                      -1);
-
-  if (ACE_Reactor::instance ()->register_handler
-      (SIGINT,
-       &my_handlerB) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "%p\n",
-                       "register_handlerB"),
-                      -1);
-
-  ACE_Sig_Action *new_disp = 0;
-  if (ACE_Reactor::instance ()->remove_handler
-      (SIGINT,
-       new_disp) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "%p\n",
-                       "remove_handlerB"),
-                      -1);
-
-  if (ACE_Reactor::instance ()->close () == -1)
-    ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "close"));
-
-  if (!handleA_close_called)
-    ACE_ERROR ((LM_ERROR,
-                "Handle close hasn't been called for A\n"));
-
-  if (!handleB_close_called)
-    ACE_ERROR ((LM_ERROR,
-                "Handle close hasn't been called for B\n"));
-
-  ACE_END_TEST;
-
-  return 0;
-}
diff --git a/tests/CDR_Array_Test.cpp b/tests/CDR_Array_Test.cpp
index 5bb5a01c3eb..8e754f950ad 100644
--- a/tests/CDR_Array_Test.cpp
+++ b/tests/CDR_Array_Test.cpp
@@ -897,7 +897,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE::minor_version(),
               ACE::beta_version()));
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("d:f:q:w:h:c:t:n:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("d:f:q:w:h:c:t:n:"));
   int dtotal = 0;
   int ftotal = 0;
   int qtotal = 0;
@@ -1002,3 +1002,26 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class CDR_Test<ACE_CDR::Double, DoubleHelper>;
+template class CDR_Test<ACE_CDR::Float, FloatHelper>;
+#if !defined (ACE_LACKS_LONGLONG_T)
+ template class CDR_Test<ACE_CDR::LongLong, LongLongHelper>;
+#endif /* ! ACE_LACKS_LONGLONG_T */
+template class CDR_Test<ACE_CDR::Long, LongHelper>;
+template class CDR_Test<ACE_CDR::Short, ShortHelper>;
+template class CDR_Test<ACE_CDR::Char, CharHelper>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate CDR_Test<ACE_CDR::Double, DoubleHelper>
+#pragma instantiate CDR_Test<ACE_CDR::Float, FloatHelper>
+#if !defined (ACE_LACKS_LONGLONG_T)
+# pragma instantiate CDR_Test<ACE_CDR::LongLong, LongLongHelper>
+#endif /* ! ACE_LACKS_LONGLONG_T */
+#pragma instantiate CDR_Test<ACE_CDR::Long, LongHelper>
+#pragma instantiate CDR_Test<ACE_CDR::Short, ShortHelper>
+#pragma instantiate CDR_Test<ACE_CDR::Char, CharHelper>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index 9397574eabd..c47495ee4de 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -330,7 +330,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE::minor_version (),
               ACE::beta_version ()));
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:rw"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("f:rw"));
   int opt;
   int reading = 1;
   int writing = 1;
@@ -442,6 +442,20 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+// Not necessary here, because it's instantiated in
+// ace/Memory_Pool.cpp.
+// template class ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+// Not necessary here, because it's instantiated in
+// ace/Memory_Pool.cpp.
+// #pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else  /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
 int
diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp
index ca61076c4ed..699a28e4608 100644
--- a/tests/CDR_Test.cpp
+++ b/tests/CDR_Test.cpp
@@ -228,7 +228,7 @@ short_stream (void)
                        ACE_TEXT ("string transfer error")),
                       1);
 
-  if (ACE_OS::wscmp (wstr1, wstr))
+  if (ACE_OS::strcmp (wstr1, wstr))
      ACE_ERROR_RETURN ((LM_ERROR,
                         ACE_TEXT ("%p\n"),
                         ACE_TEXT ("wide string transfer error")),
@@ -430,7 +430,7 @@ CDR_Test_Types::test_get (ACE_InputCDR &cdr) const
                            1);
       // zero length
       ACE_Auto_Basic_Array_Ptr<ACE_CDR::WChar> auto_xwstr (wstr1);
-       if (ACE_OS::wslen(auto_xwstr.get () ))
+       if (ACE_OS::strlen(auto_xwstr.get () ))
          ACE_ERROR_RETURN ((LM_ERROR,
                             ACE_TEXT ("wstring[%d] differs\n"),
                              i),
@@ -450,7 +450,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE::minor_version(),
               ACE::beta_version()));
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dn:l:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("dn:l:"));
   int opt;
   int debug = 0;
 
@@ -481,7 +481,7 @@ run_main (int argc, ACE_TCHAR *argv[])
     }
 
   // Sanity checks.
-  ACE_ASSERT (sizeof (ACE_CDR::Boolean)    >= 1);
+  ACE_ASSERT (sizeof (ACE_CDR::Boolean)    == 1);
   ACE_ASSERT (sizeof (ACE_CDR::Octet)      == 1);
   ACE_ASSERT (sizeof (ACE_CDR::WChar)      >= 2);
   ACE_ASSERT (sizeof (ACE_CDR::Short)      == 2);
@@ -566,3 +566,16 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+// Not necessary here, because it's instantiated in
+// ace/Memory_Pool.cpp.
+// template class ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+// Not necessary here, because it's instantiated in
+// ace/Memory_Pool.cpp.
+// #pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp
index 400235216e0..f2681e793c7 100644
--- a/tests/Cache_Map_Manager_Test.cpp
+++ b/tests/Cache_Map_Manager_Test.cpp
@@ -475,7 +475,7 @@ test_caching_strategy_type (void)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:i:r:f:p:d"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("c:i:r:f:p:d"));
 
   int cc;
   while ((cc = get_opt ()) != -1)
@@ -596,3 +596,108 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Pair<VALUE, ATTR>;
+template class ACE_Reference_Pair<KEY, VALUE>;
+
+template class ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<KEY, CACHE_VALUE>;
+
+template class ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<KEY, CACHE_VALUE, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>;
+template class ACE_Map_Entry<KEY, CACHE_VALUE>;
+
+template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, ATTR>;
+template class ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_ITERATOR, ATTR>;
+
+template class ACE_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
+template class ACE_LRU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_LRU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
+template class ACE_LFU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_LFU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
+template class ACE_FIFO_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_FIFO_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
+template class ACE_Null_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>;
+template class ACE_Null_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>;
+
+template class ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>;
+template class ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LRU>;
+template class ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>;
+template class ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LFU>;
+template class ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>;
+template class ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_FIFO>;
+template class ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>;
+template class ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_NULL>;
+
+template class ACE_Cleanup_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER>;
+template class ACE_Cleanup_Strategy<KEY, CACHE_VALUE, MAP_MANAGER>;
+
+template class ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Iterator<KEY, VALUE, MAP_ITERATOR, MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>;
+
+template class ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_REVERSE_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>;
+template class ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Pair<VALUE, ATTR>
+#pragma instantiate ACE_Reference_Pair<KEY, VALUE>
+
+#pragma instantiate ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Entry<KEY, CACHE_VALUE>
+
+#pragma instantiate ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator_Base<KEY, CACHE_VALUE, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Entry<KEY, CACHE_VALUE>
+
+#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, ATTR>
+#pragma instantiate ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_ITERATOR, ATTR>
+
+#pragma instantiate ACE_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+#pragma instantiate ACE_LRU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_LRU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+#pragma instantiate ACE_LFU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_LFU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+#pragma instantiate ACE_FIFO_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_FIFO_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+#pragma instantiate ACE_Null_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY>
+#pragma instantiate ACE_Null_Caching_Strategy<ATTR, MAP_CACHING_UTILITY>
+
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LRU>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LFU>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_FIFO>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_NULL>
+
+#pragma instantiate ACE_Cleanup_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER>
+#pragma instantiate ACE_Cleanup_Strategy<KEY, CACHE_VALUE, MAP_MANAGER>
+
+#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, MAP_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>
+
+#pragma instantiate ACE_Cache_Map_Manager<KEY, VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Iterator<KEY, VALUE, HASH_MAP_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_MAP_REVERSE_ITERATOR, HASH_MAP_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp
index 64717629458..43c44aaec7a 100644
--- a/tests/Cached_Accept_Conn_Test.cpp
+++ b/tests/Cached_Accept_Conn_Test.cpp
@@ -142,6 +142,181 @@ Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void)
 typedef Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
         ACCEPT_STRATEGY;
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    (defined (ACE_HAS_GNU_REPO) && !defined (ACE_VXWORKS))
+  // The explicit instantiations are necessary with g++ 2.91.66
+  // with -frepo, because it misses some of them.
+# if (defined (ghs) || defined(__MINGW32__)) && defined(ACE_WIN32)
+template class ACE_Node<ACE_HANDLE>;
+# endif
+// = Handle Gobbler
+# if (ACE_SIZEOF_INT != 4) && !defined (ACE_WIN32)
+// These might be already instantiated in ace/stats.cpp
+// (if ACE_HANDLE == int && ACE_INT32 == int)
+template class ACE_Node<ACE_HANDLE>;
+# endif /* ACE_SIZEOF_INT != 4 && !ACE_WIN32 */
+template class ACE_Unbounded_Set<ACE_HANDLE>;
+template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
+
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
+template class ACE_NOOP_Creation_Strategy<Client_Svc_Handler>;
+template class ACE_Concurrency_Strategy<Client_Svc_Handler>;
+template class ACE_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Connector_Base<Client_Svc_Handler>;
+template class ACE_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Creation_Strategy<Client_Svc_Handler>;
+template class ACE_Hash_Map_Entry<ACE_ADDR, Client_Svc_Handler *>;
+template class ACE_Hash<ACE_ADDR>;
+template class ACE_Equal_To<ACE_ADDR>;
+template class ACE_NOOP_Concurrency_Strategy<Client_Svc_Handler>;
+template class ACE_Recycling_Strategy<Client_Svc_Handler>;
+template class ACE_Strategy_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_NonBlocking_Connect_Handler<Client_Svc_Handler>;
+
+template class ACE_Strategy_Acceptor<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>;
+template class Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Acceptor<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Creation_Strategy<Server_Svc_Handler>;
+template class ACE_Concurrency_Strategy<Server_Svc_Handler>;
+template class ACE_Scheduling_Strategy<Server_Svc_Handler>;
+
+template class ACE_Pair<Client_Svc_Handler *, ATTRIBUTES>;
+template class ACE_Reference_Pair<ACE_ADDR, Client_Svc_Handler *>;
+template class ACE_Hash_Map_Entry<ACE_ADDR, CACHED_HANDLER>;
+
+template class ACE_Hash_Map_Manager<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+
+template class ACE_Hash_Map_Manager<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+
+// = Caching_Strategy
+template class ACE_Hash_Cache_Map_Manager<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>;
+
+template class ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+
+template class ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+
+template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>;
+template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>;
+template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>;
+template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>;
+
+template class ACE_Cache_Map_Manager<ACE_ADDR, Client_Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
+template class ACE_Cache_Map_Iterator<ACE_ADDR, Client_Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
+template class ACE_Cache_Map_Reverse_Iterator<ACE_ADDR, Client_Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
+
+template class ACE_Cached_Connect_Strategy_Ex<Client_Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Cached_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>;
+
+template class ACE_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>;
+template class ACE_Recyclable_Handler_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>;
+template class ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>;
+
+template class ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+// = Handle Gobbler
+#pragma instantiate ACE_Node<ACE_HANDLE>
+#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
+
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
+#pragma instantiate ACE_NOOP_Creation_Strategy<Client_Svc_Handler>
+#pragma instantiate ACE_Concurrency_Strategy<Client_Svc_Handler>
+#pragma instantiate ACE_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Connector_Base<Client_Svc_Handler>
+#pragma instantiate ACE_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Creation_Strategy<Client_Svc_Handler>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_ADDR, Client_Svc_Handler *>
+#pragma instantiate ACE_Hash<ACE_ADDR>
+#pragma instantiate ACE_Equal_To<ACE_ADDR>
+#pragma instantiate ACE_NOOP_Concurrency_Strategy<Client_Svc_Handler>
+#pragma instantiate ACE_Recycling_Strategy<Client_Svc_Handler>
+#pragma instantiate ACE_Strategy_Connector<Client_Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_NonBlocking_Connect_Handler<Client_Svc_Handler>
+
+#pragma instantiate ACE_Strategy_Acceptor<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Acceptor<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Creation_Strategy<Server_Svc_Handler>
+#pragma instantiate ACE_Concurrency_Strategy<Server_Svc_Handler>
+#pragma instantiate ACE_Scheduling_Strategy<Server_Svc_Handler>
+
+#pragma instantiate ACE_Pair<Client_Svc_Handler *, ATTRIBUTES>
+#pragma instantiate ACE_Reference_Pair<ACE_ADDR, Client_Svc_Handler *>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_ADDR, CACHED_HANDLER>
+
+#pragma instantiate ACE_Hash_Map_Manager<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, Client_Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+
+#pragma instantiate ACE_Hash_Map_Manager<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+
+// = Caching_Strategy
+#pragma instantiate ACE_Hash_Cache_Map_Manager<ACE_ADDR, Client_Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>
+
+#pragma instantiate ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+
+#pragma instantiate ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>
+
+#pragma instantiate ACE_Cache_Map_Manager<ACE_ADDR, Client_Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
+#pragma instantiate ACE_Cache_Map_Iterator<ACE_ADDR, Client_Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<ACE_ADDR, Client_Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
+
+#pragma instantiate ACE_Cached_Connect_Strategy_Ex<Client_Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Cached_Connect_Strategy<Client_Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>
+
+#pragma instantiate ACE_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>
+#pragma instantiate ACE_Recyclable_Handler_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>
+#pragma instantiate ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
+
+#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 Client_Svc_Handler::Client_Svc_Handler (ACE_Thread_Manager *t)
   : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (t)
 {
@@ -381,7 +556,7 @@ test_caching_strategy_type (void)
 int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d"));
 
   int cc;
 
diff --git a/tests/Cached_Allocator_Test.cpp b/tests/Cached_Allocator_Test.cpp
index c348398e7a9..78cab3e70e4 100644
--- a/tests/Cached_Allocator_Test.cpp
+++ b/tests/Cached_Allocator_Test.cpp
@@ -274,3 +274,22 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<MEMBLOCK> >;
+template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<char> >;
+template class ACE_Dynamic_Cached_Allocator<ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Cached_Allocator<MEMBLOCK, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<char>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Cached_Mem_Pool_Node<char>;
+template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<MEMBLOCK>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Cached_Mem_Pool_Node<MEMBLOCK>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<MEMBLOCK> >
+#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<char> >
+#pragma instantiate ACE_Dynamic_Cached_Allocator<ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Cached_Allocator<MEMBLOCK, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<char>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Cached_Mem_Pool_Node<char>
+#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<MEMBLOCK>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Cached_Mem_Pool_Node<MEMBLOCK>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp
index d67d84a5988..72d053cf0ae 100644
--- a/tests/Cached_Conn_Test.cpp
+++ b/tests/Cached_Conn_Test.cpp
@@ -106,6 +106,168 @@ typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler>
 typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
         CACHED_CONNECT_STRATEGY;
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    (defined (ACE_HAS_GNU_REPO) && !defined (ACE_VXWORKS))
+  // The explicit instantiations are necessary with g++ 2.91.66
+  // with -frepo, because it misses some of them.
+
+# if (defined (ghs) || defined (__MINGW32__)) && defined (ACE_WIN32)
+template class ACE_Node<ACE_HANDLE>;
+# endif
+// = Handle Gobbler
+#if (ACE_SIZEOF_INT != 4) && !defined (ACE_WIN32)
+// These might be already instantiated in ace/stats.cpp
+// (if ACE_HANDLE == int && ACE_INT32 == int)
+template class ACE_Node<ACE_HANDLE>;
+#endif /* ACE_SIZEOF_INT != 4 && !ACE_WIN32 */
+template class ACE_Unbounded_Set<ACE_HANDLE>;
+template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
+
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
+template class ACE_NOOP_Creation_Strategy<Svc_Handler>;
+template class ACE_Concurrency_Strategy<Svc_Handler>;
+template class ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Connector_Base<Svc_Handler>;
+template class ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Creation_Strategy<Svc_Handler>;
+template class ACE_Hash_Map_Entry<ACE_ADDR, Svc_Handler *>;
+template class ACE_Hash<ACE_ADDR>;
+template class ACE_Equal_To<ACE_ADDR>;
+template class ACE_NOOP_Concurrency_Strategy<Svc_Handler>;
+template class ACE_Recycling_Strategy<Svc_Handler>;
+template class ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_NonBlocking_Connect_Handler<Svc_Handler>;
+
+template class ACE_Pair<Svc_Handler *, ATTRIBUTES>;
+template class ACE_Reference_Pair<ACE_ADDR, Svc_Handler *>;
+template class ACE_Hash_Map_Entry<ACE_ADDR, CACHED_HANDLER>;
+
+template class ACE_Hash_Map_Manager<ACE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<ACE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_ADDR, Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+
+template class ACE_Hash_Map_Manager<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>;
+
+// = Caching_Strategy
+template class ACE_Hash_Cache_Map_Manager<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>;
+
+template class ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+
+template class ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+template class ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>;
+
+template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>;
+template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>;
+template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>;
+template class ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>;
+
+template class ACE_Cache_Map_Manager<ACE_ADDR, Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
+template class ACE_Cache_Map_Iterator<ACE_ADDR, Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
+template class ACE_Cache_Map_Reverse_Iterator<ACE_ADDR, Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>;
+
+template class ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>;
+
+template class ACE_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>;
+template class ACE_Recyclable_Handler_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>;
+template class ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>;
+
+template class ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+// = Handle Gobbler
+#pragma instantiate ACE_Node<ACE_HANDLE>
+#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
+
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
+#pragma instantiate ACE_NOOP_Creation_Strategy<Svc_Handler>
+#pragma instantiate ACE_Concurrency_Strategy<Svc_Handler>
+#pragma instantiate ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Connector_Base<Svc_Handler>
+#pragma instantiate ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Creation_Strategy<Svc_Handler>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_ADDR, Svc_Handler *>
+#pragma instantiate ACE_Hash<ACE_ADDR>
+#pragma instantiate ACE_Equal_To<ACE_ADDR>
+#pragma instantiate ACE_NOOP_Concurrency_Strategy<Svc_Handler>
+#pragma instantiate ACE_Recycling_Strategy<Svc_Handler>
+#pragma instantiate ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_NonBlocking_Connect_Handler<Svc_Handler>
+
+#pragma instantiate ACE_Pair<Svc_Handler *, ATTRIBUTES>
+#pragma instantiate ACE_Reference_Pair<ACE_ADDR, Svc_Handler *>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_ADDR, CACHED_HANDLER>
+
+#pragma instantiate ACE_Hash_Map_Manager<ACE_ADDR, Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_ADDR, Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_ADDR, Svc_Handler *, H_KEY,  C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+
+#pragma instantiate ACE_Hash_Map_Manager<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_ADDR, CACHED_HANDLER, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, ACE_Null_Mutex>
+
+// = Caching_Strategy
+#pragma instantiate ACE_Hash_Cache_Map_Manager<ACE_ADDR, Svc_Handler *, H_KEY, C_KEYS, CACHING_STRATEGY, ATTRIBUTES>
+
+#pragma instantiate ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+
+#pragma instantiate ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+#pragma instantiate ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>
+
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>
+#pragma instantiate ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>
+
+#pragma instantiate ACE_Cache_Map_Manager<ACE_ADDR, Svc_Handler *, HASH_MAP, HASH_MAP_ITERATOR, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
+#pragma instantiate ACE_Cache_Map_Iterator<ACE_ADDR, Svc_Handler *, HASH_MAP_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<ACE_ADDR, Svc_Handler *, HASH_MAP_REVERSE_ITERATOR, CACHING_STRATEGY, ATTRIBUTES>
+
+#pragma instantiate ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>
+
+#pragma instantiate ACE_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>
+#pragma instantiate ACE_Recyclable_Handler_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP>
+#pragma instantiate ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>
+
+#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_NULL_MUTEX> >
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* CACHED_CONNECT_TEST */
 
 static int debug = 0;
@@ -358,7 +520,7 @@ test_caching_strategy_type (void)
 int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d"));
 
   int cc;
 
diff --git a/tests/Codecs_Test.cpp b/tests/Codecs_Test.cpp
index 165ed9bfb8e..7da81373342 100644
--- a/tests/Codecs_Test.cpp
+++ b/tests/Codecs_Test.cpp
@@ -117,3 +117,8 @@ run_main (int argc, ACE_TCHAR *argv[])
   return status;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Auto_Basic_Array_Ptr<ACE_Byte>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_Byte>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp
index cf8e124de77..0d723c3c47c 100644
--- a/tests/Collection_Test.cpp
+++ b/tests/Collection_Test.cpp
@@ -182,3 +182,25 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Unbounded_Set<DATA>;
+template class ACE_Unbounded_Set_Iterator<DATA>;
+template class ACE_Unbounded_Set_Const_Iterator<DATA>;
+template class ACE_Node<DATA>;
+template class ACE_Array<ARRAY_DATA>;
+template class ACE_Array_Base<ARRAY_DATA>;
+template class ACE_Array_Iterator<ARRAY_DATA>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Unbounded_Set<DATA>
+#pragma instantiate ACE_Unbounded_Set_Iterator<DATA>
+#pragma instantiate ACE_Unbounded_Set_Const_Iterator<DATA>
+#pragma instantiate ACE_Node<DATA>
+#pragma instantiate ACE_Array<ARRAY_DATA>
+#pragma instantiate ACE_Array_Base<ARRAY_DATA>
+#pragma instantiate ACE_Array_Iterator<ARRAY_DATA>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp
index 4cf08965fcb..110091b67af 100644
--- a/tests/Config_Test.cpp
+++ b/tests/Config_Test.cpp
@@ -979,7 +979,7 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original)
                             // we're not equal if we cannot get rhs int
                             rc = false;
 
-                          ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), intValue);
+                          ACE_OS::sprintf (int_value, ACE_TEXT ("%08x"), intValue);
                           originalString = int_value;
                         }
                       else if (originalType == ACE_Configuration::BINARY)
@@ -1001,10 +1001,10 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original)
                               while (binary_length)
                                 {
                                   if (ptr != binary_data)
-                                    originalString += ACE_LIB_TEXT (",");
+                                    originalString += ACE_TEXT (",");
 
                                   ACE_OS::sprintf (bin_value,
-                                                   ACE_LIB_TEXT ("%02x"),
+                                                   ACE_TEXT ("%02x"),
                                                    *ptr);
                                   originalString += bin_value;
                                   --binary_length;
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index 2e808d4497b..604812055d2 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -103,6 +103,98 @@ typedef ACE_Cached_Connect_Strategy<Svc_Handler,
 #define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_MUTEX>
 #define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class CACHED_CONNECT_STRATEGY;
+template class REFCOUNTED_HASH_RECYCLABLE_ADDR;
+template class ACE_NOOP_Creation_Strategy<Svc_Handler>;
+template class ACE_Concurrency_Strategy<Svc_Handler>;
+template class ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Connector_Base<Svc_Handler>;
+template class ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Creation_Strategy<Svc_Handler>;
+template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>;
+template class ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
+template class ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
+
+template class ACE_Reverse_Lock<ACE_SYNCH_MUTEX>;
+template class ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> >;
+
+#if defined (ACE_HAS_THREADS)
+template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>;
+#endif /* ACE_HAS_THREADS */
+
+template class ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>;
+template class ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>;
+template class ACE_Oneshot_Acceptor<Svc_Handler, LOCK_SOCK_ACCEPTOR>;
+template class ACE_NOOP_Concurrency_Strategy<Svc_Handler>;
+template class ACE_Recycling_Strategy<Svc_Handler>;
+template class ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+template class ACE_NonBlocking_Connect_Handler<Svc_Handler>;
+template class ACE_Auto_Basic_Array_Ptr<pid_t>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate CACHED_CONNECT_STRATEGY
+#pragma instantiate REFCOUNTED_HASH_RECYCLABLE_ADDR
+#pragma instantiate ACE_NOOP_Creation_Strategy<Svc_Handler>
+#pragma instantiate ACE_Concurrency_Strategy<Svc_Handler>
+#pragma instantiate ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Connector_Base<Svc_Handler>
+#pragma instantiate ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Creation_Strategy<Svc_Handler>
+#pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *>
+#pragma instantiate ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>
+#pragma instantiate ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>
+
+#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Guard<ACE_Reverse_Lock<ACE_SYNCH_MUTEX> >
+
+#if defined (ACE_HAS_THREADS)
+#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Null_Mutex>
+#endif /* ACE_HAS_THREADS */
+
+#pragma instantiate ACE_Hash_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, Svc_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>
+#pragma instantiate ACE_Oneshot_Acceptor<Svc_Handler, LOCK_SOCK_ACCEPTOR>
+#pragma instantiate ACE_NOOP_Concurrency_Strategy<Svc_Handler>
+#pragma instantiate ACE_Recycling_Strategy<Svc_Handler>
+#pragma instantiate ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#pragma instantiate ACE_NonBlocking_Connect_Handler<Svc_Handler>
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<pid_t>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 // Default number of clients/servers.
 #if defined (ACE_HAS_PHARLAP)
 // PharLap is, by default, resource contrained. Test for something that works
@@ -726,7 +818,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_START_TEST (ACE_TEXT ("Conn_Test"));
   int status = 0;
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("c:i:s:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  getopt (argc, argv, ACE_TEXT ("c:i:s:"));
   for (int c; (c = getopt ()) != -1; )
     switch (c)
       {
diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp
index 568c8c9abc4..c3582ea0375 100644
--- a/tests/DLL_Test.cpp
+++ b/tests/DLL_Test.cpp
@@ -186,3 +186,10 @@ run_main (int, ACE_TCHAR *[])
   return retval == 0 ? 0 : 1;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class auto_ptr <Hello>;
+template class ACE_Auto_Basic_Ptr <Hello>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate auto_ptr <Hello>
+#pragma instantiate ACE_Auto_Basic_Ptr <Hello>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/DLList_Test.cpp b/tests/DLList_Test.cpp
index 57155d177ab..21260c33d55 100644
--- a/tests/DLList_Test.cpp
+++ b/tests/DLList_Test.cpp
@@ -26,6 +26,18 @@ typedef ACE_DLList<ACE_STRING> STRLIST;
 typedef ACE_DLList_Iterator<ACE_STRING> STRLIST_ITERATOR;
 typedef ACE_DLList_Reverse_Iterator<ACE_STRING> STRLIST_REVERSE_ITERATOR;
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_DLList<ACE_STRING>;
+template class ACE_DLList_Iterator<ACE_STRING>;
+template class ACE_DLList_Reverse_Iterator<ACE_STRING>;
+template class ACE_Static_Allocator<8192>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_DLList<ACE_STRING>
+#pragma instantiate ACE_DLList_Iterator<ACE_STRING>
+#pragma instantiate ACE_DLList_Reverse_Iterator<ACE_STRING>
+#pragma instantiate ACE_Static_Allocator<8192>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 static ACE_STRING string_table[] =
 {
   // Note: all these casts are to appease SC 5.0 which is not pleased
diff --git a/tests/Dev_Poll_Reactor_Test.cpp b/tests/Dev_Poll_Reactor_Test.cpp
index 9535fbfb186..2b48767b875 100644
--- a/tests/Dev_Poll_Reactor_Test.cpp
+++ b/tests/Dev_Poll_Reactor_Test.cpp
@@ -581,6 +581,25 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+template class ACE_Acceptor<Server, ACE_SOCK_ACCEPTOR>;
+template class ACE_Connector_Base<Client>;
+template class ACE_Connector<Client, ACE_SOCK_CONNECTOR>;
+template class ACE_NonBlocking_Connect_Handler<Client>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#pragma instantiate ACE_Acceptor<Server, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Connector_Base<Client>
+#pragma instantiate ACE_Connector<Client, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_NonBlocking_Connect_Handler<Client>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 
 int
diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp
index 19c6e554b41..d8353bc3bae 100644
--- a/tests/Dirent_Test.cpp
+++ b/tests/Dirent_Test.cpp
@@ -202,7 +202,7 @@ dirent_count (const ACE_TCHAR *dir_path,
 
 #if !defined (ACE_LACKS_STRUCT_DIR) && !defined (__BORLANDC__)
       ACE_OS::strncpy (tname,
-                       ACE_TEXT_CHAR_TO_TCHAR (directory->d_name),
+                       ACE_TEXT_TO_TCHAR_IN (directory->d_name),
                        maxnamlen);
 #else
       ACE_OS::strncpy (tname, directory->d_name, maxnamlen);
diff --git a/tests/Enum_Interfaces_Test.cpp b/tests/Enum_Interfaces_Test.cpp
index b9bd438c6c0..0ef53a9942c 100644
--- a/tests/Enum_Interfaces_Test.cpp
+++ b/tests/Enum_Interfaces_Test.cpp
@@ -63,7 +63,7 @@ run_main (int, ACE_TCHAR *[])
 
       for (size_t i = 0; i < how_many; i++)
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\t%s\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (the_addr_array[i].get_host_addr ())));
+                    ACE_TEXT_TO_TCHAR_IN (the_addr_array[i].get_host_addr ())));
 
       delete [] the_addr_array;
     }
diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp
index c7a81909aa9..96bc2a522a2 100644
--- a/tests/Env_Value_Test.cpp
+++ b/tests/Env_Value_Test.cpp
@@ -110,9 +110,29 @@ run_main (int argc, ACE_TCHAR * [], ACE_TCHAR *envp[])
       const ACE_TCHAR *defstr = ACE_TEXT ("Sarah Cleeland is Two!");
       ACE_Env_Value<const ACE_TCHAR *> sval (ACE_TEXT ("This_Shouldnt_Be_Set_Hopefully"),
                                   defstr);
-      ACE_ASSERT (ACE_OS::strcmp (sval, defstr) == 0);
+      ACE_ASSERT (ACE_OS::strcmp (static_cast<const ACE_TCHAR *>(sval), defstr) == 0);
       ACE_END_TEST;
     }
   return 0;
 }
-
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class ACE_Env_Value<const char*>;
+# if !defined (ACE_LACKS_FLOATING_POINT)
+    template class ACE_Env_Value<double>;
+# endif /* ! ACE_LACKS_FLOATING_POINT */
+  template class ACE_Env_Value<int>;
+  template class ACE_Env_Value<long>;
+  template class ACE_Env_Value<short>;
+  template class ACE_Env_Value<unsigned short>;
+  template class ACE_Env_Value<unsigned long>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate  ACE_Env_Value<const char*>
+# if !defined (ACE_LACKS_FLOATING_POINT)
+#   pragma instantiate  ACE_Env_Value<double>
+# endif /* ! ACE_LACKS_FLOATING_POINT */
+# pragma instantiate  ACE_Env_Value<int>
+# pragma instantiate  ACE_Env_Value<long>
+# pragma instantiate  ACE_Env_Value<short>
+# pragma instantiate  ACE_Env_Value<unsigned short>
+# pragma instantiate  ACE_Env_Value<unsigned long>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/FlReactor_Test.cpp b/tests/FlReactor_Test.cpp
index 0b34751da3c..65ae1ed4bdc 100644
--- a/tests/FlReactor_Test.cpp
+++ b/tests/FlReactor_Test.cpp
@@ -273,3 +273,14 @@ int run_main (int argc, ACE_TCHAR *argv[])
   ACE_END_TEST;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Framework_Component_DLL.cpp b/tests/Framework_Component_DLL.cpp
index f184a8da593..d4a141ff3d6 100644
--- a/tests/Framework_Component_DLL.cpp
+++ b/tests/Framework_Component_DLL.cpp
@@ -64,11 +64,27 @@ typedef Server_T <2> Server_2;
 FRAMEWORK_COMPONENT_DLL_SINGLETON_DECLARATION(Server_T<2>;)
 ACE_FACTORY_DEFINE (Framework_Component_DLL, Server_2)
 
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class Server_T<1>;
+template class Server_T<2>;
+template class FWCT_DLL_Singleton_Adapter_T<Simple_Service>;
+template class ACE_DLL_Singleton_T< FWCT_DLL_Singleton_Adapter_T <Simple_Service>,
+                                    ACE_SYNCH_MUTEX >;
+template class ACE_Framework_Component_T<ACE_DLL_Singleton_T<FWCT_DLL_Singleton_Adapter_T<Simple_Service>,
+                                         ACE_SYNCH_MUTEX> >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate Server_T<1>
+#pragma instantiate Server_T<2>
+#pragma instantiate FWCT_DLL_Singleton_Adapter_T<Simple_Service>
+#pragma instantiate ACE_DLL_Singleton_T< FWCT_DLL_Singleton_Adapter_T <Simple_Service>,
+                                         ACE_SYNCH_MUTEX >
+#pragma instantiate ACE_Framework_Component_T<ACE_DLL_Singleton_T<FWCT_DLL_Singleton_Adapter_T<Simple_Service>,
+                                               ACE_SYNCH_MUTEX> >;
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 
 template ACE_DLL_Singleton_T<FWCT_DLL_Singleton_Adapter_T <Simple_Service>,
                              ACE_SYNCH_MUTEX> *
   ACE_DLL_Singleton_T<FWCT_DLL_Singleton_Adapter_T <Simple_Service>,
                       ACE_SYNCH_MUTEX>::singleton_;
 
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Future_Set_Test.cpp b/tests/Future_Set_Test.cpp
index 1cbadc1e087..888a945ab4c 100644
--- a/tests/Future_Set_Test.cpp
+++ b/tests/Future_Set_Test.cpp
@@ -365,6 +365,79 @@ typedef ACE_Future_Holder<u_long> *u_long_value;
 typedef ACE_Future_Rep<const ACE_TCHAR *> *char_star_key;
 typedef ACE_Future_Holder<const ACE_TCHAR *> *char_star_value;
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+template class ACE_Future_Holder<const ACE_TCHAR *>;
+template class ACE_Future_Holder<u_long>;
+template class ACE_Future_Observer<const ACE_TCHAR *>;
+template class ACE_Future_Observer<u_long>;
+template class ACE_Future<const ACE_TCHAR *>;
+template class ACE_Future<u_long>;
+template class ACE_Future_Rep<const ACE_TCHAR *>;
+template class ACE_Future_Rep<u_long>;
+template class ACE_Future_Set<const ACE_TCHAR *>;
+template class ACE_Future_Set<u_long>;
+template class auto_ptr<ACE_Method_Request>;
+template class ACE_Auto_Basic_Ptr<ACE_Method_Request>;
+template class ACE_Node<ACE_Future_Observer<const ACE_TCHAR *> *>;
+template class ACE_Node<ACE_Future_Observer<u_long> *>;
+template class ACE_Unbounded_Set<ACE_Future_Observer<const ACE_TCHAR *> *>;
+template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ACE_TCHAR *> *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>;
+template class ACE_Pointer_Hash<u_long_key>;
+template class ACE_Equal_To<u_long_key>;
+template class ACE_Hash_Map_Entry<u_long_key, u_long_value>;
+template class ACE_Hash_Map_Manager_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>;
+template class ACE_Pointer_Hash<char_star_key>;
+template class ACE_Equal_To<char_star_key>;
+template class ACE_Hash_Map_Entry<char_star_key, char_star_value>;
+template class ACE_Hash_Map_Manager_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Future_Holder<const ACE_TCHAR *>
+#pragma instantiate ACE_Future_Holder<u_long>
+#pragma instantiate ACE_Future_Observer<const ACE_TCHAR *>
+#pragma instantiate ACE_Future_Observer<u_long>
+#pragma instantiate ACE_Future<const ACE_TCHAR *>
+#pragma instantiate ACE_Future<u_long>
+#pragma instantiate ACE_Future_Rep<const ACE_TCHAR *>
+#pragma instantiate ACE_Future_Rep<u_long>
+#pragma instantiate ACE_Future_Set<const ACE_TCHAR *>
+#pragma instantiate ACE_Future_Set<u_long>
+#pragma instantiate auto_ptr<ACE_Method_Request>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request>
+#pragma instantiate ACE_Node<ACE_Future_Observer<const ACE_TCHAR *> *>
+#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<const ACE_TCHAR *> *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ACE_TCHAR *> *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>
+#pragma instantiate ACE_Pointer_Hash<u_long_key>
+#pragma instantiate ACE_Equal_To<u_long_key>
+#pragma instantiate ACE_Hash_Map_Entry<u_long_key, u_long_value>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<u_long_key, u_long_value, ACE_Pointer_Hash<u_long_key>, ACE_Equal_To<u_long_key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Pointer_Hash<char_star_key>
+#pragma instantiate ACE_Equal_To<char_star_key>
+#pragma instantiate ACE_Hash_Map_Entry<char_star_key, char_star_value>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<char_star_key, char_star_value, ACE_Pointer_Hash<char_star_key>, ACE_Equal_To<char_star_key>, ACE_Null_Mutex>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index a8798a476ba..2a3c8b664bb 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -367,6 +367,48 @@ Prime_Scheduler::work (u_long newparam,
 // Total number of loops.
 static int n_loops = 100;
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+template class ACE_Future<const ACE_TCHAR *>;
+template class ACE_Future<int>;
+template class ACE_Future<u_long>;
+template class ACE_Future_Rep<const ACE_TCHAR *>;
+template class ACE_Future_Rep<int>;
+template class ACE_Future_Rep<u_long>;
+template class auto_ptr<ACE_Method_Request>;
+template class ACE_Auto_Basic_Ptr<ACE_Method_Request>;
+template class ACE_Node<ACE_Future_Observer<const ACE_TCHAR *> *>;
+template class ACE_Node<ACE_Future_Observer<int> *>;
+template class ACE_Node<ACE_Future_Observer<u_long> *>;
+template class ACE_Unbounded_Set<ACE_Future_Observer<const ACE_TCHAR *> *>;
+template class ACE_Unbounded_Set<ACE_Future_Observer<int> *>;
+template class ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ACE_TCHAR *> *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *>;
+template class ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Future<const ACE_TCHAR *>
+#pragma instantiate ACE_Future<int>
+#pragma instantiate ACE_Future<u_long>
+#pragma instantiate ACE_Future_Rep<const ACE_TCHAR *>
+#pragma instantiate ACE_Future_Rep<int>
+#pragma instantiate ACE_Future_Rep<u_long>
+#pragma instantiate auto_ptr<ACE_Method_Request>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request>
+#pragma instantiate ACE_Node<ACE_Future_Observer<const ACE_TCHAR *> *>
+#pragma instantiate ACE_Node<ACE_Future_Observer<int> *>
+#pragma instantiate ACE_Node<ACE_Future_Observer<u_long> *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<const ACE_TCHAR *> *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<int> *>
+#pragma instantiate ACE_Unbounded_Set<ACE_Future_Observer<u_long> *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<const ACE_TCHAR *> *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<int> *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Future_Observer<u_long> *>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/Get_Opt_Test.cpp b/tests/Get_Opt_Test.cpp
index b34c9e64f2f..cba53d53e40 100644
--- a/tests/Get_Opt_Test.cpp
+++ b/tests/Get_Opt_Test.cpp
@@ -7,7 +7,7 @@
 //
 // = DESCRIPTION
 //    This program tests both the short and long option support in
-//    <ACE_Get_Opt>, and demonstrates how to use it.
+//    <ACE_Get_Arg_Opt<ACE_TCHAR> >, and demonstrates how to use it.
 //
 // = AUTHOR
 //    Don Hinton <dhinton@dresystems.com>
@@ -25,7 +25,7 @@ ACE_RCSID(tests, Get_Opt_Test, "$Id$")
 
 /*
  * This is the heart of the test. It sets up the optstring, instantiates
- * ACE_Get_Opt, add long options, processes them in a loop, and prints out
+ * ACE_Get_Arg_Opt<ACE_TCHAR> , add long options, processes them in a loop, and prints out
  * the results to the log.
  *
  * It returns 0 for success and 1 for error so we can keep track of the
@@ -65,7 +65,7 @@ parse_args (int test_number,
 
   ACE_ARGV args (test.c_str ());
 
-  ACE_Get_Opt get_opt (args.argc (),
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (args.argc (),
                        args.argv (),
                        optstring.c_str (),
                        skip_argv,
@@ -75,31 +75,31 @@ parse_args (int test_number,
   // Now add the default long args.
   if (get_opt.long_option (ACE_TEXT ("flag"),
                            'f',
-                           ACE_Get_Opt::NO_ARG) != 0)
+                           ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("  Unable to add long option 'f' \n")), 1);
 
   if (get_opt.long_option (ACE_TEXT ("requires_arg"),
                            'r',
-                           ACE_Get_Opt::ARG_REQUIRED) != 0)
+                           ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("  Unable to add long option 'r' \n")), 1);
 
   if (get_opt.long_option (ACE_TEXT ("optional_arg"),
                            'o',
-                           ACE_Get_Opt::ARG_OPTIONAL) != 0)
+                           ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_OPTIONAL) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("  Unable to add long option 'o' \n")), 1);
 
   if (get_opt.long_option (ACE_TEXT ("long_option"),
                            'l',
-                           ACE_Get_Opt::ARG_OPTIONAL) != 0)
+                           ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_OPTIONAL) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("  Unable to add long option 'l' \n")), 1);
 
   if (get_opt.long_option (ACE_TEXT ("long_only"),
                            -11,
-                           ACE_Get_Opt::ARG_REQUIRED) != 0)
+                           ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("  Unable to add long option ")
                        ACE_TEXT ("\"long_only\" \n")), 1);
@@ -115,7 +115,7 @@ parse_args (int test_number,
   // (afterall, there are only so many alpha numeric characters available).
   if (get_opt.long_option (ACE_TEXT ("non_alpha-num_short"),
                            -10,
-                           ACE_Get_Opt::ARG_OPTIONAL) != 0)
+                           ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_OPTIONAL) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("  Unable to add long option ")
                        ACE_TEXT ("\"non_alpha_short\" \n")), 1);
@@ -337,9 +337,9 @@ run_main (int, ACE_TCHAR *argv[])
   int test_number = 0;
 
   // Run the tests for each type of ordering.
-  retval = run_test (test_number, ACE_Get_Opt::PERMUTE_ARGS);
-  retval += run_test (test_number, ACE_Get_Opt::REQUIRE_ORDER);
-  retval += run_test (test_number, ACE_Get_Opt::RETURN_IN_ORDER);
+  retval = run_test (test_number, ACE_Get_Arg_Opt<ACE_TCHAR> ::PERMUTE_ARGS);
+  retval += run_test (test_number, ACE_Get_Arg_Opt<ACE_TCHAR> ::REQUIRE_ORDER);
+  retval += run_test (test_number, ACE_Get_Arg_Opt<ACE_TCHAR> ::RETURN_IN_ORDER);
 
   ACE_END_TEST;
   return retval;
diff --git a/tests/HTBP/Reactor_Tests/client.cpp b/tests/HTBP/Reactor_Tests/client.cpp
index 2813d9116f3..a3cafc76e49 100644
--- a/tests/HTBP/Reactor_Tests/client.cpp
+++ b/tests/HTBP/Reactor_Tests/client.cpp
@@ -29,7 +29,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 #endif /* 0 */
 
   ACE::HTBP::ID_Requestor req (&env);
-  ACE::HTBP::Addr local = ACE_TEXT_ALWAYS_CHAR(req.get_HTID());
+  ACE::HTBP::Addr local = ACE_TEXT_TO_CHAR_IN(req.get_HTID());
 
   unsigned remote_port = 8088;
   const ACE_TCHAR * remote_host = argv[1];
@@ -48,7 +48,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
 
   ACE_INET_Addr proxy(proxy_port,proxy_host.c_str());
-  ACE::HTBP::Addr remote (remote_port,ACE_TEXT_ALWAYS_CHAR(remote_host));
+  ACE::HTBP::Addr remote (remote_port,ACE_TEXT_TO_CHAR_IN(remote_host));
 
   ACE::HTBP::Session session(remote,local,ACE::HTBP::Session::next_session_id(),&proxy);
   ACE::HTBP::Stream stream (&session);
diff --git a/tests/HTBP/Reactor_Tests/test_config.h b/tests/HTBP/Reactor_Tests/test_config.h
index efd4eb7bcc6..a675e9a6f3c 100644
--- a/tests/HTBP/Reactor_Tests/test_config.h
+++ b/tests/HTBP/Reactor_Tests/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;
@@ -311,9 +311,13 @@ randomize (int array[], size_t size)
 
 typedef ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex> ace_file_stream;
 
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex>
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex> *
 ACE_Singleton<ACE_Test_Output, ACE_Null_Mutex>::singleton_;
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* ACE_TEST_CONFIG_H */
diff --git a/tests/HTBP/Send_Large_Msg/client.cpp b/tests/HTBP/Send_Large_Msg/client.cpp
index 62cd9140da8..4f1fafd8618 100644
--- a/tests/HTBP/Send_Large_Msg/client.cpp
+++ b/tests/HTBP/Send_Large_Msg/client.cpp
@@ -32,7 +32,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
   ACE::HTBP::ID_Requestor req (&env);
-  ACE::HTBP::Addr local(ACE_TEXT_ALWAYS_CHAR(req.get_HTID()));
+  ACE::HTBP::Addr local(ACE_TEXT_TO_CHAR_IN(req.get_HTID()));
 
   unsigned remote_port = 8088;
   const ACE_TCHAR * remote_host = argv[1];
@@ -51,7 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
 
   ACE_INET_Addr proxy(proxy_port,proxy_host.c_str());
-  ACE::HTBP::Addr remote (remote_port,ACE_TEXT_ALWAYS_CHAR(remote_host));
+  ACE::HTBP::Addr remote (remote_port,ACE_TEXT_TO_CHAR_IN(remote_host));
 
   ACE::HTBP::Session session(remote,
                            local,
diff --git a/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp b/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp
index d462a11c3d3..d670dfab39e 100644
--- a/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp
+++ b/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp
@@ -69,7 +69,7 @@ client (void *arg)
 #endif /* 0 */
 
   ACE::HTBP::ID_Requestor req (&ht_env);
-  ACE::HTBP::Addr local(ACE_TEXT_ALWAYS_CHAR(req.get_HTID()));
+  ACE::HTBP::Addr local(ACE_TEXT_TO_CHAR_IN(req.get_HTID()));
 
   char hostname [128];
 
@@ -94,7 +94,7 @@ client (void *arg)
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) connected to %s\n"),
-              ACE_TEXT_CHAR_TO_TCHAR(remote.get_host_name ())));
+              ACE_TEXT_TO_TCHAR_IN(remote.get_host_name ())));
 
   //*******************   TEST 1   ******************************
   //
@@ -230,7 +230,7 @@ server (void *arg)
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) client %s connected from %d\n"),
-              ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()),
+              ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()),
               cli_addr.get_port_number ()));
 
   //*******************   TEST 1   ******************************
diff --git a/tests/HTBP/ping/client.cpp b/tests/HTBP/ping/client.cpp
index e7753faab6d..e50fbd9a207 100644
--- a/tests/HTBP/ping/client.cpp
+++ b/tests/HTBP/ping/client.cpp
@@ -30,7 +30,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
   ACE::HTBP::ID_Requestor req (&env);
-  ACE::HTBP::Addr local(ACE_TEXT_ALWAYS_CHAR(req.get_HTID()));
+  ACE::HTBP::Addr local(ACE_TEXT_TO_CHAR_IN(req.get_HTID()));
 
   unsigned remote_port = 8088;
   const ACE_TCHAR * remote_host = argv[1];
@@ -49,7 +49,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
 
   ACE_INET_Addr proxy(proxy_port,proxy_host.c_str());
-  ACE::HTBP::Addr remote (remote_port,ACE_TEXT_ALWAYS_CHAR(remote_host));
+  ACE::HTBP::Addr remote (remote_port,ACE_TEXT_TO_CHAR_IN(remote_host));
 
   ACE::HTBP::Session session(remote,
                            local,
diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp
index e28226fd838..2e9770429d3 100644
--- a/tests/Handle_Set_Test.cpp
+++ b/tests/Handle_Set_Test.cpp
@@ -244,3 +244,18 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+// The ACE_Node<ACE_INT32> instantation is in ace/Stats.cpp.
+template class ACE_Unbounded_Set<ACE_HANDLE>;
+template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
+# if defined(_CRAYMPP) \
+     || ((defined(ghs) || defined(__MINGW32__)) && defined (ACE_WIN32))
+// MPP Cray ACE_HANDLE is 64-bit, defined as int, but ACE_INT32 is short
+// so instantiation in ace/Stats.cpp isn't used in this case
+template class ACE_Node<ACE_HANDLE>;
+# endif
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+// The ACE_Node<ACE_INT32> instantation is in ace/Stats.cpp.
+#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp
index ab1cae561df..27004d20c95 100644
--- a/tests/Hash_Map_Bucket_Iterator_Test.cpp
+++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp
@@ -32,7 +32,7 @@ static ACE_UINT32 table_size = ACE_MAX_ITERATIONS;
 int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("t:i:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("t:i:"));
 
   int cc;
 
@@ -120,3 +120,22 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Hash_Map_Entry<ACE_UINT32, ACE_UINT32>;
+template class ACE_Hash_Map_Manager_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
+template class ACE_Hash_Map_Bucket_Iterator<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Hash_Map_Entry<ACE_UINT32, ACE_UINT32>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
+#pragma instantiate ACE_Hash_Map_Bucket_Iterator<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_SYNCH_NULL_MUTEX>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp
index ed22412a092..d5cbac6a890 100644
--- a/tests/Hash_Map_Manager_Test.cpp
+++ b/tests/Hash_Map_Manager_Test.cpp
@@ -39,6 +39,26 @@ typedef ACE_Hash_Map_Entry<const ACE_TCHAR *,
 static const size_t STRING_TABLE_SIZE =
   sizeof (HASH_STRING_ENTRY) * (STRING_TABLE_ENTRIES + MAX_HASH);
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Hash_Map_Entry<const ACE_TCHAR *, const ACE_TCHAR *>;
+template class ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Const_Iterator_Base_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Const_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>;
+template class ACE_Static_Allocator<STRING_TABLE_SIZE>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Hash_Map_Entry<const ACE_TCHAR *, const ACE_TCHAR *>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Const_Iterator_Base_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Const_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Static_Allocator<STRING_TABLE_SIZE>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 static ACE_Static_Allocator<STRING_TABLE_SIZE> ace_test_allocator;
 
 typedef ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *,
diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp
index 5398157d8d3..c0ab6b4352e 100644
--- a/tests/High_Res_Timer_Test.cpp
+++ b/tests/High_Res_Timer_Test.cpp
@@ -114,7 +114,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   u_int iterations = 1;
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("i:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  getopt (argc, argv, ACE_TEXT ("i:"));
   for (int c; (c = getopt ()) != -1; )
     switch (c)
       {
diff --git a/tests/INET_Addr_Test_IPV6.cpp b/tests/INET_Addr_Test_IPV6.cpp
index 134119ae7b9..b8694c208b8 100644
--- a/tests/INET_Addr_Test_IPV6.cpp
+++ b/tests/INET_Addr_Test_IPV6.cpp
@@ -139,7 +139,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
 #if defined (__linux__)
       // test a link local address to make sure the set_interface method works
       ACE_INET_Addr link_local_addr (80, LINK_LOCAL_ADDR);
-      if (0 != ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(link_local_addr.get_host_addr ()),
+      if (0 != ACE_OS::strcmp (ACE_TEXT_TO_TCHAR_IN(link_local_addr.get_host_addr ()),
                                LINK_LOCAL_ADDR))
         {
           ACE_ERROR ((LM_ERROR,
diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp
index cd3c42a46a0..0c2b5f0101a 100644
--- a/tests/IOStream_Test.cpp
+++ b/tests/IOStream_Test.cpp
@@ -189,7 +189,7 @@ client (void *arg = 0)
   // Send a string to the server which it can interpret as a qchar[]
   const char *str = "\"This is a test     string.\"";
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) Client Sending: (%s)\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (str)));
+              ACE_TEXT_TO_TCHAR_IN (str)));
   server << str << endl;
 
   // Allow the server to get the string and echo it to the user. (The
@@ -324,7 +324,7 @@ server (void *arg = 0)
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT (" (%P|%t) Server Received: (\"%s\")\n"),
-              ACE_TEXT_CHAR_TO_TCHAR ((char *) qbuf)));
+              ACE_TEXT_TO_TCHAR_IN ((char *) qbuf)));
 
   // Give the client time to announce the next test to the user.
   ACE_OS::sleep (2);
@@ -365,7 +365,7 @@ server (void *arg = 0)
         break;
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("%s "),
-                  ACE_TEXT_CHAR_TO_TCHAR (buf)));
+                  ACE_TEXT_TO_TCHAR_IN (buf)));
     }
 
   ACE_DEBUG ((LM_DEBUG,
@@ -500,3 +500,14 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+
+#if !defined (ACE_LACKS_ACE_IOSTREAM)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_IOStream<ACE_SOCK_Stream>;
+template class ACE_Streambuf_T<ACE_SOCK_Stream>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_IOStream<ACE_SOCK_Stream>
+#pragma instantiate ACE_Streambuf_T<ACE_SOCK_Stream>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#endif /* !ACE_LACKS_ACE_IOSTREAM */
diff --git a/tests/Lazy_Map_Manager_Test.cpp b/tests/Lazy_Map_Manager_Test.cpp
index d7434bbada0..0d6627d0d72 100644
--- a/tests/Lazy_Map_Manager_Test.cpp
+++ b/tests/Lazy_Map_Manager_Test.cpp
@@ -333,3 +333,34 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Map_Manager<int, int, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<int, int, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<int, int, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<int, int, ACE_Null_Mutex>;
+template class ACE_Map_Entry<int, int>;
+
+template class ACE_Active_Map_Manager<int>;
+template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, int, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, int, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, int, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, int, ACE_Null_Mutex>;
+template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, int>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Map_Manager<int, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator_Base<int, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator<int, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Reverse_Iterator<int, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Entry<int, int>
+
+#pragma instantiate ACE_Active_Map_Manager<int>
+#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, int, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, int>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Log_Msg_Test.cpp b/tests/Log_Msg_Test.cpp
index 3dac88cf9f0..1a8a6276c87 100644
--- a/tests/Log_Msg_Test.cpp
+++ b/tests/Log_Msg_Test.cpp
@@ -373,7 +373,7 @@ test_ostream (void)
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   // Create a persistent store.
   const ACE_TCHAR *filename = ACE_TEXT ("output");
-  ofstream myostream (ACE_TEXT_ALWAYS_CHAR (filename), ios::out | ios::trunc);
+  ofstream myostream (ACE_TEXT_TO_CHAR_IN (filename), ios::out | ios::trunc);
 
   // Check for errors.
   if (myostream.bad ())
@@ -605,3 +605,16 @@ run_main (int argc, ACE_TCHAR *argv[])
   return status;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+// Not necessary here, because it's instantiated in
+// ace/Memory_Pool.cpp.
+// template class ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+// Not necessary here, because it's instantiated in
+// ace/Memory_Pool.cpp.
+// #pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp
index 2a53c83606f..132c335e826 100644
--- a/tests/Logging_Strategy_Test.cpp
+++ b/tests/Logging_Strategy_Test.cpp
@@ -338,7 +338,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Specifications:\n")));
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("s:i:m:f:N:ow"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("s:i:m:f:N:ow"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp
index d581fd46180..5633691b0a8 100644
--- a/tests/MEM_Stream_Test.cpp
+++ b/tests/MEM_Stream_Test.cpp
@@ -469,7 +469,7 @@ run_main (int argc, ACE_TCHAR *argv[])
       ACE_OS::sprintf(lognm, ACE_TEXT ("MEM_Stream_Test-%d"), mypid);
       ACE_START_TEST (lognm);
 
-      ACE_Get_Opt opts (argc, argv, ACE_TEXT ("p:rm"));
+      ACE_Get_Arg_Opt<ACE_TCHAR>  opts (argc, argv, ACE_TEXT ("p:rm"));
       int opt, iport, status;
       ACE_MEM_IO::Signal_Strategy model = ACE_MEM_IO::Reactive;
 
@@ -502,14 +502,44 @@ run_main (int argc, ACE_TCHAR *argv[])
     }
 }
 
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Svc_Handler <ACE_MEM_STREAM, ACE_SYNCH>;
+template class ACE_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR>;
+template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>;
+template class ACE_Atomic_Op_Ex<ACE_SYNCH_MUTEX, u_short>;
+template class ACE_Singleton<ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Accept_Strategy<Echo_Handler, ACE_MEM_ACCEPTOR>;
+template class ACE_Creation_Strategy<Echo_Handler>;
+template class ACE_Reactive_Strategy<Echo_Handler>;
+template class ACE_Strategy_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR>;
+template class ACE_Concurrency_Strategy<Echo_Handler>;
+template class ACE_Scheduling_Strategy<Echo_Handler>;
+#  if defined (ACE_HAS_THREADS)
+template class ACE_Thread_Strategy<Echo_Handler>;
+#  endif /* ACE_HAS_THREADS */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Svc_Handler <ACE_MEM_STREAM, ACE_SYNCH>
+#pragma instantiate ACE_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR>
+#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_SYNCH_MUTEX, u_short>
+#pragma instantiate ACE_Singleton<ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>, ACE_SYNCH_RECURSIVE_MUTEX>
+#pragma instantiate ACE_Accept_Strategy<Echo_Handler, ACE_MEM_ACCEPTOR>
+#pragma instantiate ACE_Creation_Strategy<Echo_Handler>
+#pragma instantiate ACE_Reactive_Strategy<Echo_Handler>
+#pragma instantiate ACE_Strategy_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR>
+#pragma instantiate ACE_Concurrency_Strategy<Echo_Handler>
+#pragma instantiate ACE_Scheduling_Strategy<Echo_Handler>
+#  if defined (ACE_HAS_THREADS)
+#pragma instantiate ACE_Thread_Strategy<Echo_Handler>
+#  endif /* ACE_HAS_THREADS */
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 
 template ACE_Singleton<ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>,
                        ACE_SYNCH_RECURSIVE_MUTEX> *
   ACE_Singleton<ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>,
                 ACE_SYNCH_RECURSIVE_MUTEX>::singleton_;
 
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #else
 int
diff --git a/tests/MT_Reactor_Upcall_Test.cpp b/tests/MT_Reactor_Upcall_Test.cpp
index 49c203b5f2c..532fe5de17e 100644
--- a/tests/MT_Reactor_Upcall_Test.cpp
+++ b/tests/MT_Reactor_Upcall_Test.cpp
@@ -266,7 +266,7 @@ test_reactor_upcall (ACE_Reactor &reactor)
 int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("t:m:s:l:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("t:m:s:l:"));
 
   int c;
 
diff --git a/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/tests/MT_Reference_Counted_Event_Handler_Test.cpp
index f2e52a5c24f..ecb17a58fb5 100644
--- a/tests/MT_Reference_Counted_Event_Handler_Test.cpp
+++ b/tests/MT_Reference_Counted_Event_Handler_Test.cpp
@@ -1240,7 +1240,7 @@ test<REACTOR_IMPL>::test (int ignore_nested_upcalls,
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:f:g:k:l:m:n:o:uz:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("a:b:c:d:f:g:k:l:m:n:o:uz:"));
 
   int cc;
   while ((cc = get_opt ()) != -1)
@@ -1406,6 +1406,20 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class test<ACE_Select_Reactor>;
+template class test<ACE_TP_Reactor>;
+#if defined (ACE_WIN32)
+template class test<ACE_WFMO_Reactor>;
+#endif /* ACE_WIN32 */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate test<ACE_Select_Reactor>
+#pragma instantiate test<ACE_TP_Reactor>
+#if defined (ACE_WIN32)
+#pragma instantiate test<ACE_WFMO_Reactor>
+#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/MT_Reference_Counted_Notify_Test.cpp b/tests/MT_Reference_Counted_Notify_Test.cpp
index 713e81d6a5e..af073a99859 100644
--- a/tests/MT_Reference_Counted_Notify_Test.cpp
+++ b/tests/MT_Reference_Counted_Notify_Test.cpp
@@ -319,7 +319,7 @@ test<REACTOR_IMPLEMENTATION>::test (int extra_iterations_needed)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:e:f:g:z:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("a:b:c:d:e:f:g:z:"));
 
   int cc;
   while ((cc = get_opt ()) != -1)
@@ -445,6 +445,20 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class test<ACE_Select_Reactor>;
+template class test<ACE_TP_Reactor>;
+#if defined (ACE_WIN32)
+template class test<ACE_WFMO_Reactor>;
+#endif /* ACE_WIN32 */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate test<ACE_Select_Reactor>
+#pragma instantiate test<ACE_TP_Reactor>
+#if defined (ACE_WIN32)
+#pragma instantiate test<ACE_WFMO_Reactor>
+#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp
index eb407f5f596..dd44f380df0 100644
--- a/tests/MT_SOCK_Test.cpp
+++ b/tests/MT_SOCK_Test.cpp
@@ -236,8 +236,9 @@ server (void *arg)
           ++num_clients_connected;
 
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) server: Client %C connected from %d\n"),
-                      cli_addr.get_host_name (),
+
+        ACE_TEXT ("(%P|%t) server: Client %s connected from %d\n"),
+                      ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()),
                       cli_addr.get_port_number ()));
 
           // Enable non-blocking I/O.
diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp
index 23dec5e3800..5b41d37fde0 100644
--- a/tests/Malloc_Test.cpp
+++ b/tests/Malloc_Test.cpp
@@ -423,6 +423,34 @@ run_main (int argc, ACE_TCHAR *[])
     }
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
+template class auto_ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >;
+template class ACE_Auto_Basic_Ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >;
+#else
+template class auto_ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >;
+template class ACE_Auto_Basic_Ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >;
+#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
+template class ACE_Based_Pointer<Test_Data>;
+template class ACE_Based_Pointer_Basic<Test_Data>;
+template class ACE_Based_Pointer_Basic<long>;
+template class ACE_Based_Pointer_Basic<Long_Test>;
+template class ACE_Based_Pointer<Long_Test>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
+#pragma instantiate auto_ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >
+#pragma instantiate ACE_Auto_Basic_Ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >
+#else
+#pragma instantiate auto_ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >
+#pragma instantiate ACE_Auto_Basic_Ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >
+#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
+#pragma instantiate ACE_Based_Pointer<Test_Data>
+#pragma instantiate ACE_Based_Pointer_Basic<Test_Data>
+#pragma instantiate ACE_Based_Pointer_Basic<long>
+#pragma instantiate ACE_Based_Pointer_Basic<Long_Test>
+#pragma instantiate ACE_Based_Pointer<Long_Test>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Manual_Event_Test.cpp b/tests/Manual_Event_Test.cpp
index 1b28d846a71..4b70d2ef44e 100644
--- a/tests/Manual_Event_Test.cpp
+++ b/tests/Manual_Event_Test.cpp
@@ -74,7 +74,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:n:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("w:n:"));
 
   int c;
 
diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp
index 2f90f2bb16b..5287dd3d64d 100644
--- a/tests/Map_Manager_Test.cpp
+++ b/tests/Map_Manager_Test.cpp
@@ -954,3 +954,71 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+  // The explicit instantiations are necessary with g++ 2.91.66
+  // with -frepo, because it misses some of them.
+template class ACE_Pair<TYPE, ATTR>;
+template class ACE_Reference_Pair<TYPE, TYPE>;
+template class ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Entry<TYPE, TYPE>;
+template class ACE_Map_Manager<TYPE, TYPE, MUTEX>;
+template class ACE_Map_Iterator_Base<TYPE, TYPE, MUTEX>;
+template class ACE_Map_Iterator<TYPE, TYPE, MUTEX>;
+template class ACE_Map_Reverse_Iterator<TYPE, TYPE, MUTEX>;
+template class ACE_Map_Entry<TYPE, TYPE>;
+template class ACE_Active_Map_Manager<TYPE>;
+template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
+template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
+template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
+template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>;
+template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE>;
+template class ACE_Hash_Map_Manager_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>;
+template class ACE_Hash_Map_Entry<TYPE, ACE_Pair<TYPE, ATTR> >;
+template class ACE_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>;
+template class ACE_Null_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>;
+template class ACE_Null_Caching_Utility<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>;
+template class ACE_Null_Caching_Strategy<ATTR, NULL_UTILITY>;
+template class ACE_Hash_Cache_Map_Manager<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Manager<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Iterator<TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>;
+template class ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Pair<TYPE, ATTR>
+#pragma instantiate ACE_Reference_Pair<TYPE, TYPE>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<TYPE, TYPE>
+#pragma instantiate ACE_Map_Manager<TYPE, TYPE, MUTEX>
+#pragma instantiate ACE_Map_Iterator_Base<TYPE, TYPE, MUTEX>
+#pragma instantiate ACE_Map_Iterator<TYPE, TYPE, MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<TYPE, TYPE, MUTEX>
+#pragma instantiate ACE_Map_Entry<TYPE, TYPE>
+#pragma instantiate ACE_Active_Map_Manager<TYPE>
+#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, TYPE, MUTEX>
+#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, TYPE, MUTEX>
+#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>
+#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, ACE_Pair<TYPE, ATTR>, HASH_KEY, COMPARE_KEYS, MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<TYPE, ACE_Pair<TYPE, ATTR> >
+#pragma instantiate ACE_Null_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>
+#pragma instantiate ACE_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>
+#pragma instantiate ACE_Null_Caching_Utility<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>
+#pragma instantiate ACE_Null_Caching_Strategy<ATTR, NULL_UTILITY>
+#pragma instantiate ACE_Hash_Cache_Map_Manager<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Manager<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Iterator<TYPE, TYPE, CACHE_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
+#pragma instantiate ACE_Cache_Map_Reverse_Iterator<TYPE,TYPE, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp
index b27ef4083b3..8fb46dd983a 100644
--- a/tests/Map_Test.cpp
+++ b/tests/Map_Test.cpp
@@ -367,3 +367,116 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+// Common typedefs.
+typedef ACE_Pair<KEY, VALUE> ace_expanded_value;
+typedef ACE_Reference_Pair<const KEY, VALUE> ace_value_type;
+typedef ACE_Equal_To<KEY> COMPARE_KEYS;
+
+// Key related.
+template class ACE_Array<char>;
+template class ACE_Array_Base<char>;
+
+// Common
+template class ACE_Reference_Pair<const KEY, VALUE>;
+
+// Map and iterator classes.
+template class ACE_Map<KEY, VALUE>;
+template class ACE_Iterator<ace_value_type>;
+template class ACE_Reverse_Iterator<ace_value_type>;
+
+// Iterator base classes.
+template class ACE_Iterator_Impl<ace_value_type>;
+template class ACE_Reverse_Iterator_Impl<ace_value_type>;
+
+// Active Map Manager related.
+template class ACE_Pair<KEY, VALUE>;
+template class ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter>;
+template class ACE_Active_Map_Manager_Iterator_Adapter<ace_value_type, ace_expanded_value>;
+template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<ace_value_type, ace_expanded_value>;
+template class ACE_Active_Map_Manager<ace_expanded_value>;
+template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>;
+template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, ace_expanded_value>;
+
+// Hash Map Manager related.
+template class ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, COMPARE_KEYS, Key_Generator>;
+template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<ace_value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>;
+template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<ace_value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>;
+template class ACE_Hash_Map_Manager_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<KEY, VALUE>;
+template class ACE_Equal_To<KEY>;
+
+// Map Manager related.
+template class ACE_Map_Manager_Iterator_Adapter<ace_value_type, KEY, VALUE>;
+template class ACE_Map_Manager_Reverse_Iterator_Adapter<ace_value_type, KEY, VALUE>;
+template class ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator>;
+template class ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<KEY, VALUE, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex>;
+template class ACE_Map_Entry<KEY, VALUE>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+// Common typedefs.
+typedef ACE_Pair<KEY, VALUE> ace_expanded_value;
+typedef ACE_Reference_Pair<const KEY, VALUE> ace_value_type;
+typedef ACE_Equal_To<KEY> COMPARE_KEYS;
+
+// Key related.
+#pragma instantiate ACE_Array<char>
+#pragma instantiate ACE_Array_Base<char>
+
+// Common
+#pragma instantiate ACE_Reference_Pair<const KEY, VALUE>
+
+// Map and iterator classes.
+#pragma instantiate ACE_Map<KEY, VALUE>
+#pragma instantiate ACE_Iterator<ace_value_type>
+#pragma instantiate ACE_Reverse_Iterator<ace_value_type>
+
+// Iterator base classes.
+#pragma instantiate ACE_Iterator_Impl<ace_value_type>
+#pragma instantiate ACE_Reverse_Iterator_Impl<ace_value_type>
+
+// Active Map Manager related.
+#pragma instantiate ACE_Pair<KEY, VALUE>
+#pragma instantiate ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter>
+#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<ace_value_type, ace_expanded_value>
+#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<ace_value_type, ace_expanded_value>
+#pragma instantiate ACE_Active_Map_Manager<ace_expanded_value>
+#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, ace_expanded_value>
+
+// Hash Map Manager related.
+#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, COMPARE_KEYS, Key_Generator>
+#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<ace_value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>
+#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<ace_value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Entry<KEY, VALUE>
+#pragma instantiate ACE_Equal_To<KEY>
+
+// Map Manager related.
+#pragma instantiate ACE_Map_Manager_Iterator_Adapter<ace_value_type, KEY, VALUE>
+#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<ace_value_type, KEY, VALUE>
+#pragma instantiate ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator>
+#pragma instantiate ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator_Base<KEY, VALUE, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Entry<KEY, VALUE>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp
index 3757c3c9f2c..dd42dd8f61f 100644
--- a/tests/Message_Block_Test.cpp
+++ b/tests/Message_Block_Test.cpp
@@ -124,7 +124,7 @@ Worker_Task::svc (void)
       // message here.
       else if (length > 0)
         {
-          int current_count = ACE_OS::atoi (ACE_TEXT_CHAR_TO_TCHAR (mb->rd_ptr ()));
+          int current_count = ACE_OS::atoi (ACE_TEXT_TO_TCHAR_IN (mb->rd_ptr ()));
           int i;
 
           ACE_ASSERT (count == current_count);
@@ -166,7 +166,9 @@ Worker_Task::svc (void)
             {
               int deqresult = this->msg_queue ()->dequeue_head (dup);
               ACE_ASSERT (deqresult != -1);
-              ACE_ASSERT (count == ACE_OS::atoi (ACE_TEXT_CHAR_TO_TCHAR (dup->rd_ptr ())));
+              //ACE_ASSERT (this->msg_queue ()->dequeue_head (dup) != -1);
+              ACE_ASSERT (count == ACE_OS::atoi (ACE_TEXT_TO_TCHAR_IN (dup->rd_ptr ())));
+
               ACE_ASSERT (ACE_OS::strcmp (mb->rd_ptr (), dup->rd_ptr ()) == 0);
               ACE_ASSERT (dup->msg_priority () == ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY + 1);
               dup->release ();
@@ -285,6 +287,24 @@ alloc_struct_type alloc_struct[ACE_ALLOC_STRATEGY_NO] =
   { &mem_allocator, ACE_TEXT ("Cached Memory"), {0,0,0} }
 };
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    (defined (ACE_HAS_GNU_REPO) && !defined (ACE_VXWORKS))
+  // The explicit instantiations are necessary with g++ 2.91.66
+  // with -frepo, because it misses some of them.
+template class ACE_Cached_Allocator<MEMORY_CHUNK, ACE_SYNCH_MUTEX>;
+template class ACE_Cached_Mem_Pool_Node<MEMORY_CHUNK>;
+template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<MEMORY_CHUNK>, ACE_SYNCH_MUTEX>;
+template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<MEMORY_CHUNK> >;
+template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Cached_Allocator<MEMORY_CHUNK, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Cached_Mem_Pool_Node<MEMORY_CHUNK>
+#pragma instantiate ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<MEMORY_CHUNK>, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Free_List<ACE_Cached_Mem_Pool_Node<MEMORY_CHUNK> >
+#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
 #endif /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp
index 51fe8c261b3..ed78cfcc93e 100644
--- a/tests/Message_Queue_Notifications_Test.cpp
+++ b/tests/Message_Queue_Notifications_Test.cpp
@@ -365,3 +365,10 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>;
+template class ACE_Atomic_Op_Ex<ACE_SYNCH_MUTEX, int>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_SYNCH_MUTEX, int>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index 4198ca5b6fd..fc2b16b0d43 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -686,3 +686,6 @@ run_main (int argc, ACE_TCHAR *argv[])
   return status;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Message_Queue_Test_Ex.cpp b/tests/Message_Queue_Test_Ex.cpp
index 6306e8fc56a..176f452c5c2 100644
--- a/tests/Message_Queue_Test_Ex.cpp
+++ b/tests/Message_Queue_Test_Ex.cpp
@@ -321,3 +321,14 @@ run_main (int argc, ACE_TCHAR *argv[])
   return status;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Message_Queue_Ex<User_Class, ACE_NULL_SYNCH>;
+#if defined (ACE_HAS_THREADS)
+template class ACE_Message_Queue_Ex<User_Class, ACE_MT_SYNCH>;
+#endif /* ACE_HAS_THREADS */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Message_Queue_Ex<User_Class, ACE_NULL_SYNCH>
+#if defined (ACE_HAS_THREADS)
+#pragma instantiate ACE_Message_Queue_Ex<User_Class, ACE_MT_SYNCH>
+#endif /* ACE_HAS_THREADS */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp
index 8613c1a498b..f1dd8660e71 100644
--- a/tests/Multicast_Test.cpp
+++ b/tests/Multicast_Test.cpp
@@ -156,64 +156,64 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[])
   int retval = 0;
   int help = 0;
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT (":?"), 1, 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR>  getopt (argc, argv, ACE_TEXT (":?"), 1, 1);
 
   if (getopt.long_option (ACE_TEXT ("GroupStart"),
                           'g',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add GroupStart option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("Groups"),
                           'n',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add Groups option.\n")), 1);
 
   if (getopt.long_option (ACE_TEXT ("Debug"),
                           'd',
-                          ACE_Get_Opt::NO_ARG) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add Debug option.\n")), 1);
 
   if (getopt.long_option (ACE_TEXT ("Role"),
                           'r',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add Role option.\n")), 1);
 
   if (getopt.long_option (ACE_TEXT ("SDM_options"),
                           'm',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add Multicast_Options option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("Iterations"),
                           'i',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add iterations option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("TTL"),
                           't',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add TTL option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("Wait"),
                           'w',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add wait option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("help"),
                           'h',
-                          ACE_Get_Opt::NO_ARG) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add help option.\n")),
                       1);
@@ -928,6 +928,16 @@ run_main (int argc, ACE_TCHAR *argv[])
   return (retval == 0 && error == 0) ? 0 : 1;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Vector<ACE_CString *>;
+template class ACE_Array_Base<ACE_String_Base<char> *>;
+template class ACE_Array<ACE_String_Base<char> *>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Vector<ACE_CString *>
+#pragma instantiate ACE_Array_Base<ACE_String_Base<char> *>
+#pragma instantiate ACE_Array<ACE_String_Base<char> *>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Multicast_Test_IPV6.cpp b/tests/Multicast_Test_IPV6.cpp
index fd7d1705a92..baa7548569e 100644
--- a/tests/Multicast_Test_IPV6.cpp
+++ b/tests/Multicast_Test_IPV6.cpp
@@ -160,64 +160,64 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[])
   int retval = 0;
   int help = 0;
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT (":?"), 1, 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR>  getopt (argc, argv, ACE_TEXT (":?"), 1, 1);
 
   if (getopt.long_option (ACE_TEXT ("GroupStart"),
                           'g',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add GroupStart option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("Groups"),
                           'n',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add Groups option.\n")), 1);
 
   if (getopt.long_option (ACE_TEXT ("Debug"),
                           'd',
-                          ACE_Get_Opt::NO_ARG) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add Debug option.\n")), 1);
 
   if (getopt.long_option (ACE_TEXT ("Role"),
                           'r',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add Role option.\n")), 1);
 
   if (getopt.long_option (ACE_TEXT ("SDM_options"),
                           'm',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add Multicast_Options option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("Iterations"),
                           'i',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add iterations option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("TTL"),
                           't',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add TTL option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("Wait"),
                           'w',
-                          ACE_Get_Opt::ARG_REQUIRED) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add wait option.\n")),
                       1);
 
   if (getopt.long_option (ACE_TEXT ("help"),
                           'h',
-                          ACE_Get_Opt::NO_ARG) != 0)
+                          ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" Unable to add help option.\n")),
                       1);
@@ -987,6 +987,16 @@ run_main (int argc, ACE_TCHAR *argv[])
   return (retval == 0 && error == 0) ? 0 : 1;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Vector<ACE_CString *>;
+template class ACE_Array_Base<ACE_String_Base<char> *>;
+template class ACE_Array<ACE_String_Base<char> *>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Vector<ACE_CString *>
+#pragma instantiate ACE_Array_Base<ACE_String_Base<char> *>
+#pragma instantiate ACE_Array<ACE_String_Base<char> *>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Multihomed_INET_Addr_Test_IPV6.cpp b/tests/Multihomed_INET_Addr_Test_IPV6.cpp
index 1607dd81fb2..7427a757e0d 100644
--- a/tests/Multihomed_INET_Addr_Test_IPV6.cpp
+++ b/tests/Multihomed_INET_Addr_Test_IPV6.cpp
@@ -96,7 +96,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
     }
 
     // Check the primary address
-    if (0 != ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(addr.get_host_addr()), primary_ipv6))
+    if (0 != ACE_OS::strcmp (ACE_TEXT_TO_TCHAR_IN(addr.get_host_addr()), primary_ipv6))
       {
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("%s failed get_host_addr() check\n")
diff --git a/tests/Network_Adapters_Test.cpp b/tests/Network_Adapters_Test.cpp
index 882ac59118c..c8714a13b3e 100644
--- a/tests/Network_Adapters_Test.cpp
+++ b/tests/Network_Adapters_Test.cpp
@@ -939,7 +939,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       return 0;
     }
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("b:p:t:w:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("b:p:t:w:"));
   int c, counter = 0;
   ACE_INET_Addr b_temp_addr;
   ACE_TCHAR *token = 0;
diff --git a/tests/NonBlocking_Conn_Test.cpp b/tests/NonBlocking_Conn_Test.cpp
index 1b4dfa8a884..39d0d99ae46 100644
--- a/tests/NonBlocking_Conn_Test.cpp
+++ b/tests/NonBlocking_Conn_Test.cpp
@@ -168,7 +168,7 @@ test (ACE_Reactor_Impl *impl)
       else
         ACE_DEBUG ((LM_INFO,
                     ACE_TEXT ("%p\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (hosts[i])));
+                    ACE_TEXT_TO_TCHAR_IN (hosts[i])));
     }
 
   ACE_Reactor reactor (impl,
@@ -237,7 +237,7 @@ test (ACE_Reactor_Impl *impl)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("a:b:c:"));
 
   int cc;
   while ((cc = get_opt ()) != -1)
@@ -317,3 +317,14 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+template class ACE_Connector_Base<Svc_Handler>;
+template class ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_NonBlocking_Connect_Handler<Svc_Handler>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#pragma instantiate ACE_Connector_Base<Svc_Handler>
+#pragma instantiate ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_NonBlocking_Connect_Handler<Svc_Handler>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp
index b812630a065..101738b8b51 100644
--- a/tests/Notify_Performance_Test.cpp
+++ b/tests/Notify_Performance_Test.cpp
@@ -166,7 +166,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Notify_Performance_Test"));
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("pswdc:l:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  getopt (argc, argv, ACE_TEXT ("pswdc:l:"));
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -242,6 +242,18 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class auto_ptr<ACE_Reactor>;
+template class ACE_Auto_Basic_Ptr<ACE_Reactor>;
+template class auto_ptr<ACE_Reactor_Impl>;
+template class ACE_Auto_Basic_Ptr<ACE_Reactor_Impl>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate auto_ptr<ACE_Reactor>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Reactor>
+#pragma instantiate auto_ptr<ACE_Reactor_Impl>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Reactor_Impl>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp
index fa7b058e4e4..866ce0cd03d 100644
--- a/tests/OS_Test.cpp
+++ b/tests/OS_Test.cpp
@@ -284,7 +284,6 @@ string_emulation_test (void)
                                 "-4566733") == 0);
   }
 
-#if defined (ACE_HAS_WCHAR)
   {
     // ========================================================================
     // Test itoa (wchar_t version)
@@ -519,7 +518,6 @@ string_emulation_test (void)
 
 
   }
-#endif /* ACE_HAS_WCHAR */
 
   return 0;
 }
@@ -661,7 +659,6 @@ string_strsncpy_test (void)
 
   }
 
-#if defined (ACE_HAS_WCHAR)
   {
     // Test strsncpy (wchar_t version)
      ACE_DEBUG ((LM_DEBUG,
@@ -728,7 +725,6 @@ string_strsncpy_test (void)
     // size should be 9 (+ '\0' char)
     ACE_ASSERT(ACE_OS::strlen(strsncpy2) == 9);
   }
-#endif /* ACE_HAS_WCHAR */
 
   return 0;
 }
@@ -738,7 +734,6 @@ string_strsncpy_test (void)
 int
 string_convert_test (void)
 {
-#if defined (ACE_HAS_WCHAR)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing narrow/wide string conversion\n")));
 
@@ -749,28 +744,28 @@ string_convert_test (void)
   const wchar_t *test2_w = ACE_TEXT_WIDE ("\xe9\xe8\xe0\xf9\xea");
   wchar_t str_w[10];
   char str_n[10];
-  ACE_OS::strcpy (str_w, ACE_Ascii_To_Wide (test1_n).wchar_rep ());
+  ACE_OS::strcpy (str_w, ACE_TEXT_TO_WCHAR_IN (test1_n));
   if (0 != ACE_OS::strcmp (test1_w, str_w))
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Simple narrow->wide failed: ")
                   ACE_TEXT ("Expected \"%W\"; Got \"%W\"\n"), test1_w, str_w));
       result = 1;
     }
-  ACE_OS::strcpy (str_n, ACE_Wide_To_Ascii (test1_w).char_rep ());
+  ACE_OS::strcpy (str_n, ACE_TEXT_TO_CHAR_IN (test1_w));
   if (0 != ACE_OS::strcmp (test1_n, str_n))
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Simple wide->narrow failed: ")
                   ACE_TEXT ("Expected \"%C\"; Got \"%C\"\n"), test1_n, str_n));
       result = 1;
     }
-  ACE_OS::strcpy (str_w, ACE_Ascii_To_Wide (test2_n).wchar_rep ());
+  ACE_OS::strcpy (str_w, ACE_TEXT_TO_WCHAR_IN (test2_n));
   if (0 != ACE_OS::strcmp (test2_w, str_w))
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Complex narrow->wide failed: ")
                   ACE_TEXT ("Expected \"%W\"; Got \"%W\"\n"), test2_w, str_w));
       result = 1;
     }
-  ACE_OS::strcpy (str_n, ACE_Wide_To_Ascii (test2_w).char_rep ());
+  ACE_OS::strcpy (str_n, ACE_TEXT_TO_CHAR_IN (test2_w));
   if (0 != ACE_OS::strcmp (test2_n, str_n))
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Complex wide->narrow failed: ")
@@ -778,9 +773,6 @@ string_convert_test (void)
       result = 1;
     }
   return result;
-#else
-  return 0;
-#endif /* ACE_HAS_WCHAR */
 }
 
 // Test the methods for getting cpu info
diff --git a/tests/OrdMultiSet_Test.cpp b/tests/OrdMultiSet_Test.cpp
index 689cbd7d13c..59be5e0d43e 100644
--- a/tests/OrdMultiSet_Test.cpp
+++ b/tests/OrdMultiSet_Test.cpp
@@ -218,3 +218,16 @@ run_main (int, ACE_TCHAR *[])
   return ret;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Ordered_MultiSet<int>;
+template class ACE_Ordered_MultiSet_Iterator<int>;
+template class ACE_DNode<int>;
+
+#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Ordered_MultiSet<int>
+#pragma instantiate ACE_Ordered_MultiSet_Iterator<int>
+#pragma instantiate ACE_DNode<int>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp
index a00ca243da0..e942fc598fd 100644
--- a/tests/Pipe_Test.cpp
+++ b/tests/Pipe_Test.cpp
@@ -51,7 +51,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("dci:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT("dci:"));
 
   int c;
 
diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp
index b790b78b21c..6429de556da 100644
--- a/tests/Priority_Reactor_Test.cpp
+++ b/tests/Priority_Reactor_Test.cpp
@@ -238,7 +238,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Priority_Reactor_Test"));
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("dc:l:m:t:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  getopt (argc, argv, ACE_TEXT ("dc:l:m:t:"));
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -275,7 +275,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   // Note:  If opt_priority_reactor is false, the default ACE_Reactor is used
   // and we don't need to set one up.
   ACE_Reactor *orig_reactor = 0;
-  auto_ptr<ACE_Reactor> reactor;
+  auto_ptr<ACE_Reactor> reactor;  
 
   if (opt_priority_reactor)
     {
@@ -395,3 +395,24 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Connector_Base<Write_Handler>;
+template class ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>;
+template class auto_ptr<ACE_Reactor>;
+template class ACE_Auto_Basic_Ptr<ACE_Reactor>;
+template class auto_ptr<ACE_Select_Reactor>;
+template class ACE_Auto_Basic_Ptr<ACE_Select_Reactor>;
+template class ACE_NonBlocking_Connect_Handler<Write_Handler>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Connector_Base<Write_Handler>
+#pragma instantiate ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
+#pragma instantiate auto_ptr<ACE_Reactor>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Reactor>
+#pragma instantiate auto_ptr<ACE_Select_Reactor>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Select_Reactor>
+#pragma instantiate ACE_NonBlocking_Connect_Handler<Write_Handler>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Proactor_Scatter_Gather_Test.cpp b/tests/Proactor_Scatter_Gather_Test.cpp
index a3cbb335a34..d5fce3e9bf5 100644
--- a/tests/Proactor_Scatter_Gather_Test.cpp
+++ b/tests/Proactor_Scatter_Gather_Test.cpp
@@ -1323,7 +1323,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   if (argc == 1) // no arguments , so one button test
     return 0;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:csh:p:u"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("f:csh:p:u"));
   int c;
 
   while ((c = get_opt ()) != EOF)
@@ -1467,6 +1467,14 @@ run_main (int argc, ACE_TCHAR *argv[])
   return success;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Asynch_Acceptor<Receiver>;
+template class ACE_Asynch_Connector<Sender>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Asynch_Acceptor<Receiver>
+#pragma instantiate ACE_Asynch_Connector<Sender>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp
index 9d739b2d5e3..a463a264871 100644
--- a/tests/Proactor_Test.cpp
+++ b/tests/Proactor_Test.cpp
@@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num)
   if (this->open (1, 0, 1) != 0)
   {
      ACE_ERROR ((LM_ERROR,
-                 ACE_LIB_TEXT ("(%t) %p\n"),
-                 ACE_LIB_TEXT ("Connector::open failed")));
+                 ACE_TEXT ("(%t) %p\n"),
+                 ACE_TEXT ("Connector::open failed")));
      return rc;
   }
 
@@ -1799,7 +1799,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   if (argc == 1) // no arguments , so one button test
     return 0;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub"));
   int c;
 
   while ((c = get_opt ()) != EOF)
@@ -1918,6 +1918,26 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Asynch_Acceptor<Server>;
+template class ACE_Asynch_Connector<Client>;
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op<ACE_Thread_Mutex, size_t>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Asynch_Acceptor<Server>
+#pragma instantiate ACE_Asynch_Connector<Client>
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, size_t
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 
 int
diff --git a/tests/Proactor_Test_IPV6.cpp b/tests/Proactor_Test_IPV6.cpp
index 7ac9443d0ae..1c3deec2eb8 100644
--- a/tests/Proactor_Test_IPV6.cpp
+++ b/tests/Proactor_Test_IPV6.cpp
@@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num)
   if (this->open (1, 0, 1) != 0)
   {
      ACE_ERROR ((LM_ERROR,
-                 ACE_LIB_TEXT ("(%t) %p\n"),
-                 ACE_LIB_TEXT ("Connector::open failed")));
+                 ACE_TEXT ("(%t) %p\n"),
+                 ACE_TEXT ("Connector::open failed")));
      return rc;
   }
 
@@ -1843,7 +1843,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
   if (argc == 1) // no arguments , so one button test
     return 0;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub"));
   int c;
 
   while ((c = get_opt ()) != EOF)
@@ -1965,6 +1965,26 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Asynch_Acceptor<Server>;
+template class ACE_Asynch_Connector<Client>;
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op<ACE_Thread_Mutex, size_t>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Asynch_Acceptor<Server>
+#pragma instantiate ACE_Asynch_Connector<Client>
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, size_t>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, size_t>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 
 int
diff --git a/tests/Proactor_Timer_Test.cpp b/tests/Proactor_Timer_Test.cpp
index da61f142143..9b2e282fcab 100644
--- a/tests/Proactor_Timer_Test.cpp
+++ b/tests/Proactor_Timer_Test.cpp
@@ -112,7 +112,7 @@ test_registering_all_handlers (void)
 {
   ACE_Trace t (ACE_TEXT ("test_registering_all_handler"),
                __LINE__,
-               ACE_TEXT_CHAR_TO_TCHAR (__FILE__));
+               ACE_TEXT_TO_TCHAR_IN (__FILE__));
   Time_Handler rt[ACE_MAX_TIMERS];
   long t_id[ACE_MAX_TIMERS];
   size_t which[ACE_MAX_TIMERS];
@@ -138,7 +138,7 @@ test_registering_one_handler (void)
 {
   ACE_Trace t (ACE_TEXT ("test_registering_one_handler"),
                __LINE__,
-               ACE_TEXT_CHAR_TO_TCHAR (__FILE__));
+               ACE_TEXT_TO_TCHAR_IN (__FILE__));
   Time_Handler rt[ACE_MAX_TIMERS];
   long t_id[ACE_MAX_TIMERS];
   size_t which[ACE_MAX_TIMERS];
@@ -166,7 +166,7 @@ test_canceling_odd_timers (void)
 {
   ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"),
                __LINE__,
-               ACE_TEXT_CHAR_TO_TCHAR (__FILE__));
+               ACE_TEXT_TO_TCHAR_IN (__FILE__));
   Time_Handler rt[ACE_MAX_TIMERS];
   long t_id[ACE_MAX_TIMERS];
   size_t which[ACE_MAX_TIMERS];
diff --git a/tests/Process_Manager_Test.cpp b/tests/Process_Manager_Test.cpp
index 27150e6f848..81880b08584 100644
--- a/tests/Process_Manager_Test.cpp
+++ b/tests/Process_Manager_Test.cpp
@@ -105,7 +105,7 @@ const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE
 int
 run_main (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt args (argc, argv, ACE_TEXT ("d"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  args (argc, argv, ACE_TEXT ("d"));
 
   for (int arg = args (); arg != EOF; arg = args ())
     switch (arg)
diff --git a/tests/Process_Manual_Event_Test.cpp b/tests/Process_Manual_Event_Test.cpp
index b697743273b..bd7255912f2 100644
--- a/tests/Process_Manual_Event_Test.cpp
+++ b/tests/Process_Manual_Event_Test.cpp
@@ -53,7 +53,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:c"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("i:c"));
 
   int c;
 
diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp
index a7d75c4f75d..09d704e9079 100644
--- a/tests/Process_Mutex_Test.cpp
+++ b/tests/Process_Mutex_Test.cpp
@@ -51,7 +51,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("dcn:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT("dcn:"));
 
   int c;
 
diff --git a/tests/Process_Semaphore_Test.cpp b/tests/Process_Semaphore_Test.cpp
index af08108ad75..d1086485656 100644
--- a/tests/Process_Semaphore_Test.cpp
+++ b/tests/Process_Semaphore_Test.cpp
@@ -55,7 +55,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:c"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("i:c"));
 
   int c;
 
@@ -80,11 +80,11 @@ acquire_release (void)
 #if defined (ACE_WIN32) || \
       defined (ACE_USES_FIFO_SEM) || \
       (defined (ACE_HAS_POSIX_SEM) && !defined (ACE_LACKS_NAMED_POSIX_SEM))
-  ACE_Semaphore sema_ping (0, USYNC_PROCESS, ACE_TEXT_CHAR_TO_TCHAR (sema_ping_name));
-  ACE_Semaphore sema_pong (0, USYNC_PROCESS, ACE_TEXT_CHAR_TO_TCHAR (sema_pong_name));
+  ACE_Semaphore sema_ping (0, USYNC_PROCESS, ACE_TEXT_TO_TCHAR_IN (sema_ping_name));
+  ACE_Semaphore sema_pong (0, USYNC_PROCESS, ACE_TEXT_TO_TCHAR_IN (sema_pong_name));
 #else
-  ACE_Process_Semaphore sema_ping (0, ACE_TEXT_CHAR_TO_TCHAR (sema_ping_name));
-  ACE_Process_Semaphore sema_pong (0, ACE_TEXT_CHAR_TO_TCHAR (sema_pong_name));
+  ACE_Process_Semaphore sema_ping (0, ACE_TEXT_TO_TCHAR_IN (sema_ping_name));
+  ACE_Process_Semaphore sema_pong (0, ACE_TEXT_TO_TCHAR_IN (sema_pong_name));
 #endif
 
   // Make sure the constructor succeeded
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index aca7cc2e7de..ced790b6020 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -62,12 +62,42 @@ ACE_RCSID(tests, Process_Strategy_Test, "$Id$")
 #define ACE_LACKS_FORK
 #endif /* __hpux */
 
-#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Accept_Strategy<Counting_Service, ACE_SOCK_ACCEPTOR>;
+template class ACE_Acceptor<Counting_Service, ACE_SOCK_ACCEPTOR>;
+template class ACE_Creation_Strategy<Counting_Service>;
+template class ACE_Concurrency_Strategy<Counting_Service>;
+template class ACE_Guard<ACE_File_Lock>;
+template class ACE_Singleton<Options, ACE_Null_Mutex>;
+template class ACE_Process_Strategy<Counting_Service>;
+template class ACE_Thread_Strategy<Counting_Service>;
+template class ACE_Reactive_Strategy<Counting_Service>;
+template class ACE_Read_Guard<ACE_File_Lock>;
+template class ACE_Scheduling_Strategy<Counting_Service>;
+template class ACE_Strategy_Acceptor<Counting_Service, ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+template class ACE_Write_Guard<ACE_File_Lock>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Accept_Strategy<Counting_Service, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Acceptor<Counting_Service, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Creation_Strategy<Counting_Service>
+#pragma instantiate ACE_Concurrency_Strategy<Counting_Service>
+#pragma instantiate ACE_Guard<ACE_File_Lock>
+#pragma instantiate ACE_Singleton<Options, ACE_Null_Mutex>
+#pragma instantiate ACE_Process_Strategy<Counting_Service>
+#pragma instantiate ACE_Thread_Strategy<Counting_Service>
+#pragma instantiate ACE_Reactive_Strategy<Counting_Service>
+#pragma instantiate ACE_Read_Guard<ACE_File_Lock>
+#pragma instantiate ACE_Scheduling_Strategy<Counting_Service>
+#pragma instantiate ACE_Strategy_Acceptor<Counting_Service, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#pragma instantiate ACE_Write_Guard<ACE_File_Lock>
+#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 
 template ACE_Singleton<Options, ACE_Null_Mutex> *
   ACE_Singleton<Options, ACE_Null_Mutex>::singleton_;
 
-#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // Define a <Strategy_Acceptor> that's parameterized by the
 // <Counting_Service>.
@@ -169,7 +199,7 @@ Options::~Options (void)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:c:f:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("p:c:f:"));
 
   // - 26 is for the "process_strategy_test_temp" that is appended
   if (ACE::get_temp_dir (this->filename_, MAXPATHLEN - 26) == -1)
@@ -416,7 +446,7 @@ Counting_Service::handle_input (ACE_HANDLE)
                   bytes,
                   this->peer ().get_handle (),
                   bytes,
-                  ACE_TEXT_CHAR_TO_TCHAR (buf)));
+                  ACE_TEXT_TO_TCHAR_IN (buf)));
       // Read and return the current value in the file.
       if (ACE_OS::strncmp (buf,
                            "read",
@@ -581,7 +611,7 @@ client (void *arg)
       // the call to ACE_OS::strrchr ().
       buf [bytes_read] = '\0';
 
-      size_t count = ACE_OS::atoi (ACE_OS::strrchr (ACE_TEXT_CHAR_TO_TCHAR (buf),
+      size_t count = ACE_OS::atoi (ACE_OS::strrchr (ACE_TEXT_TO_TCHAR_IN (buf),
                                                     ACE_TEXT (' ')));
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/tests/RB_Tree_Test.cpp b/tests/RB_Tree_Test.cpp
index c276a96cafd..6c9891f1624 100644
--- a/tests/RB_Tree_Test.cpp
+++ b/tests/RB_Tree_Test.cpp
@@ -595,3 +595,71 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_ite
 }
 
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_RB_Tree<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Node<ACE_CString, int>;
+template class ACE_RB_Tree_Iterator_Base<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Iterator<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Reverse_Iterator<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Test<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Node<int, int>;
+template class ACE_RB_Tree_Iterator_Base<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Test<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Node<int, const char *>;
+template class ACE_RB_Tree_Iterator_Base<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Iterator<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Reverse_Iterator<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Test<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Node<const char *, int>;
+template class ACE_RB_Tree_Iterator_Base<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Iterator<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Reverse_Iterator<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Test<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Node<const char *, const char *>;
+template class ACE_RB_Tree_Iterator_Base<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Iterator<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Reverse_Iterator<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_Less_Than<int>;
+template class ACE_Less_Than<ACE_CString>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_RB_Tree<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Node<ACE_CString, int>
+#pragma instantiate ACE_RB_Tree_Iterator_Base<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Iterator<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Reverse_Iterator<ACE_CString, int, ACE_Less_Than<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Test<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Node<int, int>
+#pragma instantiate ACE_RB_Tree_Iterator_Base<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Test<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Node<int, const char *>
+#pragma instantiate ACE_RB_Tree_Iterator_Base<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Iterator<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Test<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Node<const char *, int>
+#pragma instantiate ACE_RB_Tree_Iterator_Base<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Iterator<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Test<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Node<const char *, const char *>
+#pragma instantiate ACE_RB_Tree_Iterator_Base<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Iterator<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Less_Than<int>
+#pragma instantiate ACE_Less_Than<ACE_CString>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Reactor_Dispatch_Order_Test.cpp b/tests/Reactor_Dispatch_Order_Test.cpp
index d6263f091d3..91dfd8ad060 100644
--- a/tests/Reactor_Dispatch_Order_Test.cpp
+++ b/tests/Reactor_Dispatch_Order_Test.cpp
@@ -143,7 +143,9 @@ Handler::handle_input (ACE_HANDLE fd)
   ACE_ASSERT (result == ssize_t (ACE_OS::strlen (message)));
   buffer[result] = '\0';
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Handler::handle_input: %C\n"), buffer));
+  ACE_DEBUG ((LM_DEBUG,
+              "Handler::handle_input: %s\n",
+              ACE_TEXT_TO_TCHAR_IN (buffer)));
 
   ACE_ASSERT (ACE_OS::strcmp (buffer,
                               message) == 0);
diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp
index a24bf4770a8..115712ad4b4 100644
--- a/tests/Reactor_Notify_Test.cpp
+++ b/tests/Reactor_Notify_Test.cpp
@@ -491,3 +491,18 @@ run_main (int, ACE_TCHAR *[])
   return test_result;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class auto_ptr<Purged_Notify>;
+template class auto_ptr<ACE_Reactor>;
+template class auto_ptr<ACE_Select_Reactor>;
+template class ACE_Auto_Basic_Ptr<Purged_Notify>;
+template class ACE_Auto_Basic_Ptr<ACE_Reactor>;
+template class ACE_Auto_Basic_Ptr<ACE_Select_Reactor>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate auto_ptr<Purged_Notify>
+#pragma instantiate auto_ptr<ACE_Reactor>
+#pragma instantiate auto_ptr<ACE_Select_Reactor>
+#pragma instantiate ACE_Auto_Basic_Ptr<Purged_Notify>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Reactor>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Select_Reactor>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index 7d5aacc6456..4733c30ec42 100644
--- a/tests/Reactor_Performance_Test.cpp
+++ b/tests/Reactor_Performance_Test.cpp
@@ -315,7 +315,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Reactor_Performance_Test"));
 
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("dswc:l:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR>  getopt (argc, argv, ACE_TEXT ("dswc:l:"), 1);
   for (int c; (c = getopt ()) != -1; )
     switch (c)
       {
@@ -403,6 +403,34 @@ run_main (int argc, ACE_TCHAR *argv[])
   return status;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Connector_Base<Write_Handler>;
+template class ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>;
+template class auto_ptr<ACE_Reactor>;
+template class ACE_Auto_Basic_Ptr<ACE_Reactor>;
+template class auto_ptr<ACE_Reactor_Impl>;
+template class ACE_Auto_Basic_Ptr<ACE_Reactor_Impl>;
+template class ACE_NonBlocking_Connect_Handler<Write_Handler>;
+template class ACE_Auto_Basic_Array_Ptr <Write_Handler *>;
+template class ACE_Auto_Basic_Array_Ptr <ACE_INET_Addr>;
+template class ACE_Auto_Array_Ptr <ACE_INET_Addr>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Connector_Base<Write_Handler>
+#pragma instantiate ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
+#pragma instantiate auto_ptr<ACE_Reactor>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Reactor>
+#pragma instantiate auto_ptr<ACE_Reactor_Impl>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Reactor_Impl>
+#pragma instantiate ACE_NonBlocking_Connect_Handler<Write_Handler>
+#pragma instantiate ACE_Auto_Basic_Array_Ptr <Write_Handler *>
+#pragma instantiate ACE_Auto_Basic_Array_Ptr <ACE_INET_Addr>
+#pragma instantiate ACE_Auto_Array_Ptr <ACE_INET_Addr>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Reactor_Timer_Test.cpp b/tests/Reactor_Timer_Test.cpp
index 2225fd2fd31..dac6cb25142 100644
--- a/tests/Reactor_Timer_Test.cpp
+++ b/tests/Reactor_Timer_Test.cpp
@@ -129,7 +129,7 @@ test_registering_all_handlers (void)
 {
   ACE_Trace t (ACE_TEXT ("test_registering_all_handler"),
                __LINE__,
-               ACE_TEXT_CHAR_TO_TCHAR (__FILE__));
+               ACE_TEXT_TO_TCHAR_IN (__FILE__));
   Time_Handler rt[ACE_MAX_TIMERS];
   long t_id[ACE_MAX_TIMERS];
 
@@ -152,7 +152,7 @@ test_registering_one_handler (void)
 {
   ACE_Trace t (ACE_TEXT ("test_registering_one_handler"),
                __LINE__,
-               ACE_TEXT_CHAR_TO_TCHAR (__FILE__));
+               ACE_TEXT_TO_TCHAR_IN (__FILE__));
   Time_Handler rt[ACE_MAX_TIMERS];
   long t_id[ACE_MAX_TIMERS];
 
@@ -177,7 +177,7 @@ test_canceling_odd_timers (void)
 {
   ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"),
                __LINE__,
-               ACE_TEXT_CHAR_TO_TCHAR (__FILE__));
+               ACE_TEXT_TO_TCHAR_IN (__FILE__));
   Time_Handler rt[ACE_MAX_TIMERS];
   long t_id[ACE_MAX_TIMERS];
 
@@ -214,7 +214,7 @@ test_resetting_timer_intervals (void)
 {
   ACE_Trace t (ACE_TEXT ("test_resetting_timer_intervals"),
                __LINE__,
-               ACE_TEXT_CHAR_TO_TCHAR (__FILE__));
+               ACE_TEXT_TO_TCHAR_IN (__FILE__));
   Time_Handler rt;
   long t_id;
 
diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp
index f1daf382a18..9cbc60a0b66 100644
--- a/tests/Reactors_Test.cpp
+++ b/tests/Reactors_Test.cpp
@@ -198,6 +198,14 @@ worker (void *args)
   ACE_NOTREACHED (return 0);
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp
index 4c18681d8f9..7e1dcfdebb4 100644
--- a/tests/Reader_Writer_Test.cpp
+++ b/tests/Reader_Writer_Test.cpp
@@ -76,7 +76,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:w:n:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("r:w:n:"));
 
   int c;
 
@@ -246,6 +246,20 @@ writer (void *)
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+template class ACE_Read_Guard<ACE_RW_Mutex>;
+template class ACE_Write_Guard<ACE_RW_Mutex>;
+template class ACE_Guard<ACE_RW_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Read_Guard<ACE_RW_Mutex>
+#pragma instantiate ACE_Write_Guard<ACE_RW_Mutex>
+#pragma instantiate ACE_Guard<ACE_RW_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
 // Spawn off threads.
diff --git a/tests/Recursive_Condition_Bug_Test.cpp b/tests/Recursive_Condition_Bug_Test.cpp
index f74e9ac94e0..1a58d39484a 100644
--- a/tests/Recursive_Condition_Bug_Test.cpp
+++ b/tests/Recursive_Condition_Bug_Test.cpp
@@ -189,3 +189,8 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Recursive_Condition_Test.cpp b/tests/Recursive_Condition_Test.cpp
index 5576b2cf674..02643995d7c 100644
--- a/tests/Recursive_Condition_Test.cpp
+++ b/tests/Recursive_Condition_Test.cpp
@@ -306,3 +306,8 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Refcounted_Auto_Ptr_Test.cpp b/tests/Refcounted_Auto_Ptr_Test.cpp
index e463afe276e..89841f0b6d5 100644
--- a/tests/Refcounted_Auto_Ptr_Test.cpp
+++ b/tests/Refcounted_Auto_Ptr_Test.cpp
@@ -37,7 +37,7 @@ Printer::Printer (const char *message)
   : message_ (message)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Creating Printer object\n")));
+              ACE_TEXT ("(%t) Creating Printer object\n")));
   ++Printer::instance_count_;
 }
 
@@ -45,15 +45,15 @@ Printer::~Printer (void)
 {
   --Printer::instance_count_;
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Deleting Printer object\n")));
+              ACE_TEXT ("(%t) Deleting Printer object\n")));
 }
 
 void
 Printer::print (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) %s\n"),
-              ACE_TEXT_CHAR_TO_TCHAR(this->message_)));
+              ACE_TEXT ("(%t) %s\n"),
+              ACE_TEXT_TO_TCHAR_IN(this->message_)));
 }
 
 #if defined (ACE_HAS_THREADS)
@@ -129,18 +129,18 @@ Method_Request_print::Method_Request_print (Scheduler *new_scheduler,
     printer_ (printer)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Method_Request_print created\n")));
+              ACE_TEXT ("(%t) Method_Request_print created\n")));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Printer reference count: %d\n"),
+              ACE_TEXT ("(%t) Printer reference count: %d\n"),
               printer_.count ()));
 }
 
 Method_Request_print::~Method_Request_print (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Method_Request_print will be deleted.\n")));
+              ACE_TEXT ("(%t) Method_Request_print will be deleted.\n")));
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Printer reference count: %d\n"),
+              ACE_TEXT ("(%t) Printer reference count: %d\n"),
               printer_.count ()));
 }
 
@@ -199,7 +199,7 @@ Scheduler::Scheduler (Scheduler *new_scheduler)
   : activation_queue_ (msg_queue ()), scheduler_ (new_scheduler)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Scheduler created\n")));
+              ACE_TEXT ("(%t) Scheduler created\n")));
 }
 
 // Destructor
@@ -207,7 +207,7 @@ Scheduler::Scheduler (Scheduler *new_scheduler)
 Scheduler::~Scheduler (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Scheduler will be destroyed\n")));
+              ACE_TEXT ("(%t) Scheduler will be destroyed\n")));
 }
 
 // open
@@ -216,7 +216,7 @@ int
 Scheduler::open (void *)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Scheduler open\n")));
+              ACE_TEXT ("(%t) Scheduler open\n")));
   // Become an Active Object.
   int num_threads = 3;
   return this->activate (THR_BOUND | THR_JOINABLE, num_threads);
@@ -227,7 +227,7 @@ Scheduler::open (void *)
 int
 Scheduler::close (u_long)
 {
-  ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) rundown\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) rundown\n")));
   return 0;
 }
 
@@ -244,13 +244,13 @@ Scheduler::svc (void)
       if (0 == mo_p)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_LIB_TEXT ("(%t) activation queue shut down\n")));
+                      ACE_TEXT ("(%t) activation queue shut down\n")));
           break;
         }
       auto_ptr<ACE_Method_Request> mo (mo_p);
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_LIB_TEXT ("(%t) calling method request\n")));
+                  ACE_TEXT ("(%t) calling method request\n")));
       // Call it.
       if(mo->call () == -1)
         break;
@@ -280,12 +280,39 @@ Scheduler::print (Printer_var &printer)
 // Total number of loops.
 static int n_loops = 10;
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Refcounted_Auto_Ptr<Printer, ACE_Thread_Mutex>;
+template class ACE_Auto_Basic_Ptr<Printer>;
+template class ACE_Auto_Basic_Ptr<Scheduler>;
+template class auto_ptr<Scheduler>;
+template class auto_ptr<ACE_Method_Request>;
+template class ACE_Auto_Basic_Ptr<ACE_Method_Request>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Refcounted_Auto_Ptr<Printer, ACE_Thread_Mutex>
+#pragma instantiate ACE_Auto_Basic_Ptr<Printer>
+#pragma instantiate ACE_Auto_Basic_Ptr<Scheduler>
+#pragma instantiate auto_ptr<Scheduler>
+#pragma instantiate auto_ptr<ACE_Method_Request>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Method_Request>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Refcounted_Auto_Ptr<Printer, ACE_Null_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Refcounted_Auto_Ptr<Printer, ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
 int
 run_main (int, ACE_TCHAR *[])
 {
-  ACE_START_TEST (ACE_LIB_TEXT ("Refcounted_Auto_Ptr_Test"));
+  ACE_START_TEST (ACE_TEXT ("Refcounted_Auto_Ptr_Test"));
 
 
   // =========================================================================
@@ -293,7 +320,7 @@ run_main (int, ACE_TCHAR *[])
   // thread of control, hence we use the ACE_Null_Mutex
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) performing synchronous test...\n")));
+              ACE_TEXT ("(%t) performing synchronous test...\n")));
 
   Printer *printer1;
   ACE_NEW_RETURN (printer1,
@@ -309,7 +336,7 @@ run_main (int, ACE_TCHAR *[])
     ACE_Refcounted_Auto_Ptr<Printer, ACE_Null_Mutex> r6 = r1;
   }
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Printer instance count is %d, expecting 0\n"),
+              ACE_TEXT ("(%t) Printer instance count is %d, expecting 0\n"),
               Printer::instance_count_));
   ACE_ASSERT (Printer::instance_count_ == 0);
 
@@ -320,7 +347,7 @@ run_main (int, ACE_TCHAR *[])
   // threads of control.
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) performing asynchronous test...\n")));
+              ACE_TEXT ("(%t) performing asynchronous test...\n")));
 
   Scheduler *scheduler_ptr;
 
@@ -352,7 +379,7 @@ run_main (int, ACE_TCHAR *[])
   scheduler->wait ();
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_LIB_TEXT ("(%t) Printer instance count is %d, expecting 0\n"),
+              ACE_TEXT ("(%t) Printer instance count is %d, expecting 0\n"),
               Printer::instance_count_));
   ACE_ASSERT (Printer::instance_count_ == 0);
 
diff --git a/tests/Reference_Counted_Event_Handler_Test.cpp b/tests/Reference_Counted_Event_Handler_Test.cpp
index 1e947135d6d..2fab565a5d5 100644
--- a/tests/Reference_Counted_Event_Handler_Test.cpp
+++ b/tests/Reference_Counted_Event_Handler_Test.cpp
@@ -890,7 +890,7 @@ test<REACTOR_IMPLEMENTATION>::test (void)
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:f:g:h:i:k:l:m:z:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("a:b:c:f:g:h:i:k:l:m:z:"));
 
   int cc;
   while ((cc = get_opt ()) != -1)
@@ -1013,3 +1013,16 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class test<ACE_Select_Reactor>;
+template class test<ACE_TP_Reactor>;
+#if defined (ACE_WIN32)
+template class test<ACE_WFMO_Reactor>;
+#endif /* ACE_WIN32 */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate test<ACE_Select_Reactor>
+#pragma instantiate test<ACE_TP_Reactor>
+#if defined (ACE_WIN32)
+#pragma instantiate test<ACE_WFMO_Reactor>
+#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Reverse_Lock_Test.cpp b/tests/Reverse_Lock_Test.cpp
index 5ee08dafbee..7cc83e5e929 100644
--- a/tests/Reverse_Lock_Test.cpp
+++ b/tests/Reverse_Lock_Test.cpp
@@ -46,3 +46,14 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Reverse_Lock<ACE_SYNCH_MUTEX>;
+template class ACE_Guard<REVERSE_MUTEX>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Guard<REVERSE_MUTEX>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp
index 0eee2d171d3..229bac706fd 100644
--- a/tests/SOCK_Connector_Test.cpp
+++ b/tests/SOCK_Connector_Test.cpp
@@ -93,7 +93,7 @@ find_another_host (ACE_TCHAR other_host[])
         ACE_OS::strcpy (other_host, ACE_LOCALHOST);
       else
         // Use me if can't find another
-        ACE_OS::strcpy (other_host, ACE_TEXT_CHAR_TO_TCHAR (h->h_name));
+        ACE_OS::strcpy (other_host, ACE_TEXT_TO_TCHAR_IN (h->h_name));
 
       // @@ We really need to add wrappers for these hostent methods.
 
@@ -114,7 +114,7 @@ find_another_host (ACE_TCHAR other_host[])
       while ((h = gethostent ()) != 0)
         {
           if (ACE_OS::strcmp (h->h_name,
-                              ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0)
+                              ACE_TEXT_TO_CHAR_IN (ACE_DEFAULT_SERVER_HOST)) == 0)
             continue;
           // AIX just _has_ to be different
           if (ACE_OS::strcmp (h->h_name, "loopback") == 0)
@@ -122,11 +122,11 @@ find_another_host (ACE_TCHAR other_host[])
 
           // If not me.
           if (ACE_OS::strcmp
-                (h->h_name, ACE_TEXT_ALWAYS_CHAR (other_host)) != 0
+                (h->h_name, ACE_TEXT_TO_CHAR_IN (other_host)) != 0
               && ACE_OS::strcmp (h->h_name, un.nodename) != 0)
             {
                ACE_OS::strcpy (candidate[candidate_count].host_name,
-                               ACE_TEXT_CHAR_TO_TCHAR (h->h_name));
+                               ACE_TEXT_TO_TCHAR_IN (h->h_name));
                if (++candidate_count >= MAX_CANDIDATES)
                  break;
             }
diff --git a/tests/SOCK_Dgram_Bcast_Test.cpp b/tests/SOCK_Dgram_Bcast_Test.cpp
index fc8149bce3c..7300801c6f2 100644
--- a/tests/SOCK_Dgram_Bcast_Test.cpp
+++ b/tests/SOCK_Dgram_Bcast_Test.cpp
@@ -216,7 +216,7 @@ int run_main (int argc, ACE_TCHAR *argv[])
   int opt             = 0;
   int auto_test_recv  = 0;
   int result          = 0;
-  ACE_Get_Opt opts (argc, argv, ACE_TEXT ("p:t:n:sra"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  opts (argc, argv, ACE_TEXT ("p:t:n:sra"));
   while ((opt = opts ()) != -1)
     switch (opt)
       {
diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp
index f971c98e65b..3366be73b58 100644
--- a/tests/SOCK_Send_Recv_Test.cpp
+++ b/tests/SOCK_Send_Recv_Test.cpp
@@ -81,7 +81,7 @@ client (void *arg)
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) connected to %s\n"),
-              ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ())));
+              ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ())));
 
   //*******************   TEST 1   ******************************
   //
@@ -208,7 +208,7 @@ server (void *arg)
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) client %s connected from %d\n"),
-              ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()),
+              ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()),
               cli_addr.get_port_number ()));
 
   //*******************   TEST 1   ******************************
diff --git a/tests/SOCK_Send_Recv_Test_IPV6.cpp b/tests/SOCK_Send_Recv_Test_IPV6.cpp
index b630ffb00ec..5626671fb27 100644
--- a/tests/SOCK_Send_Recv_Test_IPV6.cpp
+++ b/tests/SOCK_Send_Recv_Test_IPV6.cpp
@@ -76,7 +76,7 @@ client (void *arg)
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) connected to %s\n"),
-              ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ())));
+              ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ())));
 
   //*******************   TEST 1   ******************************
   //
@@ -203,7 +203,7 @@ server (void *arg)
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("(%P|%t) client %s connected from %d\n"),
-              ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()),
+              ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()),
               cli_addr.get_port_number ()));
 
   //*******************   TEST 1   ******************************
diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp
index 6472711a857..2cd92351063 100644
--- a/tests/SOCK_Test.cpp
+++ b/tests/SOCK_Test.cpp
@@ -63,7 +63,7 @@ client (void *arg)
         ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("connection failed")), 0);
       else
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ())));
+                    ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ())));
     }
 
   if (cli_stream.disable (ACE_NONBLOCK) == -1)
@@ -141,7 +141,7 @@ server (void *arg)
   while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1)
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), cli_addr.get_port_number ()));
+                  ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ()));
 
       // Enable non-blocking I/O.
       if (new_stream.enable (ACE_NONBLOCK) == -1)
diff --git a/tests/SOCK_Test_IPv6.cpp b/tests/SOCK_Test_IPv6.cpp
index 08950687fcf..31082bb9e97 100644
--- a/tests/SOCK_Test_IPv6.cpp
+++ b/tests/SOCK_Test_IPv6.cpp
@@ -64,7 +64,7 @@ client (void *arg)
         ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("connection failed")), 0);
       else
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ())));
+                    ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ())));
     }
 
   if (cli_stream.disable (ACE_NONBLOCK) == -1)
@@ -142,7 +142,7 @@ server (void *arg)
   while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1)
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), cli_addr.get_port_number ()));
+                  ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ()));
 
       // Enable non-blocking I/O.
       if (new_stream.enable (ACE_NONBLOCK) == -1)
diff --git a/tests/SSL/Makefile.am b/tests/SSL/Makefile.am
index 86283019e5e..d4dcc3ab929 100644
--- a/tests/SSL/Makefile.am
+++ b/tests/SSL/Makefile.am
@@ -31,21 +31,6 @@ Thread_Pool_Reactor_SSL_Test_SOURCES = \
 Thread_Pool_Reactor_SSL_Test_LDADD = \
  $(top_builddir)/ace/SSL/libACE_SSL.la $(top_builddir)/tests/libTest_Output.la $(top_builddir)/ace/libACE.la @ACE_TLS_LDFLAGS@ @ACE_TLS_LIBS@
 
-noinst_PROGRAMS += SSL_Asynch_Stream_Test
-
-SSL_Asynch_Stream_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  @ACE_TLS_CPPFLAGS@ \
-  -DACE_HAS_SSL=1
-
-SSL_Asynch_Stream_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  SSL_Asynch_Stream_Test.cpp
-
-SSL_Asynch_Stream_Test_LDADD = \
- $(top_builddir)/ace/SSL/libACE_SSL.la $(top_builddir)/tests/libTest_Output.la $(top_builddir)/ace/libACE.la @ACE_TLS_LDFLAGS@ @ACE_TLS_LIBS@
-
 endif BUILD_SSL
 
 ## Clean up template repositories, etc.
diff --git a/tests/SSL/SSL_Asynch_Stream_Test.cpp b/tests/SSL/SSL_Asynch_Stream_Test.cpp
deleted file mode 100644
index 58556a44f0b..00000000000
--- a/tests/SSL/SSL_Asynch_Stream_Test.cpp
+++ /dev/null
@@ -1,478 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests/SSL
-//
-// = FILENAME
-//    SSL_Asynch_Stream_Test.cpp
-//
-// = DESCRIPTION
-//      This program is a functionality test of ACE_SSL_Asynch_Stream.
-//      It demonstrates one proper use case of ACE_SSL_Asynch_Stream in the
-//      Proactor framework and validates its basic functionality.
-//
-//      Usage: SSL_Asynch_Stream_Test [-r <hostname:port#>]
-//                [-t <num threads>] [-d <delay>]
-//                [-i <client conn attempt#>] [-n <client request# per conn>]
-//
-//      Default value:
-//          <hostname:port#>:       ACE_DEFAULT_SERVER_HOST:ACE_DEFAULT_PORT
-//          <num threads>:          ACE_MAX_THREADS
-//          <client conn attempt#>: ACE_MAX_ITERATIONS
-//          <client req# per conn>: 20
-//          <delay>:                0 usec
-//
-// = AUTHOR
-//      Steve Huston <shuston@riverace.com>
-//
-// ============================================================================
-
-#include "tests/test_config.h"
-#include "ace/Default_Constants.h"
-#include "ace/OS_NS_string.h"
-#include "ace/Event_Handler.h"
-#include "ace/Get_Opt.h"
-#include "ace/Proactor.h"
-#include "ace/Reactor.h"
-#include "ace/Thread_Manager.h"
-#include "ace/INET_Addr.h"
-#include "ace/SSL/SSL_Asynch_Stream.h"
-#include "ace/SSL/SSL_SOCK_Connector.h"
-#include "ace/SSL/SSL_SOCK_Acceptor.h"
-#include "ace/SSL/SSL_SOCK_Stream.h"
-
-ACE_RCSID(tests, SSL_Asynch_Stream_Test, "$Id$")
-
-#if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-  // This only works on Win32 platforms and on Unix platforms
-  // supporting POSIX aio calls.
-
-class Client_Handler : public ACE_Handler
-{
-public:
-  Client_Handler ()
-    : msgs_sent_ (0),
-      stream_ (ACE_SSL_Asynch_Stream::ST_CLIENT),
-      block_ (1024) {}
-  ~Client_Handler ();
-
-  int open (ACE_HANDLE);
-
-private:
-  virtual void handle_write_stream (const ACE_SSL_Asynch_Write_Stream_Result &result);
-
-private:
-  size_t                  msgs_sent_;
-  ACE_SSL_Asynch_Stream   stream_;
-  ACE_Message_Block       block_;
-};
-
-class Server_Handler : public ACE_Handler
-{
-public:
-  Server_Handler ()
-    : msgs_rcvd_ (0),
-      stream_ (ACE_SSL_Asynch_Stream::ST_SERVER),
-      block_ (1024) {}
-  ~Server_Handler ();
-
-  int open (ACE_HANDLE);
-
-private:
-  virtual void handle_read_stream (const ACE_SSL_Asynch_Read_Stream_Result &result);
-
-private:
-  size_t                  msgs_rcvd_;
-  ACE_SSL_Asynch_Stream   stream_;
-  ACE_Message_Block       block_;
-};
-
-class Server_Acceptor : public ACE_Event_Handler
-{
-public:
-  int open (const ACE_INET_Addr &listen_addr);
-
-  // Called when a new connection is ready to accept.
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask close_mask);
-
-private:
-  ACE_SSL_SOCK_Acceptor acceptor_;
-};
-
-// Accepting end point.  This is actually "localhost:10010", but some
-// platform couldn't resolve the name so we use the IP address
-// directly here.
-static const ACE_TCHAR *rendezvous = \
-  ACE_DEFAULT_SERVER_HOST ACE_TEXT (":") ACE_DEFAULT_SERVER_PORT_STR;
-
-// Total number of proactor threads.
-static size_t num_threads = ACE_MAX_THREADS;
-
-#if defined (CHORUS) // Add platforms that can't handle too many
-                     // connection simultaneously here.
-#define ACE_LOAD_FACTOR /2
-#else
-#define ACE_LOAD_FACTOR
-#endif
-
-// Number of client connections to attempt.
-static size_t cli_conn_no = ACE_MAX_ITERATIONS ACE_LOAD_FACTOR;
-
-// Number of requests each client connection sends.
-static size_t cli_req_no = ACE_MAX_THREADS ACE_LOAD_FACTOR;
-
-// Delay before a thread sending the next request (in msec.)
-static int req_delay = 0;
-
-// This is the string sent from client to server.
-static const char *test_string = "SSL_Asynch_Stream_Test!";
-
-static void
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("r:t:d:i:n:"));
-
-  int c;
-
-  while ((c = getopt ()) != -1)
-    {
-      switch (c)
-        {
-        case 'r':                   // hostname:port
-          rendezvous = getopt.opt_arg ();
-          break;
-        case 't':
-          num_threads = ACE_OS::atoi (getopt.opt_arg ());
-          break;
-        case 'd':
-          req_delay = ACE_OS::atoi (getopt.opt_arg ());
-          break;
-        case 'i':
-          cli_conn_no = ACE_OS::atoi (getopt.opt_arg ());
-          break;
-        case 'n':
-          cli_req_no = ACE_OS::atoi (getopt.opt_arg ());
-          break;
-        default:
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Usage: %s [-r <hostname:port#>]")
-                      ACE_TEXT ("\t[-t <nr threads>] [-d <delay>]")
-                      ACE_TEXT ("\t[-i <client conn attempt#>]")
-                      ACE_TEXT ("\t[-n <client request# per conn>]\n"),
-                      argv[0]));
-          break;
-        }
-    }
-}
-
-Client_Handler::~Client_Handler ()
-{
-  if (this->stream_.handle () != ACE_INVALID_HANDLE)
-    {
-      if (this->msgs_sent_ != cli_req_no)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%t) Client handle %d sent %d messages; ")
-                    ACE_TEXT ("expected %d\n"),
-                    this->stream_.handle (),
-                    this->msgs_sent_,
-                    cli_req_no));
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Client handle %d sent %d messages; ")
-                    ACE_TEXT ("closing connection\n"),
-                    this->stream_.handle (),
-                    cli_req_no));
-    }
-  this->stream_.close ();
-}
-
-int
-Client_Handler::open (ACE_HANDLE handle)
-{
-  if (this->stream_.open (*this, handle) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) Client_Handler: %p\n"),
-                       ACE_TEXT ("open")),
-                      -1);
-  this->block_.copy (test_string);
-  if (this->stream_.write (this->block_, this->block_.length ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) Client_Handler: %p\n"),
-                       ACE_TEXT ("initiate write")),
-                      -1);
-  return 0;
-}
-
-void
-Client_Handler::handle_write_stream
-  (const ACE_SSL_Asynch_Write_Stream_Result &result)
-{
-  if (!result.success ())
-    {
-      errno = result.error ();
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%t) Client handle %d: %p\n"),
-                  this->stream_.handle (),
-                  ACE_TEXT ("write")));
-      delete this;
-      return;
-    }
-  ACE_Message_Block &b = result.message_block ();
-  bool send_again = true;
-  if (b.length () == 0)
-    {
-      // All block's data sent; rewind the read pointer and send it again
-      // until we've sent the configured number of times.
-      ++this->msgs_sent_;
-      if (this->msgs_sent_ == cli_req_no)
-        send_again = false;   // All done
-      else
-        b.rd_ptr (b.base ());
-    }
-
-  if (send_again)
-    {
-      if (this->stream_.write (this->block_, this->block_.length ()) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%t) Client_Handler: %p\n"),
-                      ACE_TEXT ("initiate write")));
-          delete this;
-        }
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) Client handle %d done sending\n"),
-                  this->stream_.handle ()));
-      delete this;
-    }
-  return;
-}
-
-Server_Handler::~Server_Handler ()
-{
-  if (this->stream_.handle () != ACE_INVALID_HANDLE)
-    {
-      if (this->msgs_rcvd_ != cli_req_no)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%t) Server handle %d received %d messages; ")
-                    ACE_TEXT ("expected %d\n"),
-                    this->stream_.handle (),
-                    this->msgs_rcvd_,
-                    cli_req_no));
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%t) Server handle %d received %d messages; ")
-                    ACE_TEXT ("closing connection\n"),
-                    this->stream_.handle (),
-                    cli_req_no));
-    }
-  this->stream_.close ();
-}
-
-int
-Server_Handler::open (ACE_HANDLE handle)
-{
-  if (this->stream_.open (*this, handle) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) Server_Handler: %p\n"),
-                       ACE_TEXT ("open")),
-                      -1);
-  if (this->stream_.read (this->block_, this->block_.space () - 1) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) Server_Handler: %p\n"),
-                       ACE_TEXT ("read")),
-                      -1);
-  return 0;
-}
-
-void
-Server_Handler::handle_read_stream
-  (const ACE_SSL_Asynch_Read_Stream_Result &result)
-{
-  if (!result.success ())
-    {
-      errno = result.error ();
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%t) Server handle %d: %p\n"),
-                  this->stream_.handle (),
-                  ACE_TEXT ("read")));
-      delete this;
-      return;
-    }
-  if (result.bytes_transferred () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) Server handle %d closed by peer\n"),
-                  this->stream_.handle ()));
-      delete this;
-      return;
-    }
-
-  // Scan through the received data for the expected string. There may be
-  // multiples and/or partials. Count up how many arrive before the connection
-  // is closed.
-  // The read operation left one byte space at the end so we can insert a
-  // nul terminator to ease scanning.
-  ACE_Message_Block &b = result.message_block ();
-  *(b.wr_ptr ()) = '\0';
-  size_t test_string_len = ACE_OS::strlen (test_string);
-  while (b.length () >= test_string_len)
-    {
-      if (0 != ACE_OS::strncmp (b.rd_ptr (), test_string, test_string_len))
-        ACE_ERROR_BREAK ((LM_ERROR,
-                          ACE_TEXT ("(%t) Read string: %C; expected: %C\n"),
-                          b.rd_ptr (),
-                          test_string));
-      b.rd_ptr (test_string_len);
-    }
-  b.crunch ();
-  if (this->stream_.read (b, b.space () - 1) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%t) Server_Handler: %p\n"),
-                  ACE_TEXT ("read")));
-      delete this;
-    }
-  return;
-}
-
-
-int
-Server_Acceptor::open (const ACE_INET_Addr &listen_addr)
-{
-  if (this->acceptor_.open (listen_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("listen")),
-                      -1);
-  return 0;
-}
-
-int
-Server_Acceptor::handle_input (ACE_HANDLE)
-{
-  ACE_SSL_SOCK_Stream new_stream;
-  if (this->acceptor_.accept (new_stream) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) %p\n"),
-                       ACE_TEXT ("accept")),
-                      -1);
-  Server_Handler *new_handler = 0;
-  ACE_NEW_RETURN (new_handler, Server_Handler, -1);
-  if (new_handler->open (new_stream.get_handle ()) != 0)
-    delete new_handler;
-
-  return 0;
-}
-
-int
-Server_Acceptor::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  this->acceptor_.close ();
-  return 0;
-}
-
-
-static ACE_THR_FUNC_RETURN
-proactor_loop (void *)
-{
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Start handling events.\n")));
-
-  int result =
-    ACE_Proactor::instance ()->proactor_run_event_loop ();
-  if (result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%t) %p\n"),
-                       ACE_TEXT ("Error handling events")),
-                      0);
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Done handling events.\n")));
-
-  return 0;
-}
-
-static ACE_THR_FUNC_RETURN
-start_clients (void *)
-{
-  // Client thread function.
-  ACE_INET_Addr addr (rendezvous);
-  ACE_SSL_SOCK_Stream stream;
-  ACE_SSL_SOCK_Connector connect;
-
-  for (size_t i = 0 ; i < cli_conn_no; i++)
-    {
-      if (connect.connect (stream, addr) < 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%t) %p\n"),
-                      ACE_TEXT ("connect")));
-          continue;
-        }
-
-      Client_Handler *new_handler = 0;
-      ACE_NEW_RETURN (new_handler, Client_Handler, (ACE_THR_FUNC_RETURN)-1);
-      if (new_handler->open (stream.get_handle ()) != 0)
-        delete new_handler;
-      stream.set_handle (ACE_INVALID_HANDLE);
-    }
-
-  return 0;
-}
-
-int
-run_main (int argc, ACE_TCHAR *argv[])
-{
-  ACE_START_TEST (ACE_TEXT ("SSL_Asynch_Stream_Test"));
-
-  ACE_SSL_Context *context = ACE_SSL_Context::instance ();
-  // Note - the next two strings are naked on purpose... the arguments to
-  // the ACE_SSL_Context methods are const char *, not ACE_TCHAR *.
-  context->certificate ("dummy.pem", SSL_FILETYPE_PEM);
-  context->private_key ("key.pem", SSL_FILETYPE_PEM);
-
-  parse_args (argc, argv);
-
-  Server_Acceptor acceptor;
-  ACE_INET_Addr accept_addr (rendezvous);
-
-  if (acceptor.open (accept_addr) == -1)
-    return 1;
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Listening at %s\n"), rendezvous));
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Spawning %d proactor threads\n"),
-              num_threads));
-  ACE_Thread_Manager::instance ()->spawn_n (num_threads, proactor_loop);
-  ACE_Thread_Manager::instance ()->spawn (start_clients);
-
-  ACE_Time_Value loop_limit (20);
-  ACE_Reactor::instance ()->run_reactor_event_loop (loop_limit);
-  ACE_Thread_Manager::instance ()->wait ();
-
-  // Check for num connections up/down.
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("SSL_Asynch_Stream_Test"));
-
-  ACE_ERROR ((LM_INFO,
-              ACE_TEXT ("This test requires threads and AIO which are not ")
-              ACE_TEXT ("supported on this platform\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-#endif /* ACE_HAS_THREADS && (WIN32 || AIO) */
diff --git a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
index 290bf83592f..6a9a8ebf740 100644
--- a/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
+++ b/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
@@ -337,6 +337,24 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Accept_Strategy<Request_Handler, ACE_SSL_SOCK_ACCEPTOR>;
+template class ACE_Concurrency_Strategy<Request_Handler>;
+template class ACE_Creation_Strategy<Request_Handler>;
+template class ACE_Scheduling_Strategy<Request_Handler>;
+template class ACE_Acceptor<Request_Handler, ACE_SSL_SOCK_ACCEPTOR>;
+template class ACE_Strategy_Acceptor<Request_Handler, ACE_SSL_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, ACE_MT_SYNCH>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate  ACE_Accept_Strategy<Request_Handler, ACE_SSL_SOCK_ACCEPTOR>
+#pragma instantiate  ACE_Concurrency_Strategy<Request_Handler>
+#pragma instantiate  ACE_Creation_Strategy<Request_Handler>
+#pragma instantiate  ACE_Scheduling_Strategy<Request_Handler>
+#pragma instantiate  ACE_Acceptor<Request_Handler, ACE_SSL_SOCK_ACCEPTOR>
+#pragma instantiate  ACE_Strategy_Acceptor<Request_Handler, ACE_SSL_SOCK_ACCEPTOR>
+#pragma instantiate  ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, ACE_MT_SYNCH>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 ACE_TMAIN (int, ACE_TCHAR *[])
diff --git a/tests/SSL/tests.mpc b/tests/SSL/tests.mpc
index c49e4d746a5..f27c4041968 100644
--- a/tests/SSL/tests.mpc
+++ b/tests/SSL/tests.mpc
@@ -1,13 +1,6 @@
 //  -*- MPC -*-
 // $Id$
 
-project(SSL Asynch_Stream Test) : acetest, ssl {
-  exename = SSL_Asynch_Stream_Test
-  Source_Files {
-    SSL_Asynch_Stream_Test.cpp
-  }
-}
-
 project(Thread Pool Reactor SSL Test) : acetest, ssl {
   exename = Thread_Pool_Reactor_SSL_Test
   Source_Files {
diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp
index 7486e2d2b5b..a6be520d300 100644
--- a/tests/SString_Test.cpp
+++ b/tests/SString_Test.cpp
@@ -26,7 +26,6 @@
 ACE_RCSID(tests, SString_Test, "$Id$")
 
 static int testConcatenation() {
-#ifdef ACE_HAS_WCHAR
   ACE_WString s1;
   s1 += L'H';
   if (s1 != ACE_WString(L"H")) {
@@ -62,7 +61,6 @@ static int testConcatenation() {
     ACE_ERROR((LM_ERROR, "Concat wchar_t 2\n"));
     return 1;
   }
-#endif /* ACE_HAS_WCHAR */
   return 0;
 }
 
@@ -211,7 +209,7 @@ run_main (int, ACE_TCHAR *[])
     ACE_NS_WString s5 = s1 + " " + s2;
     ACE_NS_WString s6 = ("hella"); // Same length as s1, off by one char.
 
-    ACE_WCHAR_T single_character = 'z';
+    wchar_t single_character = 'z';
     ACE_NS_WString single_character_string (single_character);
 
     ACE_NS_WString empty_string;
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index 55770a532dd..e2527eae9e2 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -132,6 +132,21 @@ child (char *shm)
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple>;
+template class ACE_Malloc_T<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple, ACE_Control_Block>;
+template class ACE_Malloc_Lock_Adapter_T<ACE_SV_Semaphore_Simple>;
+template class ACE_Guard<ACE_SV_Semaphore_Simple>;
+template class ACE_Write_Guard<ACE_SV_Semaphore_Simple>;
+template class ACE_Read_Guard<ACE_SV_Semaphore_Simple>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple>
+#pragma instantiate ACE_Malloc_T<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple, ACE_Control_Block>
+#pragma instantiate ACE_Malloc_Lock_Adapter_T<ACE_SV_Semaphore_Simple>
+#pragma instantiate ACE_Guard<ACE_SV_Semaphore_Simple>
+#pragma instantiate ACE_Write_Guard<ACE_SV_Semaphore_Simple>
+#pragma instantiate ACE_Read_Guard<ACE_SV_Semaphore_Simple>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_SYSV_IPC */
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp
index e2b82042559..0f68bb0f2a4 100644
--- a/tests/Semaphore_Test.cpp
+++ b/tests/Semaphore_Test.cpp
@@ -119,7 +119,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("s:w:n:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("s:w:n:"));
 
   int c;
 
diff --git a/tests/Signal_Test.cpp b/tests/Signal_Test.cpp
index 330ce322c37..37df30dbb19 100644
--- a/tests/Signal_Test.cpp
+++ b/tests/Signal_Test.cpp
@@ -127,12 +127,6 @@ synchronous_signal_handler (void *)
   else
     sigset.sig_add (SIGHUP);
 
-  // block signal to prevent delivery to default handler
-  // (at least necessary on linux and solaris; POSIX spec also
-  //  states that signal(s) should be blocked before call to
-  //  sigwait())
-  ACE_Sig_Guard hupguard (&sigset);
-
   for (;;)
     {
       // Block waiting for SIGINT, SIGTERM, or SIGHUP, depending on
@@ -292,7 +286,7 @@ worker_parent (void *arg)
     while (shut_down == 0)
       {
         // Wait for a signal to arrive.
-        if (ACE_OS::sigsuspend (0) == -1 && errno != EINTR)
+        if (ACE_OS::sigsuspend (0) == -1)
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%P|%t) %p\n"),
                       ACE_TEXT ("sigsuspend")));
@@ -374,7 +368,7 @@ run_test (ACE_THR_FUNC worker,
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:chp:t:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("i:chp:t:"));
 
   int c;
 
@@ -449,6 +443,8 @@ run_main (int argc, ACE_TCHAR *argv[])
       // of Linux threads...
       parent_pid = ACE_OS::getpid ();
 
+#if !defined (linux)
+      // Linux threads don't support this use-case very well.
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) **** test 1: handle signals synchronously in a separate thread\n")));
 
@@ -456,6 +452,10 @@ run_main (int argc, ACE_TCHAR *argv[])
       // Run the parent logic for the signal test, first by handling
       // signals synchronously in a separate thread.
       run_test (worker_parent, 1L, 1L);
+#else
+      // Must increment anyhow.
+      test_number++;
+#endif /* linux */
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) **** test 2: handle signals synchronously in this thread\n")));
@@ -481,7 +481,7 @@ int
 run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Signal_Test"));
-  ACE_ERROR ((LM_INFO,
+  ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("The Unix Signals capability is not supported on this platform\n")));
   ACE_END_TEST;
   return 0;
diff --git a/tests/Simple_Message_Block_Test.cpp b/tests/Simple_Message_Block_Test.cpp
index 6a7eb841240..788ab0fff3e 100644
--- a/tests/Simple_Message_Block_Test.cpp
+++ b/tests/Simple_Message_Block_Test.cpp
@@ -213,3 +213,8 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp
index c36d8483e08..4c9e36e70dc 100644
--- a/tests/Svc_Handler_Test.cpp
+++ b/tests/Svc_Handler_Test.cpp
@@ -40,23 +40,23 @@ run_test (SVC_HANDLER &svc_handler,
     {
       ACE_Message_Block *mb;
       ACE_NEW (mb,
-               ACE_Message_Block (sizeof (ACE_LIB_TEXT("hello "))));
+               ACE_Message_Block (sizeof (ACE_TEXT("hello "))));
 
       ACE_Message_Block *cb1;
       ACE_NEW (cb1,
-               ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n"))));
+               ACE_Message_Block (sizeof (ACE_TEXT("there\n"))));
 
       ACE_Message_Block *cb2;
       ACE_NEW (cb2,
-               ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n"))));
+               ACE_Message_Block (sizeof (ACE_TEXT("there\n"))));
 
       mb->copy ("hello ",
-                ACE_OS::strlen (ACE_LIB_TEXT("hello ")));
+                ACE_OS::strlen (ACE_TEXT("hello ")));
       cb1->copy ("there ",
-                 ACE_OS::strlen (ACE_LIB_TEXT("there ")));
+                 ACE_OS::strlen (ACE_TEXT("there ")));
       mb->cont (cb1);
       cb2->copy ("doug\n",
-                ACE_OS::strlen (ACE_LIB_TEXT("doug\n")));
+                ACE_OS::strlen (ACE_TEXT("doug\n")));
       cb1->cont (cb2);
 
       // Note that this is a buffered call!
@@ -132,15 +132,15 @@ run_main (int argc, ACE_TCHAR *argv[])
 
     ACE_FILE_Info info;
     file_io.get_info (info);
-    ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("file size = %d\n"), info.size_));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT("file size = %d\n"), info.size_));
 
     for (ssize_t n_bytes; (n_bytes = file_io.recv (buf, ACE_MAXLOGMSGLEN)) > 0; )
       {
         buf[n_bytes] = '\0';
-        ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s"), ACE_TEXT_CHAR_TO_TCHAR(buf)));
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%s"), ACE_TEXT_TO_TCHAR_IN(buf)));
       }
 
-    ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n")));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n")));
 
     file_io.close ();
 
@@ -155,3 +155,10 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Buffered_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH>;
+template class ACE_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Buffered_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH>
+#pragma instantiate ACE_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/TP_Reactor_Test.cpp b/tests/TP_Reactor_Test.cpp
index 91d2b43812f..2039f6de3e8 100644
--- a/tests/TP_Reactor_Test.cpp
+++ b/tests/TP_Reactor_Test.cpp
@@ -1072,7 +1072,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       return 0;
     }
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:n:p:d:h:s:v:ub"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("i:n:p:d:h:s:v:ub"));
   int c;
 
   while ((c = get_opt ()) != EOF)
@@ -1144,6 +1144,24 @@ disable_signal (int sigmin, int sigmax)
   return 1;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_NonBlocking_Connect_Handler<Sender>;
+template class ACE_Connector_Base<Sender>;
+template class ACE_Connector<Sender,ACE_SOCK_CONNECTOR>;
+template class ACE_Acceptor<Receiver,ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_MT_SYNCH>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_NonBlocking_Connect_Handler<Sender>
+#pragma instantiate ACE_Connector_Base<Sender>
+#pragma instantiate ACE_Connector<Sender,ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Acceptor<Receiver,ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_MT_SYNCH>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp
index b805f5bcf0a..641bbcd9423 100644
--- a/tests/TSS_Test.cpp
+++ b/tests/TSS_Test.cpp
@@ -248,6 +248,17 @@ worker (void *c)
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_TSS<Errno>;
+template class ACE_TSS_Type_Adapter<u_int>;
+template class ACE_TSS<ACE_TSS_Type_Adapter<u_int> >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_TSS<Errno>
+#pragma instantiate ACE_TSS_Type_Adapter<u_int>
+#pragma instantiate ACE_TSS<ACE_TSS_Type_Adapter<u_int> >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
 #endif /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/Task_Ex_Test.cpp b/tests/Task_Ex_Test.cpp
index 98cc6926cf7..efa01f9ba86 100644
--- a/tests/Task_Ex_Test.cpp
+++ b/tests/Task_Ex_Test.cpp
@@ -120,6 +120,15 @@ ACE_THR_FUNC_RETURN producer (void *arg)
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Task_Ex <ACE_MT_SYNCH, User_Defined_Msg>;
+template class ACE_Message_Queue_Ex <User_Defined_Msg, ACE_MT_SYNCH>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Task_Ex <ACE_MT_SYNCH, User_Defined_Msg>
+#pragma instantiate ACE_Message_Queue_Ex <User_Defined_Msg, ACE_MT_SYNCH>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
 #endif /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp
index 3502fea9e3b..73feac26709 100644
--- a/tests/Test_Output.cpp
+++ b/tests/Test_Output.cpp
@@ -60,7 +60,7 @@ ACE_Test_Output::~ACE_Test_Output (void)
   if (this->output_file_ == log_msg_stream)
     delete this->output_file_;
   // else something else changed the stream and hence should
-  // have closed and deleted the output_file_
+  // have closed and deleted the output_file_ 
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 }
 
@@ -101,7 +101,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 */
@@ -145,7 +145,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;
@@ -171,7 +171,7 @@ void
 ACE_Test_Output::close (void)
 {
   if (this->output_file_ &&
-      (this->output_file_ == ACE_LOG_MSG->msg_ostream ()))
+      (this->output_file_ == ACE_LOG_MSG->msg_ostream ())) 
   {
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
     this->output_file_->flush ();
@@ -185,7 +185,7 @@ ACE_Test_Output::close (void)
     ACE_LOG_MSG->msg_ostream (this->output_file_, 0);
   }
   // else something else changed the stream and hence should
-  // have closed and deleted the output_file_
+  // have closed and deleted the output_file_ 
 }
 
 ACE_Test_Output*
@@ -250,3 +250,8 @@ randomize (int array[], size_t size)
     }
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+   template class ACE_Framework_Component_T<ACE_Test_Output>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate ACE_Framework_Component_T<ACE_Test_Output>;
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Thread_Pool_Reactor_Resume_Test.cpp b/tests/Thread_Pool_Reactor_Resume_Test.cpp
index 327ef0bc917..c90984ba302 100644
--- a/tests/Thread_Pool_Reactor_Resume_Test.cpp
+++ b/tests/Thread_Pool_Reactor_Resume_Test.cpp
@@ -84,7 +84,7 @@ static int req_delay = 50;
 static void
 parse_arg (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:"));
 
   int c;
 
@@ -376,6 +376,26 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Accept_Strategy<Request_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Concurrency_Strategy<Request_Handler>;
+template class ACE_Creation_Strategy<Request_Handler>;
+template class ACE_Scheduling_Strategy<Request_Handler>;
+template class ACE_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>;
+template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate  ACE_Accept_Strategy<Request_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate  ACE_Concurrency_Strategy<Request_Handler>
+#pragma instantiate  ACE_Creation_Strategy<Request_Handler>
+#pragma instantiate  ACE_Scheduling_Strategy<Request_Handler>
+#pragma instantiate  ACE_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate  ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate  ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
+#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp
index ff0c3098e80..309dd126cc3 100644
--- a/tests/Thread_Pool_Reactor_Test.cpp
+++ b/tests/Thread_Pool_Reactor_Test.cpp
@@ -87,7 +87,7 @@ static int req_delay = 50;
 static void
 parse_arg (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:"));
 
   int c;
 
@@ -329,6 +329,24 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Accept_Strategy<Request_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Concurrency_Strategy<Request_Handler>;
+template class ACE_Creation_Strategy<Request_Handler>;
+template class ACE_Scheduling_Strategy<Request_Handler>;
+template class ACE_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate  ACE_Accept_Strategy<Request_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate  ACE_Concurrency_Strategy<Request_Handler>
+#pragma instantiate  ACE_Creation_Strategy<Request_Handler>
+#pragma instantiate  ACE_Scheduling_Strategy<Request_Handler>
+#pragma instantiate  ACE_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate  ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate  ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index 498404273ac..f6a649aa8ab 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -396,6 +396,12 @@ Thread_Pool::test_empty_message_shutdown (void)
     }
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
 int
diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp
index 2935aca22bd..2ec6c5c597c 100644
--- a/tests/Timeprobe_Test.cpp
+++ b/tests/Timeprobe_Test.cpp
@@ -122,3 +122,13 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if !defined (ACE_HAS_PURIFY)
+# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Singleton <int, ACE_SYNCH_RECURSIVE_MUTEX>;
+# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#   pragma instantiate ACE_Singleton <int, ACE_SYNCH_RECURSIVE_MUTEX>
+# elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
+    template ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX> *
+      ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_;
+# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ! ACE_HAS_PURIFY */
diff --git a/tests/Timer_Queue_Reference_Counting_Test.cpp b/tests/Timer_Queue_Reference_Counting_Test.cpp
index f21585938d0..3a802e24fb6 100644
--- a/tests/Timer_Queue_Reference_Counting_Test.cpp
+++ b/tests/Timer_Queue_Reference_Counting_Test.cpp
@@ -550,7 +550,7 @@ static int test_simple = 1;
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:l:m:n:o:z:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("a:b:c:d:l:m:n:o:z:"));
 
   int cc;
   while ((cc = get_opt ()) != -1)
@@ -674,3 +674,38 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class simple_test<ACE_Timer_Heap>;
+template class simple_test<ACE_Timer_List>;
+template class simple_test<ACE_Timer_Hash>;
+template class simple_test<ACE_Timer_Wheel>;
+template class upcall_test<ACE_Timer_Heap>;
+template class upcall_test<ACE_Timer_List>;
+template class upcall_test<ACE_Timer_Hash>;
+template class upcall_test<ACE_Timer_Wheel>;
+template class expire_test<ACE_Timer_Heap>;
+template class expire_test<ACE_Timer_List>;
+template class expire_test<ACE_Timer_Hash>;
+template class expire_test<ACE_Timer_Wheel>;
+template class cancellation_test<ACE_Timer_Heap>;
+template class cancellation_test<ACE_Timer_List>;
+template class cancellation_test<ACE_Timer_Hash>;
+template class cancellation_test<ACE_Timer_Wheel>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate simple_test<ACE_Timer_Heap>
+#pragma instantiate simple_test<ACE_Timer_List>
+#pragma instantiate simple_test<ACE_Timer_Hash>
+#pragma instantiate simple_test<ACE_Timer_Wheel>
+#pragma instantiate upcall_test<ACE_Timer_Heap>
+#pragma instantiate upcall_test<ACE_Timer_List>
+#pragma instantiate upcall_test<ACE_Timer_Hash>
+#pragma instantiate upcall_test<ACE_Timer_Wheel>
+#pragma instantiate expire_test<ACE_Timer_Heap>
+#pragma instantiate expire_test<ACE_Timer_List>
+#pragma instantiate expire_test<ACE_Timer_Hash>
+#pragma instantiate expire_test<ACE_Timer_Wheel>
+#pragma instantiate cancellation_test<ACE_Timer_Heap>
+#pragma instantiate cancellation_test<ACE_Timer_List>
+#pragma instantiate cancellation_test<ACE_Timer_Hash>
+#pragma instantiate cancellation_test<ACE_Timer_Wheel>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp
index 5f364c2f21b..1f04dbd7cf5 100644
--- a/tests/Timer_Queue_Test.cpp
+++ b/tests/Timer_Queue_Test.cpp
@@ -671,3 +671,9 @@ run_main (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Bounded_Set<long>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Bounded_Set<long>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/TkReactor_Test.cpp b/tests/TkReactor_Test.cpp
index e95169ffe90..26e2895d0e1 100644
--- a/tests/TkReactor_Test.cpp
+++ b/tests/TkReactor_Test.cpp
@@ -222,6 +222,14 @@ public:
   }
 };
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 int
 init (Tcl_Interp *interp)
 {
diff --git a/tests/Token_Strategy_Test.cpp b/tests/Token_Strategy_Test.cpp
index c2d9367b913..580604b0fde 100644
--- a/tests/Token_Strategy_Test.cpp
+++ b/tests/Token_Strategy_Test.cpp
@@ -236,6 +236,26 @@ run_main (int argc, ACE_TCHAR *argv[])
   return retval;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+template class ACE_Vector<ACE_INT32>;
+template class ACE_Array<ACE_INT32>;
+template class ACE_Array_Base<ACE_INT32>;
+template class ACE_Array_Iterator<ACE_INT32>;
+template class ACE_Auto_IncDec<ACE_Atomic_Op<ACE_Thread_Mutex, int> >;
+template class ACE_Guard<ACE_Token>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Vector<ACE_INT32>
+#pragma instantiate ACE_Array<ACE_INT32>
+#pragma instantiate ACE_Array_Base<ACE_INT32>
+#pragma instantiate ACE_Array_Iterator<ACE_INT32>
+#pragma instantiate ACE_Auto_IncDec<ACE_Atomic_Op<ACE_Thread_Mutex, int> >
+#pragma instantiate ACE_Guard<ACE_Token>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #else /* ACE_HAS_THREADS */
 int
 run_main (int, ACE_TCHAR *[])
diff --git a/tests/Unbounded_Set_Test.cpp b/tests/Unbounded_Set_Test.cpp
index dc4379b7720..69d88068240 100644
--- a/tests/Unbounded_Set_Test.cpp
+++ b/tests/Unbounded_Set_Test.cpp
@@ -133,3 +133,23 @@ run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Node<MyNode>;
+template class ACE_Unbounded_Set<MyNode>;
+template class ACE_Unbounded_Set_Iterator<MyNode>;
+template class ACE_Unbounded_Set_Const_Iterator<MyNode>;
+template class ACE_Auto_Basic_Ptr<ACE_CString>;
+template class auto_ptr<ACE_CString>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Node<MyNode>
+#pragma instantiate ACE_Unbounded_Set<MyNode>
+#pragma instantiate ACE_Unbounded_Set_Iterator<MyNode>
+#pragma instantiate ACE_Unbounded_Set_Const_Iterator<MyNode>
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_CString>
+#pragma instantiate auto_ptr<ACE_CString>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp
index ca99f677496..bc7618a59cc 100644
--- a/tests/Upgradable_RW_Test.cpp
+++ b/tests/Upgradable_RW_Test.cpp
@@ -117,7 +117,7 @@ print_usage_and_die (void)
 static void
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("e:fr:w:n:u"));
+  ACE_Get_Arg_Opt<ACE_TCHAR>  get_opt (argc, argv, ACE_TEXT ("e:fr:w:n:u"));
 
   int c;
 
@@ -340,6 +340,20 @@ init (void)
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
+template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>;
+template class ACE_Read_Guard<ACE_RW_Mutex>;
+template class ACE_Write_Guard<ACE_RW_Mutex>;
+template class ACE_Guard<ACE_RW_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>
+#pragma instantiate ACE_Read_Guard<ACE_RW_Mutex>
+#pragma instantiate ACE_Write_Guard<ACE_RW_Mutex>
+#pragma instantiate ACE_Guard<ACE_RW_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
 // Spawn off threads.
@@ -489,3 +503,12 @@ run_main (int argc, ACE_TCHAR *argv[])
   return status;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Double_Linked_List<Element>;
+template class ACE_Double_Linked_List_Iterator_Base<Element>;
+template class ACE_Double_Linked_List_Iterator<Element>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Double_Linked_List<Element>
+#pragma instantiate ACE_Double_Linked_List_Iterator_Base<Element>
+#pragma instantiate ACE_Double_Linked_List_Iterator<Element>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Vector_Test.cpp b/tests/Vector_Test.cpp
index 3a71fa977bb..6ca974c548d 100644
--- a/tests/Vector_Test.cpp
+++ b/tests/Vector_Test.cpp
@@ -133,3 +133,16 @@ int run_main (int, ACE_TCHAR *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Vector<DATA>;
+template class ACE_Vector_Iterator<DATA>;
+template class ACE_Array<DATA>;
+template class ACE_Array_Base<DATA>;
+template class ACE_Array_Iterator<DATA>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Vector<DATA>
+#pragma instantiate ACE_Vector_Iterator<DATA>
+#pragma instantiate ACE_Array<DATA>
+#pragma instantiate ACE_Array_Base<DATA>
+#pragma instantiate ACE_Array_Iterator<DATA>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/WChar_Conversion.cpp b/tests/WChar_Conversion.cpp
new file mode 100644
index 00000000000..962dc63db86
--- /dev/null
+++ b/tests/WChar_Conversion.cpp
@@ -0,0 +1,291 @@
+// $Id$
+
+// Checks to make sure that wide-char conversion work
+
+#include "test_config.h"
+#include "ace/config-all.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_NS_string.h"
+
+ACE_RCSID(tests, WChar_Conversion, "$Id$")
+
+// Typical pattern for C-style system call
+template < typename CHAR_TYPE >
+CHAR_TYPE* system_call( CHAR_TYPE* bucket, size_t bucket_size )
+{
+  size_t i = 0;
+  for( ; i < bucket_size/2; ++i )
+  {
+    bucket[ i ] = 'a' + (i % 6);
+  }
+  bucket[ i ] = 0;
+  return ( bucket[ 0 ] == 0 ? 0 : bucket );
+}
+
+// The following would be a typical emulation pattern where the system
+// call takes an out param. Dta may be lost if the two representations
+// require a different number of characters
+template < typename ANTI_TYPE, typename CHAR_TYPE >
+CHAR_TYPE* system_call_emulation( CHAR_TYPE* bucket, size_t bucket_size )
+{
+  bucket[ 0 ] = 0;
+  ACE::String_Conversion::Convert_InOut< ANTI_TYPE, CHAR_TYPE > convert( bucket, bucket_size );
+  const ANTI_TYPE* result = system_call( convert.c_str(), convert.size() );
+  return ( result ? bucket : 0 );
+}
+
+int
+run_main (int, ACE_TCHAR *[])
+{
+  ACE_START_TEST (ACE_TEXT ("WChar_Conversion"));
+
+// Const Input
+
+  // Pass through where constructed with destination type
+  {
+    const char* source = "Source";
+    const char* result = 0;
+    {
+      ACE::String_Conversion::Convert_In< char, wchar_t > convert( source );
+      result = convert.c_str();
+    }
+    ACE_ASSERT( result == source );
+  }
+
+  // Pass through where constructed with destination type
+  {
+    const wchar_t* source = L"Source";
+    const wchar_t* result = 0;
+    {
+      ACE::String_Conversion::Convert_In< wchar_t, char > convert( source );
+      result = convert.c_str();
+    }
+    ACE_ASSERT( result == source );
+  }
+
+  // Narrow to wide to narrow
+  {
+    const char* source = "Source";
+    const wchar_t* result1 = 0;
+    const char* result2 = 0;
+
+    ACE::String_Conversion::Convert_In< wchar_t, char > convert1( source );
+    result1 = convert1.c_str();
+
+    ACE::String_Conversion::Convert_In< char, wchar_t > convert2( result1 );
+    result2 = convert2.c_str();
+
+    ACE_ASSERT( ACE_OS::strcmp( result2, source ) == 0 );
+  }
+
+  // Wide to narrow to wide
+  {
+    const wchar_t* source = L"Source";
+    const char* result1 = 0;
+    const wchar_t* result2 = 0;
+
+    ACE::String_Conversion::Convert_In< char, wchar_t > convert1( source );
+    result1 = convert1.c_str();
+ 
+    ACE::String_Conversion::Convert_In< wchar_t, char > convert2( result1 );
+    result2 = convert2.c_str();
+
+    ACE_ASSERT( ACE_OS::strcmp( result2, source ) == 0 );
+  }
+
+// In/Out
+
+  // Pass through where constructed with destination type
+  {
+    char source[ 255 ] = "Source";
+    char* result = 0;
+    {
+      ACE::String_Conversion::Convert_InOut< char, wchar_t > convert( source, 255 );
+      result = convert.c_str();
+    }
+    ACE_ASSERT( result == source );
+  }
+
+  // Pass through where constructed with destination type
+  {
+    wchar_t source[ 255 ] = L"Source";
+    wchar_t* result = 0;
+    {
+      ACE::String_Conversion::Convert_InOut< wchar_t, char > convert( source, 255 );
+      result = convert.c_str();
+    }
+    ACE_ASSERT( result == source );
+  }
+
+  // Narrow to wide
+  {
+    char source[ 255 ] = "Source";
+    {
+      ACE::String_Conversion::Convert_InOut< wchar_t, char > convert( source, 255 );
+      wchar_t* result = convert.c_str();
+      result[0] = L'T';
+    }
+    ACE_ASSERT( ACE_OS::strcmp( "Tource", source ) == 0 );
+  }
+
+  // Wide to narrow
+  {
+    wchar_t source[ 255 ] = L"Source";
+    {
+      ACE::String_Conversion::Convert_InOut< char, wchar_t > convert( source, 255 );
+      char* result = convert.c_str();
+      result[0] = 'T';
+    }
+    ACE_ASSERT( ACE_OS::strcmp( L"Tource", source ) == 0 );
+  }
+
+// Output
+
+  // char to char
+  {
+    char source[ 255 ] = "Source";
+    ACE::String_Conversion::Convert_Out< char > convert( source );
+    char* result = convert.c_str();
+    ACE_ASSERT( ACE_OS::strcmp( result, source ) == 0 );
+    convert.free( result );
+  }
+
+  // char to wchar_t
+  {
+    char source[ 255 ] = "Source";
+    ACE::String_Conversion::Convert_Out< wchar_t > convert( source );
+    wchar_t* result = convert.c_str();
+    ACE_ASSERT( ACE_OS::strcmp( result, ACE_TEXT_TO_WCHAR_IN( source ) ) == 0 );
+    convert.free( result );
+  }
+
+  // wchar_t to char
+  {
+    wchar_t source[ 255 ] = L"Source";
+    ACE::String_Conversion::Convert_Out< char > convert( source );
+    char* result = convert.c_str();
+    ACE_ASSERT( ACE_OS::strcmp( result, ACE_TEXT_TO_CHAR_IN( source ) ) == 0 );
+    convert.free( result );
+  }
+
+  // wchar_t to wchar_t
+  {
+    wchar_t source[ 255 ] = L"Source";
+    ACE::String_Conversion::Convert_Out< wchar_t > convert( source );
+    wchar_t* result = convert.c_str();
+    ACE_ASSERT( ACE_OS::strcmp( result, source ) == 0 );
+    convert.free( result );
+  }
+
+// In place
+
+  // char to char
+  {
+    const char source[ 255 ] = "Source";
+    char dest[ 255 ] = "";
+    ACE::String_Conversion::copy( dest, source, sizeof(source)/sizeof(source[0])-1 );
+    ACE_ASSERT( ACE_OS::strcmp( "Source", dest ) == 0 );
+  }
+
+  // char to wchar_t
+  {
+    const char source[ 255 ] = "Source";
+    wchar_t dest[ 255 ] = L"";
+    ACE::String_Conversion::copy( dest, source, sizeof(source)/sizeof(source[0])-1 );
+    ACE_ASSERT( ACE_OS::strcmp( L"Source", dest ) == 0 );
+  }
+
+  // wchar_t to char
+  {
+    const wchar_t source[ 255 ] = L"Source";
+    char dest[ 255 ] = "";
+    ACE::String_Conversion::copy( dest, source, sizeof(source)/sizeof(source[0])-1 );
+    ACE_ASSERT( ACE_OS::strcmp( "Source", dest ) == 0 );
+  }
+
+  // wchar_t to wchar_t
+  {
+    const wchar_t source[ 255 ] = L"Source";
+    wchar_t dest[ 255 ] = L"";
+    ACE::String_Conversion::copy( dest, source, sizeof(source)/sizeof(source[0])-1 );
+    ACE_ASSERT( ACE_OS::strcmp( L"Source", dest ) == 0 );
+  }
+
+// Boundary
+
+  // NULL strings
+  {
+    const wchar_t* nullW = 0;
+    ACE_ASSERT( ACE_TEXT_TO_CHAR_IN( nullW ) == 0 );
+    ACE_ASSERT( ACE_TEXT_TO_WCHAR_IN( nullW ) == 0 );
+    const char* nullN = 0;
+    ACE_ASSERT( ACE_TEXT_TO_WCHAR_IN( nullN ) == 0 );
+    ACE_ASSERT( ACE_TEXT_TO_CHAR_IN( nullN ) == 0 );
+  }
+
+  // Empty strings
+  {
+    const wchar_t* nullW = L"";
+    ACE_ASSERT( ACE_OS::strcmp( ACE_TEXT_TO_CHAR_IN( nullW ), "" ) == 0 );
+    ACE_ASSERT( ACE_OS::strcmp( ACE_TEXT_TO_WCHAR_IN( nullW ), L"" ) == 0 );
+    const char* nullN = "";
+    ACE_ASSERT( ACE_OS::strcmp( ACE_TEXT_TO_WCHAR_IN( nullN ), L"" ) == 0 );
+    ACE_ASSERT( ACE_OS::strcmp( ACE_TEXT_TO_CHAR_IN( nullN ), "" ) == 0 );
+  }
+
+// Other In/Out
+
+  // Limited Narrow to wide
+  {
+    char source[ 255 ] = "Source";
+    {
+      ACE::String_Conversion::Convert_InOut< wchar_t, char > convert( source, 3 );
+      wchar_t* result = convert.c_str();
+      result[0] = L'T';
+    }
+    ACE_ASSERT( ACE_OS::strcmp( "To", source ) == 0 );
+  }
+
+  // Limited Wide to narrow
+  {
+    wchar_t source[ 255 ] = L"Source";
+    {
+      ACE::String_Conversion::Convert_InOut< char, wchar_t > convert( source, 3 );
+      char* result = convert.c_str();
+      result[0] = 'T';
+    }
+    ACE_ASSERT( ACE_OS::strcmp( L"To", source ) == 0 );
+  }
+
+  // Narrow to wide
+  {
+    char source[ 255 ] = "Source";
+    {
+      ACE::String_Conversion::Convert_InOut< wchar_t, char > convert( source ); // calc len
+      wchar_t* result = convert.c_str();
+      result[0] = L'T';
+    }
+    ACE_ASSERT( ACE_OS::strcmp( "Tource", source ) == 0 );
+  }
+
+  // Wide to narrow
+  {
+    wchar_t source[ 255 ] = L"Source";
+    {
+      ACE::String_Conversion::Convert_InOut< char, wchar_t > convert( source ); // calc len
+      char* result = convert.c_str();
+      result[0] = 'T';
+    }
+    ACE_ASSERT( ACE_OS::strcmp( L"Tource", source ) == 0 );
+  }
+
+// Emulation pattern
+  {
+    wchar_t source[ 16 ] = { 6, 3, 7, 3, 2 }; // garbage
+    wchar_t* result = system_call_emulation< char >( source, 16 );
+    ACE_ASSERT( result == source && source[ 0 ] != 6 && source[ 15 ] == 0 );
+  }
+
+  ACE_END_TEST;
+  return 0;
+}
diff --git a/tests/XtAthenaReactor_Test.cpp b/tests/XtAthenaReactor_Test.cpp
index d5abb90c4e0..68f6bae83c9 100644
--- a/tests/XtAthenaReactor_Test.cpp
+++ b/tests/XtAthenaReactor_Test.cpp
@@ -214,6 +214,15 @@ public:
 extern "C" void HCLXmInit (void);
 #endif /* HummingBird_X */
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
 int
 run_main (int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/XtMotifReactor_Test.cpp b/tests/XtMotifReactor_Test.cpp
index 643b1e9dfbd..e4451d5e0c0 100644
--- a/tests/XtMotifReactor_Test.cpp
+++ b/tests/XtMotifReactor_Test.cpp
@@ -221,6 +221,15 @@ public:
 extern "C" void HCLXmInit (void);
 #endif /* HummingBird_X */
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
+template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
 int
 run_main (int argc, ACE_TCHAR *argv[])
 {
diff --git a/tests/run_test.lst b/tests/run_test.lst
index b9e15809cd4..6637d0ca75d 100644
--- a/tests/run_test.lst
+++ b/tests/run_test.lst
@@ -28,7 +28,6 @@ Basic_Types_Test
 Bound_Ptr_Test: !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
 Buffer_Stream_Test: !DISABLE_ToFix_LynxOS_PPC
 Bug_1576_Regression_Test
-Bug_2368_Regression_Test
 Bug_2497_Regression_Test
 CDR_Array_Test: !ACE_FOR_TAO
 CDR_File_Test: !ACE_FOR_TAO
@@ -119,7 +118,6 @@ Recursive_Mutex_Test: !DISABLE_ToFix_LynxOS_PPC !ST
 Refcounted_Auto_Ptr_Test: !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
 Reference_Counted_Event_Handler_Test
 Reverse_Lock_Test
-Signal_Test
 SOCK_Connector_Test
 SOCK_Send_Recv_Test
 SOCK_Test: !chorus
diff --git a/tests/tests.mpc b/tests/tests.mpc
index 036c234c6f6..684141b2069 100644
--- a/tests/tests.mpc
+++ b/tests/tests.mpc
@@ -102,9 +102,6 @@ project(ACE Init Test) : acetest {
   Source_Files {
     ACE_Init_Test.cpp
   }
-  Resource_Files {
-    ACE_Init_Test.rc
-  }
 }
 
 project(ACE Test) : acetest {
@@ -199,13 +196,6 @@ project(Bug_1576_Regression_Test) : acetest {
   }
 }
 
-project(Bug_2368_Regression_Test) : acetest {
-  exename = Bug_2368_Regression_Test
-  Source_Files {
-    Bug_2368_Regression_Test.cpp
-  }
-}
-
 project(Bug_2497_Regression_Test) : acetest {
   exename = Bug_2497_Regression_Test
   Source_Files {
@@ -1317,6 +1307,13 @@ project(Based Pointer Test) : acetest {
   }
 }
 
+project(WChar_Conversion) : acetest {
+  exename = WChar_Conversion
+  Source_Files {
+    WChar_Conversion.cpp
+  }
+}
+
 project(Library Unload) {
   exename = UnloadLibACE
   staticflags += ACE_AS_STATIC_LIBS
diff --git a/websvcs/tests/Test_URL_Addr.cpp b/websvcs/tests/Test_URL_Addr.cpp
index 4f4e33d3cde..22389abcf69 100644
--- a/websvcs/tests/Test_URL_Addr.cpp
+++ b/websvcs/tests/Test_URL_Addr.cpp
@@ -207,8 +207,11 @@ void test_url_addr (void)
                       "URL[%d]\n"
                       "    \"%s\" ERROR\n",
                       i, addresses[i]));
-
+                      
         }
     }
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */