Wrapped literal strings in ACE_TEXT.

7 files changed, 143 insertions, 71 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index 11e648a8d7e..479d8e3129b 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,14 @@
+Tue Jan 15 18:18:12 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp:
+
+          Wrapped literal strings in ACE_TEXT.
+
 Tue Jan 15 01:28:10 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
 
         * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
index af8c66718c3..f7691026127 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
@@ -192,7 +192,8 @@ TAO_FT_Naming_Manager::groups (::FT_Naming::LoadBalancingStrategyValue target_st
         { // Group has no name
           (*group_names)[i] = CORBA::string_dup ("<unnamed group>");
           ACE_ERROR ((LM_ERROR,
-            ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::groups: no name property set on group.\n")
+                      ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::groups: no name ")
+                      ACE_TEXT ("property set on group.\n")
             ));
         }
       }
@@ -228,7 +229,8 @@ TAO_FT_Naming_Manager::group_name (PortableGroup::ObjectGroup_ptr group,
   if (CORBA::is_nil (group))
   {
     ACE_ERROR ((LM_ERROR,
-      ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::group_name: cannot get name for a null object.\n")
+                ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::group_name: ")
+                ACE_TEXT ("cannot get name for a null object.\n")
       ));
     return false;
   }
@@ -245,7 +247,8 @@ TAO_FT_Naming_Manager::group_name (PortableGroup::ObjectGroup_ptr group,
     else
     { // The group has no name
       ACE_ERROR_RETURN ((LM_ERROR,
-                        "TAO_FT_Naming_Manager::group_name - object group does not have a name"),
+                         ACE_TEXT ("TAO_FT_Naming_Manager::group_name - ")
+                         ACE_TEXT ("object group does not have a name")),
                         false);
     }
   }
@@ -359,7 +362,8 @@ TAO_FT_Naming_Manager::create_member (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-        ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::create_member: unknown group\n")
+                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::create_member: ")
+                   ACE_TEXT ("unknown group\n")
         ));
     }
     throw PortableGroup::ObjectGroupNotFound ();
@@ -388,7 +392,8 @@ TAO_FT_Naming_Manager::add_member (
     catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
-                 "TAO_FT_Naming_Manager::add_member - Issue with IOR of group or member.\n"));
+                  ACE_TEXT ("TAO_FT_Naming_Manager::add_member - ")
+                  ACE_TEXT ("Issue with IOR of group or member.\n")));
       throw PortableGroup::ObjectNotAdded ();
     }
 
@@ -400,7 +405,8 @@ TAO_FT_Naming_Manager::add_member (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-        ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::add_member to unknown group\n")
+                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::add_member ")
+                   ACE_TEXT ("to unknown group\n")
         ));
     }
     throw PortableGroup::ObjectGroupNotFound ();
@@ -454,7 +460,8 @@ TAO_FT_Naming_Manager::locations_of_members (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-        ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::locations_of_members: unknown group\n")
+                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("locations_of_members: unknown group\n")
         ));
     }
     throw PortableGroup::ObjectGroupNotFound ();
@@ -485,7 +492,8 @@ TAO_FT_Naming_Manager::get_object_group_id (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-        ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::get_object_group_id: unknown group\n")
+                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("get_object_group_id: unknown group\n")
         ));
     }
     throw PortableGroup::ObjectGroupNotFound ();
@@ -510,7 +518,8 @@ TAO_FT_Naming_Manager::get_object_group_ref (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-        ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::get_object_group_ref: unknown group\n")
+                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("get_object_group_ref: unknown group\n")
         ));
     }
     throw PortableGroup::ObjectGroupNotFound ();
@@ -534,7 +543,8 @@ PortableGroup::ObjectGroup_ptr TAO_FT_Naming_Manager::get_object_group_ref_from_
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-        ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::get_object_group_ref_from_id: unknown group\n")
+                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("get_object_group_ref_from_id: unknown group\n")
         ));
     }
     throw PortableGroup::ObjectGroupNotFound ();
@@ -560,7 +570,8 @@ TAO_FT_Naming_Manager::get_member_ref (
     if (TAO_debug_level > 0)
     {
       ACE_ERROR ( (LM_ERROR,
-        ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::get_member_ref: unknown group\n")
+                   ACE_TEXT ("%T %n (%P|%t) - FT_Naming_Manager::")
+                   ACE_TEXT ("get_member_ref: unknown group\n")
         ));
     }
     throw PortableGroup::ObjectGroupNotFound ();
@@ -678,7 +689,8 @@ TAO_FT_Naming_Manager::next_member (PortableGroup::ObjectGroup_ptr object_group)
   {
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT ("%T %n (%P|%t) - TAO_FT_Naming_Manager::next_member: ")
-                ACE_TEXT ("object group has no TAO_FT_LOAD_BALANCING_STRATEGY property.\n")
+                ACE_TEXT ("object group has no TAO_FT_LOAD_BALANCING_STRATEGY ")
+                ACE_TEXT ("property.\n")
                ));
 
     return CORBA::Object::_nil();
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
index afa0bd7a02b..017455ce0cc 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
@@ -81,7 +81,8 @@ TAO_FT_Naming_Replication_Manager::notify_updated_object_group (
   int result = this->naming_svr_->update_object_group (group_info);
 
   if (result != 0)
-    ACE_ERROR ((LM_ERROR, "Unable to update object group.\n"));
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("Unable to update object group.\n")));
 }
 
 void
@@ -94,7 +95,8 @@ TAO_FT_Naming_Replication_Manager::notify_updated_context (
 
   if (result != 0)
   {
-    ACE_ERROR ((LM_ERROR, "Error while updating naming context.\n"));
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("Error while updating naming context.\n")));
   }
 }
 
@@ -151,7 +153,9 @@ TAO_FT_Naming_Replication_Manager::register_with_peer_replica (
   catch (const CORBA::Exception& ex) {
     // Unable to contact the peer replica.
     if (TAO_debug_level > 1)
-      ex._tao_print_exception ("TAO_FT_Naming_Replication_Manager::register_with_peer_replica\n");
+      ex._tao_print_exception (
+        ACE_TEXT ("TAO_FT_Naming_Replication_Manager::")
+        ACE_TEXT ("register_with_peer_replica\n"));
     result = -1;
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index 53bc94a4fde..1141524c25b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -50,10 +50,12 @@
 #include "tao/AnyTypeCode/Any.h"
 
 const ACE_TCHAR*
-TAO_FT_Naming_Server::primary_replica_ior_filename = "ns_replica_primary.ior";
+TAO_FT_Naming_Server::primary_replica_ior_filename =
+  ACE_TEXT ("ns_replica_primary.ior");
 
 const ACE_TCHAR*
-TAO_FT_Naming_Server::backup_replica_ior_filename = "ns_replica_backup.ior";
+TAO_FT_Naming_Server::backup_replica_ior_filename =
+  ACE_TEXT ("ns_replica_backup.ior");
 
 /// Default Constructor.
 TAO_FT_Naming_Server::TAO_FT_Naming_Server (void)
@@ -88,7 +90,8 @@ TAO_FT_Naming_Server::init_with_orb (int argc,
       if (ACE_OS::access (this->object_group_dir_.c_str (), W_OK|X_OK))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%P|%t) ERROR: Invalid object group persistence directory\n"),
+                             ACE_TEXT ("(%P|%t) ERROR: Invalid object ")
+                             ACE_TEXT ("group persistence directory\n")),
                             -1);
         }
 
@@ -119,7 +122,7 @@ TAO_FT_Naming_Server::init_with_orb (int argc,
   catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception (
-      "TAO_FT_Naming_Server::init_with_orb");
+      ACE_TEXT ("TAO_FT_Naming_Server::init_with_orb"));
     return -1;
   }
 
@@ -154,7 +157,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, ACE_TCHAR *argv []
 
     // Get the POA from the ORB.
     CORBA::Object_var poa_object =
-      orb->resolve_initial_references ("RootPOA");
+      orb->resolve_initial_references (ACE_TEXT ("RootPOA"));
 
     if (CORBA::is_nil (poa_object.in ()))
     {
@@ -194,7 +197,8 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, ACE_TCHAR *argv []
 
     // We use a different POA, otherwise the user would have to change
     // the object key each time it invokes the server.
-    this->naming_manager_poa_ = this->root_poa_->create_POA ("NamingManager",
+    this->naming_manager_poa_ = this->root_poa_->create_POA (
+      ACE_TEXT ("NamingManager"),
       poa_manager.in (),
       policies);
     // Warning!  If create_POA fails, then the policies won't be
@@ -213,7 +217,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, ACE_TCHAR *argv []
 
     // Register with the POA.
     PortableServer::ObjectId_var id =
-      PortableServer::string_to_ObjectId ("NamingManager");
+      PortableServer::string_to_ObjectId (ACE_TEXT ("NamingManager"));
 
     this->naming_manager_poa_->activate_object_with_id (id.in (),
                                                         &this->naming_manager_);
@@ -232,7 +236,8 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, ACE_TCHAR *argv []
           != 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT("(%P|%t) ERROR: Unable to open %s for writing:(%u) %p\n"),
+                             ACE_TEXT("(%P|%t) ERROR: Unable to open %s ")
+                             ACE_TEXT ("for writing:(%u) %p\n"),
                              this->naming_manager_ior_file_name_,
                              ACE_ERRNO_GET,
                              ACE_TEXT("TAO_Naming_Server::init_naming_manager_with_orb")),
@@ -247,11 +252,12 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, ACE_TCHAR *argv []
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "TAO_FT_Naming_Server::init_naming_manager_with_orb");
+        ACE_TEXT ("TAO_FT_Naming_Server::init_naming_manager_with_orb"));
       return -1;
     }
 
-  // Make the Object Group Manager easily accessible using Interoperable Naming Service IORs
+  // Make the Object Group Manager easily accessible using Interoperable
+  // Naming Service IORs
   CORBA::Object_var table_object =
     orb->resolve_initial_references ("IORTable");
 
@@ -260,7 +266,8 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int argc, ACE_TCHAR *argv []
   if (CORBA::is_nil (adapter.in ()))
   {
     ACE_ERROR ((LM_ERROR,
-                "(%P|%t) ERROR: TAO_FT_Naming_Server::init_naming_manager_with_orb - Nil IORTable\n"));
+                ACE_TEXT ("(%P|%t) ERROR: TAO_FT_Naming_Server::")
+                ACE_TEXT ("init_naming_manager_with_orb - Nil IORTable\n")));
   }
   else
   {
@@ -369,17 +376,19 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc, ACE_TCHAR *ar
                                             this->replication_manager_poa_.in ());
 
     ACE_CString primary_file_name (this->persistence_file_name_);
-    primary_file_name += "/";
+    primary_file_name += ACE_TEXT ("/");
     primary_file_name += TAO_FT_Naming_Server::primary_replica_ior_filename;
 
     ACE_CString backup_file_name (this->persistence_file_name_);
-    backup_file_name += "/";
+    backup_file_name += ACE_TEXT ("/");
     backup_file_name += TAO_FT_Naming_Server::backup_replica_ior_filename;
 
     if (this->server_role_ == PRIMARY)
       { // We are the primary
         if (TAO_debug_level > 3)
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Is a primary\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) - FT_Naming_Server ")
+                      ACE_TEXT ("is a primary\n")));
 
         // Write out this replicas IOR for the backup to use to bootstrap
         CORBA::String_var replication_ior = naming_service_ior ();
@@ -390,7 +399,9 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc, ACE_TCHAR *ar
         // may be up and running so we should register with it.
         CORBA::Object_var backup_ior;
         if (TAO_debug_level > 3)
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Reading backup ior file\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) - FT_Naming_Server reading ")
+                      ACE_TEXT ("backup ior file\n")));
 
         if ((ACE_OS::access (primary_file_name.c_str (),
                              R_OK) == 0) &&
@@ -402,42 +413,53 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc, ACE_TCHAR *ar
               FT_Naming::ReplicationManager::_narrow (backup_ior.in ());
 
             if (TAO_debug_level > 3)
-              ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Narrowing IOR\n"));
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) - FT_Naming_Server ")
+                          ACE_TEXT ("narrowing IOR\n")));
             if (CORBA::is_nil (peer_ref.in ()))
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("(%P|%t) ERROR: IOR in file %s is not a FT_Naming::ReplicationManager\n"),
+                                 ACE_TEXT ("(%P|%t) ERROR: IOR in file %s is not ")
+                                 ACE_TEXT ("a FT_Naming::ReplicationManager\n"),
                                  primary_file_name.c_str ()),
                                 -1);
 
             try {
               if (TAO_debug_level > 3)
-                ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Registering with backup.\n"));
+                ACE_DEBUG ((LM_DEBUG,
+                            ACE_TEXT ("(%P|%t) - FT_Naming_Server registering ")
+                            ACE_TEXT ("with backup.\n")));
               // Register with the backup
               CosNaming::NamingContext_var root = this->my_root_context ();
               FT_Naming::NamingManager_var nm = this->my_naming_manager ();
 
               int registration_result =
-                this->replication_manager_->register_with_peer_replica (peer_ref.in (),
-                                                                        root.in (),
-                                                                        nm.in ());
+                this->replication_manager_->register_with_peer_replica (
+                   peer_ref.in (),
+                   root.in (),
+                   nm.in ());
 
               if (registration_result == 0)
                 {
                   if (TAO_debug_level > 3)
-                    ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Registered with backup.\n"));
+                    ACE_DEBUG ((LM_DEBUG,
+                                ACE_TEXT ("(%P|%t) - FT_Naming_Server ")
+                                ACE_TEXT ("registered with backup.\n")));
                 }
               else
                 {
                   if (TAO_debug_level > 3)
                     ACE_DEBUG ((LM_DEBUG,
-                                "(%P|%t) - FT_Naming_Server:Backup peer replica not started yet.\n"));
+                                ACE_TEXT ("(%P|%t) - FT_Naming_Server:Backup peer ")
+                                ACE_TEXT ("replica not started yet.\n")));
                 }
             }
             catch (const CORBA::Exception& ex)
               {
-                // Its Ok that we were unable to contact the backup peer. It has apparently
-                // not started yet.  It will register with the primary when it starts up.
-                ex._tao_print_exception ("Backup peer replica not started yet.\n");
+                // Its Ok that we were unable to contact the backup peer.
+                // It has apparently not started yet.
+                // It will register with the primary when it starts up.
+                ex._tao_print_exception (
+                   ACE_TEXT ("Backup peer replica not started yet.\n"));
               }
           }
         else
@@ -446,16 +468,20 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc, ACE_TCHAR *ar
             // The backup will register with us in the future.
             if (TAO_debug_level > 3)
               ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) - FT_Naming_Server:No Replica IOR file. Waiting for registration.\n"));
+                          ACE_TEXT ("(%P|%t) - FT_Naming_Server no Replica ")
+                          ACE_TEXT ("IOR file. Waiting for registration.\n")));
           }
       }
     else if (this->server_role_ == TAO_FT_Naming_Server::BACKUP)
       { // We are the backup
         if (TAO_debug_level > 3)
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Is a Backup\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) - FT_Naming_Server:Is a Backup\n")));
 
         if (TAO_debug_level > 3)
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Writing replica ior\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) - FT_Naming_Server writing ")
+                      ACE_TEXT ("replica ior\n")));
         // Write out the backup ior for use by the primary if it must be restarted.
         this->write_ior_to_file (replication_manager_ior_.in (),
                                  backup_file_name.c_str ());
@@ -465,7 +491,9 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc, ACE_TCHAR *ar
         CORBA::Object_var primary_ref = CORBA::Object::_nil ();
 
         if (TAO_debug_level > 3)
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Reading primary ior file\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) - FT_Naming_Server ")
+                      ACE_TEXT ("reading primary ior file\n")));
         // Check for the primary IOR.  We must have it to bootstrap the redundant naming
         // pair.
         if ((ACE_OS::access (primary_file_name.c_str (), R_OK) == 0) &&
@@ -473,19 +501,24 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc, ACE_TCHAR *ar
                                              primary_ref.out ()) == 0))
           {
             if (TAO_debug_level > 3)
-              ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Storing the primary reference ior\n"));
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) - FT_Naming_Server ")
+                          ACE_TEXT ("toring the primary reference ior\n")));
             // Store the primary reference as our peer
             FT_Naming::ReplicationManager_var peer_ref =
               FT_Naming::ReplicationManager::_narrow (primary_ref.in ());
 
             if (CORBA::is_nil (peer_ref.in ()))
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("(%P|%t) ERROR: IOR in file %s is not a FT_Naming::ReplicationManager\n"),
+                                 ACE_TEXT ("(%P|%t) ERROR: IOR in file %s ")
+                                 ACE_TEXT ("is not a FT_Naming::ReplicationManager\n"),
                                  primary_file_name.c_str ()),
                                 -1);
 
             if (TAO_debug_level > 3)
-              ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Backup registering with primary.\n"));
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("(%P|%t) - FT_Naming_Server ")
+                          ACE_TEXT ("backup registering with primary.\n")));
             // Register with the primary
             CosNaming::NamingContext_var root = this->my_root_context ();
             FT_Naming::NamingManager_var nm = this->my_naming_manager ();
@@ -495,27 +528,31 @@ TAO_FT_Naming_Server::init_replication_manager_with_orb (int argc, ACE_TCHAR *ar
                                                                       nm.in ());
             if (registration_result == -1)
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%P|%t) ERROR: Backup unable to register with the primary\n"),
+                                 ACE_TEXT ("(%P|%t) ERROR: Backup unable to ")
+                                 ACE_TEXT ("register with the primary\n")),
                                 -1);
           }
         else
           {
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("(%P|%t) ERROR: No primary IOR available. Have you started the primary? Exiting.\n")),
+                               ACE_TEXT ("(%P|%t) ERROR: No primary IOR ")
+                               ACE_TEXT ("available. Have you started the ")
+                               ACE_TEXT ("primary? Exiting.\n")),
                               -1);
           }
       }
     else
       {// We are neither a primary or replica, but running in standalone mode
         if (TAO_debug_level > 3)
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - FT_Naming_Server:Is Standalone\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) - FT_Naming_Server:Is Standalone\n")));
 
       }
   }
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "TAO_FT_Naming_Server::init_replication_manager_with_orb.\n");
+        ACE_TEXT ("TAO_FT_Naming_Server::init_replication_manager_with_orb.\n"));
       return -1;
     }
 
@@ -531,8 +568,8 @@ TAO_FT_Naming_Server::parse_args (int argc,
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:c:do:p:s:f:m:z:r:u:v:g:h:"));
 
   // Define the arguments for primary and backup
-  get_opts.long_option ("primary", ACE_Get_Opt::NO_ARG);
-  get_opts.long_option ("backup", ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT ("primary"), ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT ("backup"), ACE_Get_Opt::NO_ARG);
   bool role_defined = false;
 
   int c;
@@ -596,7 +633,8 @@ TAO_FT_Naming_Server::parse_args (int argc,
                            &address);
         if (result == 0 || result == EOF)
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%P|%t) ERROR: Unable to process <-b> option"),
+                             ACE_TEXT ("(%P|%t) ERROR: Unable to ")
+                             ACE_TEXT ("process <-b> option")),
                             -1);
         this->base_address_ = (void *) address;
         break;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
index 13a0b4d4c48..22f8c961f46 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
@@ -40,8 +40,8 @@ TAO_FT_Persistent_Naming_Context::~TAO_FT_Persistent_Naming_Context (void)
 CORBA::Boolean
 TAO_FT_Persistent_Naming_Context::is_object_group (CORBA::Object_ptr obj) const
 {
-  // If there is a tagged component with tag = IOP::TAG_FT_GROUP in the object reference
-  // then it is an object group
+  // If there is a tagged component with tag = IOP::TAG_FT_GROUP in
+  // the object reference then it is an object group
   PortableGroup::TagGroupTaggedComponent tagged_component;
   return TAO::PG_Utils::get_tagged_component (obj, tagged_component);
 }
@@ -70,7 +70,8 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n)
     if ( this->naming_manager_impl_ == 0)
     {
       ACE_ERROR ((LM_ERROR,
-        "TAO_FT_Persistent_Naming_Context::resolve - No NamingManager defined.\n"));
+                  ACE_TEXT ("TAO_FT_Persistent_Naming_Context::resolve ")
+                  ACE_TEXT ("- No NamingManager defined.\n")));
 
       throw CORBA::INTERNAL ();
     }
@@ -88,7 +89,8 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n)
   catch (CORBA::Exception& ex)
   {
      ex._tao_print_exception (
-        "TAO_FT_Persistent_Naming_Context::resolve - Some unhandled error occurred\n");
+        ACE_TEXT ("TAO_FT_Persistent_Naming_Context::resolve ")
+        ACE_TEXT ("- Some unhandled error occurred\n"));
       return CORBA::Object::_nil ();
   }
 
@@ -96,7 +98,8 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n)
 }
 
 void
-TAO_FT_Persistent_Naming_Context::set_naming_manager_impl (TAO_FT_Naming_Manager *mgr_impl)
+TAO_FT_Persistent_Naming_Context::set_naming_manager_impl (
+  TAO_FT_Naming_Manager *mgr_impl)
 {
   naming_manager_impl_ = (mgr_impl);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
index ceefea4fbbd..90e14d99936 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
@@ -42,8 +42,8 @@ TAO_FT_Storable_Naming_Context::~TAO_FT_Storable_Naming_Context (void)
 CORBA::Boolean
 TAO_FT_Storable_Naming_Context::is_object_group (CORBA::Object_ptr obj) const
 {
-  // If there is a tagged component with tag = IOP::TAG_FT_GROUP in the object reference
-  // then it is an object group
+  // If there is a tagged component with tag = IOP::TAG_FT_GROUP in the
+  // object reference then it is an object group
   PortableGroup::TagGroupTaggedComponent tagged_component;
   return TAO::PG_Utils::get_tagged_component (obj, tagged_component);
 }
@@ -71,7 +71,8 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n)
     if ( this->naming_manager_ == 0)
     {
       ACE_ERROR ((LM_ERROR,
-        "TAO_FT_Persistent_Naming_Context::resolve - No NamingManager defined.\n"));
+                  ACE_TEXT ("TAO_FT_Persistent_Naming_Context::resolve ")
+                  ACE_TEXT ("- No NamingManager defined.\n")));
 
       throw CORBA::INTERNAL ();
     }
@@ -89,7 +90,8 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n)
   catch (CORBA::Exception& ex)
   {
      ex._tao_print_exception (
-        "TAO_FT_Storable_Naming_Context::resolve - Some unhandled error occurred\n");
+       ACE_TEXT ("TAO_FT_Storable_Naming_Context::resolve - ")
+       ACE_TEXT ("Some unhandled error occurred\n"));
       return CORBA::Object::_nil ();
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
index 551dcde4052..9a35f407ab7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
@@ -6,7 +6,8 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
   /// Constructor.
-TAO_FT_Storable_Naming_Context_Factory::TAO_FT_Storable_Naming_Context_Factory (size_t hash_table_size)
+TAO_FT_Storable_Naming_Context_Factory::TAO_FT_Storable_Naming_Context_Factory (
+  size_t hash_table_size)
   : TAO_Storable_Naming_Context_Factory (hash_table_size)
 {
 
@@ -21,14 +22,15 @@ TAO_FT_Storable_Naming_Context_Factory::~TAO_FT_Storable_Naming_Context_Factory
 
 
 TAO_Storable_Naming_Context*
-TAO_FT_Storable_Naming_Context_Factory::create_naming_context_impl (CORBA::ORB_ptr orb,
-                                                                    PortableServer::POA_ptr poa,
-                                                                    const char *poa_id,
-                                                                    TAO::Storable_Factory *persistence_factory
+TAO_FT_Storable_Naming_Context_Factory::create_naming_context_impl (
+  CORBA::ORB_ptr orb,
+  PortableServer::POA_ptr poa,
+  const char *poa_id,
+  TAO::Storable_Factory *persistence_factory
                                                                     )
 {
-  // Construct the naming context, forwarding the map and counter even if they
-  // are defaulted
+  // Construct the naming context, forwarding the map and counter
+  // even if they are defaulted
   TAO_FT_Storable_Naming_Context *context_impl;
   ACE_NEW_THROW_EX (context_impl,
                     TAO_FT_Storable_Naming_Context (orb,