21 files changed, 104 insertions, 77 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 356d020e7fb..2f63c9d2533 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,35 @@
+Mon Oct  6 15:20:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Oneway_Send_Timeouts/Client.cpp
+        * tests/Oneway_Send_Timeouts/main.cpp
+        * tests/Oneway_Timeouts/client.cpp
+        * tests/Param_Test/options.cpp
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+        * orbsvcs/orbsvcs/AV/default_resource.cpp
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+        * orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+        * orbsvcs/orbsvcs/AV/RTCP.cpp
+        * orbsvcs/orbsvcs/AV/RTP.cpp
+        * orbsvcs/orbsvcs/AV/sfp.cpp
+        * orbsvcs/orbsvcs/AV/TCP.cpp
+        * orbsvcs/orbsvcs/AV/Transport.cpp
+        * orbsvcs/orbsvcs/AV/Transport.h
+        * orbsvcs/orbsvcs/AV/UDP.cpp
+        * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+        * orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+        * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+        * orbsvcs/orbsvcs/Notify/XML_Loader.h
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+          ACE_TCHAR fixes
+
 Mon Oct  6 16:10:42 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
-        
+
           Fixed one overlooked case where a const char* is
           passed to TAO_OutStream, similar to other fixes where
           an explicitly declared const char* is initialized
@@ -14,7 +42,7 @@ Thu Oct  2 14:01:39 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
         * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
         * TAO_IDL/be/be_helper.cpp:
         * TAO_IDL/be_include/be_helper.h:
-        
+
           More fixes for TAO_OutStream operator ambiguity errors,
           these on OpenSUSE_10_3_GCC_4_2. Part of the fix involves
           removing the #ifdef guards around the TAO_OutStream
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 49d665fa1b2..3d2363cb364 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -2487,7 +2487,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);
@@ -2512,7 +2512,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;
@@ -3621,7 +3621,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 a0f14fac5ef..cada96abdc1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -101,11 +101,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 2de1e19c506..c0181dafeb4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -205,7 +205,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 ()));
@@ -468,14 +468,14 @@ TAO_FlowSpec_Entry::get_local_addr_str (void)
     {
     case AF_INET:
       {
-        char *buf;
+        ACE_TCHAR *buf = 0;
         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);
-        ACE_CString cstring (buf, 0, false);
+        ACE_CString cstring (ACE_TEXT_ALWAYS_CHAR(buf), 0, false);
 
         return cstring.rep ();
       }
@@ -595,7 +595,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",
@@ -635,7 +635,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;
 
@@ -662,7 +662,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
         default:
           break;
         }
-      ACE_CString cstring (address);
+      ACE_CString cstring (ACE_TEXT_ALWAYS_CHAR(address));
 
       address_str = this->carrier_protocol_;
       address_str += "=";
@@ -747,7 +747,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
           break;
         }
 
-          ACE_CString cstring (address);
+          ACE_CString cstring (ACE_TEXT_ALWAYS_CHAR(address));
 
           //peer_address_str = this->carrier_protocol_;
           //peer_address_str += "=";
@@ -922,7 +922,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)
     {
@@ -944,7 +944,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void)
         default:
           break;
         }
-      ACE_CString cstring (address);
+      ACE_CString cstring (ACE_TEXT_ALWAYS_CHAR(address));
 
       address_str = this->carrier_protocol_;
       address_str += "=";
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
index 064612e5e5e..56832589873 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
@@ -20,7 +20,7 @@ TAO_AV_Flow_Protocol_Factory::~TAO_AV_Flow_Protocol_Factory (void)
 
 int
 TAO_AV_Flow_Protocol_Factory::init (int /* argc */,
-                                    char * /* argv */ [])
+                                    ACE_TCHAR * /* argv */ [])
 {
   return -1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 8ca183f7ca0..6166bce4d68 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -350,7 +350,7 @@ TAO_AV_RTCP_Flow_Factory::match_protocol (const char *flow_string)
 
 int
 TAO_AV_RTCP_Flow_Factory::init (int /* argc */,
-                                char * /* argv */ [])
+                                ACE_TCHAR * /* argv */ [])
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index 412557021fb..2178f49ab2e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -726,7 +726,7 @@ TAO_AV_RTP_Flow_Factory::~TAO_AV_RTP_Flow_Factory (void)
 
 int
 TAO_AV_RTP_Flow_Factory::init (int /* argc */,
-                                char * /* argv */ [])
+                               ACE_TCHAR * /* argv */ [])
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index 1ed5739a2de..e12941332b3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -163,7 +163,7 @@ TAO_AV_TCP_Factory::~TAO_AV_TCP_Factory (void)
 
 int
 TAO_AV_TCP_Factory::init (int /* argc */,
-                          char * /* argv */ [])
+                          ACE_TCHAR * /* argv */ [])
 {
   return 0;
 }
@@ -274,7 +274,7 @@ TAO_AV_TCP_Flow_Factory::~TAO_AV_TCP_Flow_Factory (void)
 
 int
 TAO_AV_TCP_Flow_Factory::init (int /* argc */,
-                               char * /* argv */ [])
+                               ACE_TCHAR * /* argv */ [])
 {
   return 0;
 }
@@ -537,7 +537,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);
 
@@ -598,7 +598,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)
@@ -663,7 +663,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/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 42cb0149bab..7a080c1aed3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -657,7 +657,7 @@ TAO_AV_Transport_Factory::~TAO_AV_Transport_Factory (void)
 
 int
 TAO_AV_Transport_Factory::init (int /* argc */,
-                                char * /* argv */ [])
+                                ACE_TCHAR * /* argv */ [])
 {
   return -1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index 985d61b333c..755bd96da84 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -46,25 +46,25 @@ class TAO_AV_Transport;
 class TAO_AV_Export TAO_AV_Transport_Item
 {
 public:
-  /// creator method, the Transport name can only be set when the
+  /// Creator method, the Transport name can only be set when the
   /// object is created.
   TAO_AV_Transport_Item (const ACE_CString &name);
 
-  /// return a reference to the character representation of the Transport
+  /// Return a reference to the character representation of the Transport
   /// factories name.
   const ACE_CString &name (void);
 
-  /// return a pointer to the Transport factory.
+  /// Return a pointer to the Transport factory.
   TAO_AV_Transport_Factory *factory (void);
 
-  /// set the factory pointer's valus.
+  /// Set the factory pointer's valus.
   void factory (TAO_AV_Transport_Factory *factory);
 
 private:
   /// Transport factory name.
   ACE_CString name_;
 
-  /// pointer to factory object.
+  /// Pointer to factory object.
   TAO_AV_Transport_Factory *factory_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index bc17c31f1c7..6dfe56be525 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);
 
       if (TAO_debug_level > 0)
@@ -547,7 +547,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr,
 
   if (local_addr != 0)
     {
-      char buf[BUFSIZ];
+      ACE_TCHAR buf[BUFSIZ];
       local_addr->addr_to_string (buf,BUFSIZ);
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -650,7 +650,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);
             }
 
@@ -684,9 +684,9 @@ 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];
+                          ACE_TString addr_str (ACE_TEXT_CHAR_TO_TCHAR(local_addr->get_host_name ()));
+                          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 ()),
@@ -758,7 +758,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
 
   if (local_addr != 0)
     {
-      char buf[BUFSIZ];
+      ACE_TCHAR buf[BUFSIZ];
       local_addr->addr_to_string (buf,BUFSIZ);
 
       if (TAO_debug_level > 0)
@@ -898,7 +898,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)
@@ -954,7 +954,7 @@ TAO_AV_UDP_Factory::make_connector (void)
 
 int
 TAO_AV_UDP_Factory::init (int /* argc */,
-                          char * /* argv */ [])
+                          ACE_TCHAR * /* argv */ [])
 {
   return 0;
 }
@@ -1044,7 +1044,7 @@ TAO_AV_UDP_Flow_Factory::~TAO_AV_UDP_Flow_Factory (void)
 
 int
 TAO_AV_UDP_Flow_Factory::init (int /* argc */,
-                               char * /* argv */ [])
+                               ACE_TCHAR * /* argv */ [])
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
index d26bc33bb7c..16f90aa997f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -52,7 +52,7 @@ TAO_AV_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
   for (curarg = 0; curarg < argc; ++curarg)
     {
       if (ACE_OS::strcasecmp (argv[curarg],
-                              "-AVTransportFactory") == 0)
+                              ACE_TEXT("-AVTransportFactory")) == 0)
         {
           TAO_AV_TransportFactorySet *tset = TAO_AV_CORE::instance ()->transport_factories ();
           curarg++;
@@ -60,7 +60,7 @@ TAO_AV_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
             {
               TAO_AV_Transport_Item *item = 0;
               ACE_NEW_RETURN (item,
-                              TAO_AV_Transport_Item (argv[curarg]),
+                              TAO_AV_Transport_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])),
                               -1);
               if (tset->insert (item) == -1)
                 ACE_ERROR ((LM_ERROR,
@@ -70,7 +70,7 @@ TAO_AV_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
             }
         }
       else if (ACE_OS::strcasecmp (argv[curarg],
-                                   "-AVFlowProtocolFactory") == 0)
+                                   ACE_TEXT("-AVFlowProtocolFactory")) == 0)
         {
           TAO_AV_Flow_ProtocolFactorySet *fpset = TAO_AV_CORE::instance ()->flow_protocol_factories ();
           curarg++;
@@ -78,7 +78,7 @@ TAO_AV_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
             {
               TAO_AV_Flow_Protocol_Item *item = 0;
               ACE_NEW_RETURN (item,
-                              TAO_AV_Flow_Protocol_Item (argv[curarg]),
+                              TAO_AV_Flow_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])),
                               -1);
               if (fpset->insert (item) == -1)
                 ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index 200dbc25984..3d9704afbdc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -1232,7 +1232,7 @@ TAO_AV_SFP_Factory::~TAO_AV_SFP_Factory (void)
 
 // Initialization hook from service configurator.
 int
-TAO_AV_SFP_Factory::init (int /*argc*/, char ** /*argv*/)
+TAO_AV_SFP_Factory::init (int /*argc*/, ACE_TCHAR ** /*argv*/)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index f5ef0a9ffa6..88c8f20cd5d 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -60,7 +60,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 */ [])
 {
   CORBA::Object_var object =
     orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 1e959341ccc..a5a5e4666ca 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -43,7 +43,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
           ++i;  // 1
 
           object_groups.length (len);
-          object_groups[j] = CORBA::string_dup (argv[i]);
+          object_groups[j] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(argv[i]));
 
           ++i;  // 2
 
@@ -53,17 +53,17 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
           ++i;  // 3
 
           repository_ids.length (len);
-          repository_ids[j] = CORBA::string_dup (argv[i]);
+          repository_ids[j] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(argv[i]));
         }
       else if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBTypeId")) == 0)
         {
-          const CORBA::ULong j = len;
+          CORBA::ULong const j = len;
           ++len;
 
           ++i;  // 1
 
           repository_ids.length (len);
-          repository_ids[j] = CORBA::string_dup (argv[i]);
+          repository_ids[j] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(argv[i]));
 
           ++i;  // 2
 
@@ -73,12 +73,12 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
           ++i;  // 3
 
           object_groups.length (len);
-          object_groups[j] = CORBA::string_dup (argv[i]);
+          object_groups[j] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(argv[i]));
         }
       else if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBLocation")) == 0)
         {
           ++i;
-          location = CORBA::string_dup (argv[i]);
+          location = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(argv[i]));
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
index 8c36669dd63..d0306107b4b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
@@ -26,7 +26,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[])
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
 
-  this->task_.argv_.add ("fake_process_name");
+  this->task_.argv_.add (ACE_TEXT("fake_process_name"));
 
   ACE_Get_Opt opts (argc,
                     argv,
@@ -51,7 +51,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[])
         case 0:
           if (ACE_OS::strcmp (opts.long_option (), orbarg) == 0)
             {
-              this->task_.argv_.add (ACE_TEXT_ALWAYS_CHAR (opts.opt_arg ()));
+              this->task_.argv_.add (opts.opt_arg ());
             }
           else if (ACE_OS::strcmp (opts.long_option (), nonamesvc) == 0)
             {
@@ -151,7 +151,7 @@ TAO_MonitorManager::shutdown (void)
 TAO_MonitorManager::ORBTask::ORBTask (void)
  : use_name_svc_ (true)
    , startup_barrier_ (2) // synch the parent with the single child thread
-   , mc_orb_name_ ("TAO_MonitorAndControl")
+   , mc_orb_name_ (ACE_TEXT("TAO_MonitorAndControl"))
 {
 }
 
@@ -212,7 +212,7 @@ TAO_MonitorManager::ORBTask::svc (void)
                               1);
           }
 
-        iortable->bind(mc_orb_name_.c_str(), ior.in ());
+        iortable->bind(ACE_TEXT_ALWAYS_CHAR(mc_orb_name_.c_str()), ior.in ());
 
         if (this->use_name_svc_)
           {
@@ -220,7 +220,7 @@ TAO_MonitorManager::ORBTask::svc (void)
             nc.init (this->orb_.in ());
             CosNaming::Name name (1);
             name.length (1);
-            name[0].id = CORBA::string_dup (mc_orb_name_.c_str());
+            name[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(mc_orb_name_.c_str()));
             nc->rebind (name, monitor.in ());
           }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 1fc5933c902..2efae71f984 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -32,10 +32,10 @@ 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 char * name = ACE_TEXT_ALWAYS_CHAR(attrs->getQName (i));
+      const char * value = ACE_TEXT_ALWAYS_CHAR(attrs->getValue (i));
       if (ACE_OS::strcmp (name,
-                         TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::TOPOLOGY_ID_NAME) == 0)
+                          TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::TOPOLOGY_ID_NAME) == 0)
       {
         id = ACE_OS::atoi (value);
       }
@@ -60,7 +60,7 @@ namespace TAO_Notify
   }
 
   bool
-  XML_Loader::open (const ACE_CString & base_name)
+  XML_Loader::open (const ACE_TString & base_name)
   {
     bool result = false;
 
@@ -71,7 +71,7 @@ namespace TAO_Notify
     // "impossible" happened (or its a new system with no saved state).
 
     this->file_name_ = base_name;
-    this->file_name_ += ".xml";
+    this->file_name_ += ACE_TEXT(".xml");
 
     // 4 is "read permission"
     result =  (0 == ACE_OS::access (this->file_name_.c_str (), 4));
@@ -115,7 +115,7 @@ namespace TAO_Notify
     if (! result)
     {
       this->file_name_ = base_name;
-      this->file_name_ += ".000";
+      this->file_name_ += ACE_TEXT(".000");
       result = (0 == ACE_OS::access (this->file_name_.c_str (), 4));
     }
     return result;
@@ -191,14 +191,14 @@ namespace TAO_Notify
             name
             ));
 
-          ACE_CString cname (name);
+          ACE_CString cname (ACE_TEXT_ALWAYS_CHAR(name));
           Topology_Object* next = cur->load_child (cname, id, attrs);
           ACE_ASSERT(next != 0);
           object_stack_.push (next);
         }
         catch (const CORBA::Exception& ex)
         {
-          throw ACEXML_SAXException (ex._info ().c_str ());
+          throw ACEXML_SAXException (ACE_TEXT_CHAR_TO_TCHAR(ex._info ().c_str ()));
         }
       }
     }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index d98f1056fed..e0af94e4f76 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -44,7 +44,7 @@ public:
 
   /// Open a file and perform preliminary validation to determine whether
   /// the file is complete and valid.
-  bool open (const ACE_CString & file_name);
+  bool open (const ACE_TString & file_name);
 
   ///////////////////////////////////
   // Override Topology_Loader methods
@@ -66,7 +66,7 @@ public:
 
 private:
   /// The name of the file from which data is read.
-  ACE_CString file_name_;
+  ACE_TString file_name_;
   /// A stream representing our current output.
   FILE * input_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index 078fe73b747..17589bf00c6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -125,7 +125,7 @@ namespace TAO_Notify
         ACE_UINT64 const tmpus = now.sec();
         nowus += tmpus * USECSPERSEC;
 
-        char nowusstr[128];
+        ACE_TCHAR nowusstr[128];
 #ifdef ACE_LACKS_LONGLONG_T
         nowus.as_string(nowusstr);
 #else
@@ -135,7 +135,7 @@ namespace TAO_Notify
         attrs.push_back(NVP("version", "1.0"));
         if (this->timestamp_)
         {
-          attrs.push_back(NVP("timestamp", nowusstr));
+          attrs.push_back(NVP("timestamp", ACE_TEXT_ALWAYS_CHAR(nowusstr)));
         }
         this->begin_object(0, "notification_service", attrs, changed);
       }
@@ -173,8 +173,8 @@ namespace TAO_Notify
       ACE_OS::fprintf (out, " %s%s%ld%s", TOPOLOGY_ID_NAME, "=\"", lid, "\"");
     }
 
-    ACE_CString::size_type const BUF_SIZE = 512;
-    ACE_CString tmp(BUF_SIZE);
+    ACE_TString::size_type const BUF_SIZE = 512;
+    ACE_TString tmp(BUF_SIZE);
     for (size_t idx = 0; idx < attrs.size(); ++idx)
     {
       ACEXML_escape_string(attrs[idx].value, tmp);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index d586718ee1d..5e8ecef8a9d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -80,7 +80,7 @@ int TAO::PG_FactoryRegistry::parse_args (int argc, ACE_TCHAR * argv[])
       }
       case 'n':
       {
-        this->ns_name_ = get_opts.opt_arg();
+        this->ns_name_ = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg());
         break;
       }
       case 'q':
@@ -216,11 +216,10 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb)
   // and create a ior string
   this->ior_ = this->orb_->object_to_string (this->this_obj_.in ());
 
-
   if (this->ior_output_file_ != 0)
   {
     this->identity_ = "file:";
-    this->identity_ += this->ior_output_file_;
+    this->identity_ += ACE_TEXT_ALWAYS_CHAR(this->ior_output_file_);
     result = write_ior_file (this->ior_output_file_,
                              this->ior_.in ());
   }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index a4793d84e7e..2b41c002875 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 static const char pg_poa_factory_name[] = "TAO_GOA";
-static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+static const ACE_TCHAR pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL