Added missing ACE_TEXT macros

6 files changed, 269 insertions, 172 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index 05733778d9a..8771d3f1b79 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,13 @@
+Wed Jan  9 00:23:50 UTC 2013  Phillip LaBanca  <labancap@ociweb.com>
+
+        * orbsvcs/tests/FT_Naming/FaultTolerance/Basic.cpp:
+        * orbsvcs/tests/FT_Naming/FaultTolerance/LB_server.cpp:
+        * orbsvcs/tests/FT_Naming/FaultTolerance/client.cpp:
+        * orbsvcs/tests/FT_Naming/FaultTolerance/server.cpp:
+        * utils/nsgroup/nsgroup.cpp:
+
+          Added missing ACE_TEXT macros
+
 Tue Jan  8 20:52:42 UTC 2013  Brian Johnson  <johnsonb@ociweb.com>
 
         * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/Basic.cpp
index 3bd364bc121..c669be1eaa5 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/Basic.cpp
@@ -8,7 +8,8 @@ Basic::Basic (CORBA::Object_ptr object_group,
               FT_Naming::NamingManager_ptr lm,
               CORBA::ORB_ptr orb,
               const char *loc)
-  : object_group_name_ ("BasicGroup"), orb_ (CORBA::ORB::_duplicate (orb))
+  : object_group_name_ (ACE_TEXT_ALWAYS_CHAR ("BasicGroup")),
+    orb_ (CORBA::ORB::_duplicate (orb))
 {
   this->object_group_ = CORBA::Object::_duplicate (object_group);
   this->nm_ = FT_Naming::NamingManager::_duplicate (lm);
@@ -32,23 +33,27 @@ Basic::remove_member (void)
       this->nm_->remove_member (this->object_group_.in (),
                                 location);
 
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
-                      this->location_.in ()));
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("(%P|%t) - Removed Member at Location <%s>\n"),
+                  this->location_.in ()));
 
     }
   catch (const PortableGroup::ObjectNotFound& ex)
     {
-      ex._tao_print_exception ("Caught exception in remove_member");
+      ex._tao_print_exception (
+        ACE_TEXT ("Caught exception in remove_member"));
       throw CORBA::INTERNAL ();
     }
   catch (const PortableGroup::MemberNotFound& ex)
     {
-      ex._tao_print_exception ("Caught exception in remove_member");
+      ex._tao_print_exception (
+        ACE_TEXT ("Caught exception in remove_member"));
       throw CORBA::INTERNAL ();
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception caught while destroying member\n");
+      ex._tao_print_exception (
+        ACE_TEXT ("Exception caught while destroying member\n"));
     }
 
 }
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/LB_server.cpp
index cfd4c0e4a6c..ee4f5dd9ed9 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/LB_server.cpp
@@ -9,7 +9,7 @@
 LB_server::LB_server (int argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
-  , ior_output_file_(ACE_TEXT("obj.ior"))
+  , ior_output_file_ (ACE_TEXT ("obj.ior"))
 {
 }
 
@@ -18,7 +18,8 @@ LB_server::destroy (void)
 {
   try
     {
-      this->naming_manager_->delete_object_group ("BasicGroup");
+      this->naming_manager_->delete_object_group (
+        ACE_TEXT_ALWAYS_CHAR ("BasicGroup"));
 
       //TODO: Does the FT_NamingManager need a destroy method?
 //      this->naming_manager_->destroy (1, 1);
@@ -28,7 +29,7 @@ LB_server::destroy (void)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "Exception caught while destroying LB_server\n");
+        ACE_TEXT ("Exception caught while destroying LB_server\n"));
       return -1;
     }
   return 0;
@@ -57,16 +58,16 @@ int
 LB_server::write_ior_to_file (const char *ior)
 {
   FILE *output_file =
-    ACE_OS::fopen (this->ior_output_file_, "w");
+    ACE_OS::fopen (this->ior_output_file_, ACE_TEXT_ALWAYS_CHAR("w"));
 
   if (output_file == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "Cannot open output file for writing IOR:"));
+                  ACE_TEXT ("Cannot open output file for writing IOR:")));
       return -1;
     }
 
-  ACE_OS::fprintf (output_file, "%s", ior);
+  ACE_OS::fprintf (output_file, ACE_TEXT_ALWAYS_CHAR ("%s"), ior);
   ACE_OS::fclose (output_file);
   return 0;
 }
@@ -86,9 +87,9 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
+                           ACE_TEXT ("usage:  %s ")
+                           ACE_TEXT ("-o <iorfile>")
+                           ACE_TEXT ("\n"),
                            argv [0]),
                           -1);
       }
@@ -105,11 +106,12 @@ LB_server::start_orb_and_poa (void)
       this->orb_ = CORBA::ORB_init (this->argc_, this->argv_);
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA");
+        this->orb_->resolve_initial_references( ACE_TEXT_ALWAYS_CHAR ("RootPOA"));
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
+                           ACE_TEXT (" (%P|%t) Unable to initialize ")
+                           ACE_TEXT ("the POA.\n")),
                           -1);
 
       this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
@@ -122,24 +124,27 @@ LB_server::start_orb_and_poa (void)
       ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service
       if (name_svc_.init (this->orb_, &timeout) != 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           "LB_server: Could not connect to naming service.\n"),
+                           ACE_TEXT (" (%P|%t) LB_server: Could not connect ")
+                           ACE_TEXT ("to naming service.\n")),
                            -1);
 
-      CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("NamingManager");
+      CORBA::Object_var obj = this->orb_->resolve_initial_references (
+        ACE_TEXT_ALWAYS_CHAR ("NamingManager"));
 
       this->naming_manager_ =
         FT_Naming::NamingManager::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->naming_manager_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to get Naming Manager Reference\n"),
+                           ACE_TEXT (" (%P|%t) Unable to get Naming Manager ")
+                           ACE_TEXT ("Reference.\n")),
                           -1);
 
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception raised initialising ORB or POA");
+      ex._tao_print_exception (
+        ACE_TEXT ("Exception raised initialising ORB or POA"));
       return -1;
     }
 
@@ -162,14 +167,15 @@ LB_server::create_object_group (void)
       mem_style.nam.length (1);
 
       // Set the membership style property
-      mem_style.nam[0].id =
-        CORBA::string_dup ("org.omg.PortableGroup.MembershipStyle");
+      mem_style.nam[0].id = CORBA::string_dup (
+        ACE_TEXT_ALWAYS_CHAR ("org.omg.PortableGroup.MembershipStyle"));
+
       PortableGroup::MembershipStyleValue msv =
         PortableGroup::MEMB_APP_CTRL;
       mem_style.val <<= msv;
 
       this->object_group_ = this->naming_manager_->create_object_group (
-        "BasicGroup",
+        ACE_TEXT_ALWAYS_CHAR ("BasicGroup"),
         FT_Naming::ROUND_ROBIN,
         criteria);
 
@@ -181,7 +187,7 @@ LB_server::create_object_group (void)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "Exception raised while creating object group");
+        ACE_TEXT ("Exception raised while creating object group"));
       return -1;
     }
 
@@ -208,7 +214,8 @@ LB_server::register_servant (Basic *servant, const char *loc)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception raised while registering servant");
+      ex._tao_print_exception (
+        ACE_TEXT ("Exception raised while registering servant"));
       return -1;
     }
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/client.cpp
index 53e2b745a20..0ae4dcf4398 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/client.cpp
@@ -201,11 +201,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("b:d:o:p:q:r:s:"));
   int c;
   int i;
-  get_opts.long_option ("failover",    ACE_Get_Opt::NO_ARG);
-  get_opts.long_option ("persistence", ACE_Get_Opt::NO_ARG);
-  get_opts.long_option ("equivalence", ACE_Get_Opt::NO_ARG);
-  get_opts.long_option ("create",      ACE_Get_Opt::NO_ARG);
-  get_opts.long_option ("validate",    ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT ("failover"),
+                        ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT ("persistence"),
+                        ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT ("equivalence"),
+                        ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT ("create"),
+                        ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT ("validate"),
+                        ACE_Get_Opt::NO_ARG);
 
   while ((c = get_opts ()) != -1)
     switch (c)
@@ -255,23 +260,28 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       case 0:   // A long option was found
         {
           const char* long_option = get_opts.long_option ();
-          if (ACE_OS::strcmp (long_option, "failover") == 0)
+          if (ACE_OS::strcmp (long_option,
+                              ACE_TEXT ("failover")) == 0)
             {
               test_type = TT_FAILOVER;
             }
-          else if (ACE_OS::strcmp (long_option, "persistence") == 0)
+          else if (ACE_OS::strcmp (long_option,
+                                   ACE_TEXT ("persistence")) == 0)
             {
               test_type = TT_PERSISTENCE;
             }
-          else if (ACE_OS::strcmp (long_option, "equivalence") == 0)
+          else if (ACE_OS::strcmp (long_option,
+                                   ACE_TEXT ("equivalence")) == 0)
             {
               test_type = TT_EQUIVALENCE;
             }
-          else if (ACE_OS::strcmp (long_option, "create") == 0)
+          else if (ACE_OS::strcmp (long_option,
+                                   ACE_TEXT ("create")) == 0)
             {
               test_phase = TT_CREATE;
             }
-          else if (ACE_OS::strcmp (long_option, "validate") == 0)
+          else if (ACE_OS::strcmp (long_option,
+                                   ACE_TEXT ("validate")) == 0)
             {
               test_phase = TT_VALIDATE;
             }
@@ -325,7 +335,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             o_breadth ))
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("ERROR: Failover ObjectGroup Test Failed\n")));
+                      ACE_TEXT ("ERROR: Failover ObjectGroup ")
+                      ACE_TEXT ("Test Failed\n")));
           rc = RC_ERROR;
         } else {
           ACE_DEBUG ((LM_DEBUG,
@@ -348,11 +359,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                 false ))
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("ERROR: Persistence Creation Name Test Failed\n")));
+                          ACE_TEXT ("ERROR: Persistence Creation Name ")
+                          ACE_TEXT ("Test Failed\n")));
               rc = RC_ERROR;
             } else {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("INFO: Persistence Creation Name Test OK\n")));
+                          ACE_TEXT ("INFO: Persistence Creation Name ")
+                          ACE_TEXT ("Test OK\n")));
             }
             if (RC_SUCCESS != do_persistant_objectgroup_test(
               orb.in (),
@@ -363,11 +376,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
               false ))
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("ERROR: Persistence Creation ObjectGroup Test Failed\n")));
+                          ACE_TEXT ("ERROR: Persistence Creation ObjectGroup ")
+                          ACE_TEXT ("Test Failed\n")));
               rc = RC_ERROR;
             } else {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("INFO: Persistence Creation ObjectGroup Test OK\n")));
+                          ACE_TEXT ("INFO: Persistence Creation ObjectGroup ")
+                          ACE_TEXT ("Test OK\n")));
             }
           break;
 
@@ -381,11 +396,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                 true ))
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("ERROR: Persistence Validation Name Test Failed\n")));
+                          ACE_TEXT ("ERROR: Persistence Validation ")
+                          ACE_TEXT ("Name Test Failed\n")));
               rc = RC_ERROR;
             } else {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("INFO: Persistence Validation Name Test OK\n")));
+                          ACE_TEXT ("INFO: Persistence Validation ")
+                          ACE_TEXT ("Name Test OK\n")));
             }
 
             if (RC_SUCCESS != do_persistant_objectgroup_test (
@@ -397,18 +414,21 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                 true ))
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("ERROR: Persistence Validation ObjectGroup Test Failed\n")));
+                          ACE_TEXT ("ERROR: Persistence Validation ")
+                          ACE_TEXT ("ObjectGroup Test Failed\n")));
               rc = RC_ERROR;
             } else {
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("INFO: Persistence Validation ObjectGroup Test OK\n")));
+                          ACE_TEXT ("INFO: Persistence Validation ")
+                          ACE_TEXT ("ObjectGroup Test OK\n")));
             }
           break;
 
           case TT_INIT:
           default:
             ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("ERROR: Missing Required Persistence Argument [--create|--validate] \n")));
+                        ACE_TEXT ("ERROR: Missing Required Persistence ")
+                        ACE_TEXT ("Argument [--create|--validate] \n")));
             rc = RC_ERROR;
           break;
         }
@@ -452,7 +472,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception (ACE_TEXT ("ERROR: Unable to resolve name servers"));
+    ex._tao_print_exception (
+      ACE_TEXT ("ERROR: Unable to resolve name servers"));
     return RC_ERROR;
   }
 
@@ -467,14 +488,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 ACE_CString get_group_name (int i)
 {
   char name[128];
-  ACE_OS::sprintf (name, "test_group_%i", i);
+  ACE_OS::sprintf (name, ACE_TEXT_ALWAYS_CHAR ("test_group_%i"), i);
   return ACE_CString (name);
 }
 
 ACE_CString get_member_location (int i, int j)
 {
   char name[128];
-  ACE_OS::sprintf (name, "test_location_%i_%i", i, j);
+  ACE_OS::sprintf (name, ACE_TEXT_ALWAYS_CHAR ("test_location_%i_%i"), i, j);
   return ACE_CString (name);
 }
 
@@ -536,7 +557,8 @@ do_failover_name_test (
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception (ACE_TEXT ("ERROR: Unable to resolve name servers"));
+    ex._tao_print_exception (
+      ACE_TEXT ("ERROR: Unable to resolve name servers"));
     return RC_ERROR;
   }
 
@@ -562,7 +584,7 @@ do_failover_name_test (
       level1.length (2);
 
       char wide_name[16];
-      ACE_OS::sprintf(wide_name, "obj_%d", i);
+      ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("obj_%d"), i);
       level1[1].id = CORBA::string_dup (wide_name);
 
       root_context_1->bind (level1, obj1.in ());
@@ -574,18 +596,25 @@ do_failover_name_test (
       }
       catch (const CosNaming::NamingContext::NotFound& ex)
         {
-          ex._tao_print_exception ("INFO: Unable to resolve object from replica.\n");
+          ex._tao_print_exception (
+            ACE_TEXT ("INFO: Unable to resolve object from replica.\n"));
 
           // Try again...
           try {
-            CORBA::Object_var obj1_on_replica = root_context_1->resolve (level1);
+
+            CORBA::Object_var obj1_on_replica =
+              root_context_1->resolve (level1);
+
             // We did find the object on the replica, but only after a wait.
             // This would be caused by a race condition to access the variable.
-            ACE_ERROR ((LM_ERROR, "INFO: Object appeared after a short wait.\n"));
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("INFO: Object appeared after a short ")
+                        ACE_TEXT ("wait.\n")));
           }
           catch (const CosNaming::NamingContext::NotFound& second_ex)
             {
-              ex._tao_print_exception ("ERROR: It really is not there. Failing...\n");
+              ex._tao_print_exception (
+                ACE_TEXT ("ERROR: It really is not there. Failing...\n"));
               return RC_ERROR;
             }
         }
@@ -593,7 +622,8 @@ do_failover_name_test (
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception (ACE_TEXT ("ERROR: Unable to create a lot of objects"));
+    ex._tao_print_exception (
+      ACE_TEXT ("ERROR: Unable to create a lot of objects"));
     return RC_ERROR;
   }
 
@@ -607,7 +637,7 @@ do_failover_name_test (
       CosNaming::Name deep;
       deep.length (1);
       char deep_name[16];
-      ACE_OS::sprintf(deep_name, "deep_%d", i);
+      ACE_OS::sprintf(deep_name, ACE_TEXT_ALWAYS_CHAR ("deep_%d"), i);
       deep[0].id = CORBA::string_dup (deep_name);
       CosNaming::NamingContext_var deep_context;
       deep_context = next_context->bind_new_context (deep);
@@ -616,7 +646,8 @@ do_failover_name_test (
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception (ACE_TEXT ("ERROR: Unable to create deep context"));
+    ex._tao_print_exception (
+      ACE_TEXT ("ERROR: Unable to create deep context"));
     return RC_ERROR;
   }
 
@@ -629,7 +660,7 @@ do_failover_name_test (
       CosNaming::Name wide;
       wide.length (1);
       char wide_name[16];
-      ACE_OS::sprintf(wide_name, "wide_%d", i);
+      ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("wide_%d"), i);
       wide[0].id = CORBA::string_dup (wide_name);
       CosNaming::NamingContext_var wide_context;
       wide_context = root_context_1->bind_new_context (wide);
@@ -672,9 +703,9 @@ do_failover_name_test (
     // Remove the second to last object from the Naming Context
     CosNaming::Name wide1;
     wide1.length (2);
-    wide1[0].id = CORBA::string_dup ("level1_context");
+    wide1[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("level1_context"));
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "obj_%d", o_breadth-2);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("obj_%d"), o_breadth-2);
     wide1[1].id = CORBA::string_dup (wide_name);
     root_context_1->unbind (wide1);
 
@@ -706,7 +737,7 @@ do_failover_name_test (
     // Remove the second to last context from the wide root Naming Context
     CosNaming::Name wide2;
     wide2.length (1);
-    ACE_OS::sprintf(wide_name, "wide_%d", c_breadth-2);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("wide_%d"), c_breadth-2);
     wide2[0].id = CORBA::string_dup (wide_name);
 
     CORBA::Object_var result_obj_ref = root_context_1->resolve (wide2);
@@ -732,7 +763,7 @@ do_failover_name_test (
     char deep_name[16];
     for (i=0; i<c_depth; i++)
     {
-      ACE_OS::sprintf(deep_name, "deep_%d", i);
+      ACE_OS::sprintf(deep_name, ACE_TEXT_ALWAYS_CHAR ("deep_%d"), i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
 
@@ -788,9 +819,9 @@ do_failover_name_test (
     // Access the last object from the Naming Context
     CosNaming::Name wide;
     wide.length (2);
-    wide[0].id = CORBA::string_dup ("level1_context");
+    wide[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("level1_context"));
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "obj_%d", o_breadth-1);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("obj_%d"), o_breadth-1);
     wide[1].id = CORBA::string_dup (wide_name);
     CORBA::Object_var result_obj_ref = root_context_1->resolve (wide);
     Test_Object_var result_object = Test_Object::_narrow (result_obj_ref.in ());
@@ -814,9 +845,9 @@ do_failover_name_test (
     // Access the deleted second to last object from the Naming Context
     CosNaming::Name wide;
     wide.length (2);
-    wide[0].id = CORBA::string_dup ("level1_context");
+    wide[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("level1_context"));
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "obj_%d", o_breadth-2);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("obj_%d"), o_breadth-2);
     wide[1].id = CORBA::string_dup (wide_name);
 
     CORBA::Object_var result_obj_ref = root_context_1->resolve (wide);
@@ -850,7 +881,7 @@ do_failover_name_test (
     CosNaming::Name wide;
     wide.length (1);
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "wide_%d", c_breadth-1);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("wide_%d"), c_breadth-1);
     wide[0].id = CORBA::string_dup (wide_name);
 
     CORBA::Object_var result_obj_ref = root_context_1->resolve (wide);
@@ -882,7 +913,7 @@ do_failover_name_test (
     CosNaming::Name wide;
     wide.length (2);
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "wide_%d", c_breadth-2);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("wide_%d"), c_breadth-2);
     wide[0].id = CORBA::string_dup (wide_name);
 
     CORBA::Object_var result_obj_ref = root_context_1->resolve (wide);
@@ -910,7 +941,7 @@ do_failover_name_test (
     char deep_name[16];
     for (i=0; i<c_depth; i++)
     {
-      ACE_OS::sprintf(deep_name, "deep_%d", i);
+      ACE_OS::sprintf(deep_name, ACE_TEXT_ALWAYS_CHAR ("deep_%d"), i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
 
@@ -941,7 +972,7 @@ do_failover_name_test (
     char deep_name[16];
     for (i=0; i<c_depth-1; i++)
     {
-      ACE_OS::sprintf(deep_name, "deep_%d", i);
+      ACE_OS::sprintf(deep_name, ACE_TEXT_ALWAYS_CHAR ("deep_%d"), i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
 
@@ -1189,7 +1220,7 @@ do_persistant_name_test (
     // Bind one context level under root.
     CosNaming::Name level1;
     level1.length (1);
-    level1[0].id = CORBA::string_dup ("level1_context");
+    level1[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("level1_context"));
 
     if( false == validate_only ) {
       CosNaming::NamingContext_var level1_context;
@@ -1205,7 +1236,7 @@ do_persistant_name_test (
 
       level1.length (2);
       char wide_name[16];
-      ACE_OS::sprintf(wide_name, "obj_%d", i);
+      ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("obj_%d"), i);
       level1[1].id = CORBA::string_dup (wide_name);
 
       if( false == validate_only ) {
@@ -1254,7 +1285,7 @@ do_persistant_name_test (
         CosNaming::Name deep;
         deep.length (1);
         char deep_name[16];
-        ACE_OS::sprintf(deep_name, "deep_%d", i);
+        ACE_OS::sprintf(deep_name, ACE_TEXT_ALWAYS_CHAR ("deep_%d"), i);
         deep[0].id = CORBA::string_dup (deep_name);
 
         CosNaming::NamingContext_var deep_context;
@@ -1278,7 +1309,7 @@ do_persistant_name_test (
       CosNaming::Name wide;
       wide.length (1);
       char wide_name[16];
-      ACE_OS::sprintf(wide_name, "wide_%d", i);
+      ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("wide_%d"), i);
       wide[0].id = CORBA::string_dup (wide_name);
 
       if( false == validate_only ) {
@@ -1657,7 +1688,7 @@ do_equivalence_name_test (
     // Bind one context level under root.
     CosNaming::Name level1;
     level1.length (1);
-    level1[0].id = CORBA::string_dup ("level1_context");
+    level1[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR("level1_context"));
     CosNaming::NamingContext_var level1_context;
     level1_context = root_context_1->bind_new_context (level1);
 
@@ -1670,7 +1701,7 @@ do_equivalence_name_test (
 
       level1.length (2);
       char wide_name[16];
-      ACE_OS::sprintf(wide_name, "obj_%d", i);
+      ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("obj_%d"), i);
       level1[1].id = CORBA::string_dup (wide_name);
       root_context_1->bind (level1, obj1.in ());
 
@@ -1714,7 +1745,7 @@ do_equivalence_name_test (
       CosNaming::Name deep;
       deep.length (1);
       char deep_name[16];
-      ACE_OS::sprintf(deep_name, "deep_%d", i);
+      ACE_OS::sprintf(deep_name, ACE_TEXT_ALWAYS_CHAR ("deep_%d"), i);
       deep[0].id = CORBA::string_dup (deep_name);
       CosNaming::NamingContext_var deep_context;
       deep_context = next_context->bind_new_context (deep);
@@ -1736,7 +1767,7 @@ do_equivalence_name_test (
       CosNaming::Name wide;
       wide.length (1);
       char wide_name[16];
-      ACE_OS::sprintf(wide_name, "wide_%d", i);
+      ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("wide_%d"), i);
       wide[0].id = CORBA::string_dup (wide_name);
       CosNaming::NamingContext_var wide_context;
       wide_context = root_context_1->bind_new_context (wide);
@@ -1775,7 +1806,8 @@ do_equivalence_name_test (
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception (ACE_TEXT ("ERROR: Unable to create wide context"));
+    ex._tao_print_exception (
+      ACE_TEXT ("ERROR: Unable to create wide context"));
     return RC_ERROR;
   }
 
@@ -1784,9 +1816,11 @@ do_equivalence_name_test (
     // Remove the second to last object from the Naming Context
     CosNaming::Name wide1;
     wide1.length (2);
-    wide1[0].id = CORBA::string_dup ("level1_context");
+
+    wide1[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("level1_context"));
+
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "obj_%d", o_breadth-2);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("obj_%d"), o_breadth-2);
     wide1[1].id = CORBA::string_dup (wide_name);
     root_context_1->unbind (wide1);
 
@@ -1799,26 +1833,29 @@ do_equivalence_name_test (
       // there is an error. This means the replica did
       // not register the loss of the context.
       ACE_ERROR (( LM_ERROR,
-                   "INFO: Unbound deep context not removed from replica. Trying again...\n"));
+                   ACE_TEXT ("INFO: Unbound deep context not removed from ")
+                   ACE_TEXT ("replica. Trying again...\n")));
 
       retried = true;  // Mark this so it can be reported in catch block.
       obj1_on_replica = root_context_2->resolve (wide1);
 
       ACE_ERROR_RETURN (( LM_ERROR,
-                          "ERROR: Unbound context not removed from on retry\n"),
+                          ACE_TEXT ("ERROR: Unbound context not removed from ")
+                          ACE_TEXT ("on retry\n")),
                           RC_ERROR);
     }
     catch (const CosNaming::NamingContext::NotFound& ex)
       {
         // Not on replica --- as it should be.
         if (retried)  // Was found on the retry
-          ACE_ERROR ((LM_ERROR, "INFO: Was removed after short wait.\n"));
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("INFO: Was removed after short wait.\n")));
       }
 
     // Remove the second to last context from the wide root Naming Context
     CosNaming::Name wide2;
     wide2.length (1);
-    ACE_OS::sprintf(wide_name, "wide_%d", c_breadth-2);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("wide_%d"), c_breadth-2);
     wide2[0].id = CORBA::string_dup (wide_name);
 
     CORBA::Object_var result_obj_ref = root_context_1->resolve (wide2);
@@ -1829,8 +1866,8 @@ do_equivalence_name_test (
     if (CORBA::is_nil (result_object.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
-                          ACE_TEXT ("ERROR: Problems with resolving wide context ")
-                          ACE_TEXT ("- nil object ref.\n")),
+                          ACE_TEXT ("ERROR: Problems with resolving wide")
+                          ACE_TEXT (" context - nil object ref.\n")),
                           RC_ERROR);
     }
 
@@ -1843,7 +1880,7 @@ do_equivalence_name_test (
     char deep_name[16];
     for (i=0; i<c_depth; i++)
     {
-      ACE_OS::sprintf(deep_name, "deep_%d", i);
+      ACE_OS::sprintf(deep_name, ACE_TEXT_ALWAYS_CHAR ("deep_%d"), i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
     result_obj_ref = root_context_1->resolve (deep);
@@ -1851,8 +1888,8 @@ do_equivalence_name_test (
     if (CORBA::is_nil (result_object.in ()))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("ERROR: Problems with resolving deep context ")
-                         ACE_TEXT ("- nil object ref.\n")),
+                         ACE_TEXT ("ERROR: Problems with resolving deep")
+                         ACE_TEXT (" context - nil object ref.\n")),
                          RC_ERROR);
     }
     result_object->destroy();
@@ -1867,12 +1904,15 @@ do_equivalence_name_test (
       // there is an error. This means the replica did
       // not register the loss of the context.
       ACE_ERROR (( LM_ERROR,
-                   "INFO: Unbound deep context not removed from replica. Trying again...\n"));
+                   ACE_TEXT ("INFO: Unbound deep context not removed from")
+                   ACE_TEXT ("replica. Trying again...\n")));
+
       retried = true;  // Mark this so it can be reported in catch block.
       obj1_on_replica = root_context_2->resolve (deep);
 
       ACE_ERROR_RETURN (( LM_ERROR,
-                          "ERROR: Unbound context not removed from on retry\n"),
+                          ACE_TEXT ("ERROR: Unbound context not removed from")
+                          ACE_TEXT (" on retry\n")),
                           RC_ERROR);
     }
     catch (const CosNaming::NamingContext::NotFound& ex)
@@ -1896,9 +1936,9 @@ do_equivalence_name_test (
     // Access the last object from the Naming Context
     CosNaming::Name wide;
     wide.length (2);
-    wide[0].id = CORBA::string_dup ("level1_context");
+    wide[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("level1_context"));
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "obj_%d", o_breadth-1);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("obj_%d"), o_breadth-1);
     wide[1].id = CORBA::string_dup (wide_name);
     CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
     Test_Object_var result_object = Test_Object::_narrow (result_obj_ref.in ());
@@ -1906,15 +1946,16 @@ do_equivalence_name_test (
     if (CORBA::is_nil (result_object.in ()))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("ERROR: Problems with resolving object from ")
-                         ACE_TEXT ("redundant server - nil object ref.\n")),
+                         ACE_TEXT ("ERROR: Problems with resolving object ")
+                         ACE_TEXT ("from redundant server ")
+                         ACE_TEXT ("- nil object ref.\n")),
                          RC_ERROR);
     }
   }
   catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception (
-        ACE_TEXT ( "ERROR: Unable to resolve object from redundant server"));
+        ACE_TEXT ("ERROR: Unable to resolve object from redundant server"));
     return RC_ERROR;
   }
 
@@ -1923,9 +1964,9 @@ do_equivalence_name_test (
     // Access the deleted second to last object from the Naming Context
     CosNaming::Name wide;
     wide.length (2);
-    wide[0].id = CORBA::string_dup ("level1_context");
+    wide[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("level1_context"));
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "obj_%d", o_breadth-2);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("obj_%d"), o_breadth-2);
     wide[1].id = CORBA::string_dup (wide_name);
 
     CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
@@ -1941,7 +1982,8 @@ do_equivalence_name_test (
     // Make sure the right exception reason is provided.
     if (ex.why != CosNaming::NamingContext::missing_node)
       ACE_ERROR_RETURN (( LM_ERROR,
-                          ACE_TEXT ("ERROR: Wrong exception returned during resolve.\n")),
+                          ACE_TEXT ("ERROR: Wrong exception returned during ")
+                          ACE_TEXT ("resolve.\n")),
                           RC_ERROR);
   }
   catch (const CORBA::Exception& ex)
@@ -1957,7 +1999,7 @@ do_equivalence_name_test (
     CosNaming::Name wide;
     wide.length (1);
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "wide_%d", c_breadth-1);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("wide_%d"), c_breadth-1);
     wide[0].id = CORBA::string_dup (wide_name);
     CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
 
@@ -1967,8 +2009,9 @@ do_equivalence_name_test (
     if (CORBA::is_nil (result_object.in ()))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("ERROR: Problems with resolving wide context from ")
-                         ACE_TEXT ("redundant server - nil object ref.\n")),
+                         ACE_TEXT ("ERROR: Problems with resolving wide ")
+                         ACE_TEXT ("context from redundant server ")
+                         ACE_TEXT ("- nil object ref.\n")),
                          RC_ERROR);
     }
   }
@@ -1978,7 +2021,8 @@ do_equivalence_name_test (
     }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception ( ACE_TEXT ("ERROR: Unexpected Exception received.\n"));
+    ex._tao_print_exception ( ACE_TEXT ("ERROR: Unexpected Exception ")
+                              ACE_TEXT ("received.\n"));
     return RC_ERROR;
   }
 
@@ -1988,13 +2032,14 @@ do_equivalence_name_test (
     CosNaming::Name wide;
     wide.length (2);
     char wide_name[16];
-    ACE_OS::sprintf(wide_name, "wide_%d", c_breadth-2);
+    ACE_OS::sprintf(wide_name, ACE_TEXT_ALWAYS_CHAR ("wide_%d"), c_breadth-2);
     wide[0].id = CORBA::string_dup (wide_name);
     CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
 
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("ERROR: Problems with resolving wide context from ")
-                       ACE_TEXT ("redundant server - deleted object found.\n")),
+                       ACE_TEXT ("ERROR: Problems with resolving wide context ")
+                       ACE_TEXT ("from redundant server ")
+                       ACE_TEXT ("- deleted object found.\n")),
                        RC_ERROR);
   }
   catch (const CosNaming::NamingContext::NotFound&)
@@ -2003,7 +2048,8 @@ do_equivalence_name_test (
     }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception ( ACE_TEXT ("ERROR: Unexpected Exception received.\n"));
+    ex._tao_print_exception ( ACE_TEXT ("ERROR: Unexpected Exception ")
+                              ACE_TEXT ("received.\n"));
     return RC_ERROR;
   }
 
@@ -2015,14 +2061,15 @@ do_equivalence_name_test (
     char deep_name[16];
     for (i=0; i<c_depth; i++)
     {
-      ACE_OS::sprintf(deep_name, "deep_%d", i);
+      ACE_OS::sprintf(deep_name, ACE_TEXT_ALWAYS_CHAR ("deep_%d"), i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
     CORBA::Object_var result_obj_ref = root_context_1->resolve (deep);
 
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("ERROR: Problems with resolving deep context from ")
-                       ACE_TEXT ("redundant server - deleted object found.\n")),
+                       ACE_TEXT ("ERROR: Problems with resolving deep context ")
+                       ACE_TEXT ("from redundant server ")
+                       ACE_TEXT ("- deleted object found.\n")),
                        RC_ERROR);
   }
   catch (const CosNaming::NamingContext::NotFound&)
@@ -2045,7 +2092,7 @@ do_equivalence_name_test (
     char deep_name[16];
     for (i=0; i<c_depth-1; i++)
     {
-      ACE_OS::sprintf(deep_name, "deep_%d", i);
+      ACE_OS::sprintf(deep_name, ACE_TEXT_ALWAYS_CHAR ("deep_%d"), i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
     CORBA::Object_var result_obj_ref = root_context_1->resolve (deep);
@@ -2056,15 +2103,16 @@ do_equivalence_name_test (
     if (CORBA::is_nil (result_object.in ()))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                      ACE_TEXT ("ERROR: Problems with resolving deep context from ")
-                      ACE_TEXT ("redundant server - nil object ref.\n")),
+                      ACE_TEXT ("ERROR: Problems with resolving deep ")
+                      ACE_TEXT ("context from redundant server ")
+                      ACE_TEXT ("- nil object ref.\n")),
                       RC_ERROR);
     }
   }
   catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception (
-      ACE_TEXT ( "ERROR: Unable to resolve deep context from redundant server"));
+      ACE_TEXT ("ERROR: Unable to resolve deep context from redundant server."));
     return RC_ERROR;
   }
 
@@ -2111,7 +2159,9 @@ do_equivalence_objectgroup_test (
                           RC_ERROR);
     }
 
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("INFO: nm1ref: %s\n"), nm1ref));
+    ACE_DEBUG (( LM_DEBUG,
+                 ACE_TEXT ("INFO: nm1ref: %s\n"),
+                 nm1ref));
 
     CORBA::Object_var nm1obj =
       orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (nm1ref));
@@ -2119,7 +2169,8 @@ do_equivalence_objectgroup_test (
     if (CORBA::is_nil (nm1obj.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
-                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm1ref),
+                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),
+                          nm1ref),
                           RC_ERROR);
     }
 
@@ -2127,7 +2178,8 @@ do_equivalence_objectgroup_test (
     if (CORBA::is_nil (naming_manager_1.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
-                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm1ref),
+                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),
+                          nm1ref),
                           RC_ERROR);
     }
 
@@ -2139,7 +2191,9 @@ do_equivalence_objectgroup_test (
                           RC_ERROR);
     }
 
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("INFO: nm2ref: %s\n"), nm2ref));
+    ACE_DEBUG (( LM_DEBUG,
+                 ACE_TEXT ("INFO: nm2ref: %s\n"),
+                 nm2ref));
 
     CORBA::Object_var nm2obj =
       orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (nm2ref));
@@ -2147,7 +2201,8 @@ do_equivalence_objectgroup_test (
     if (CORBA::is_nil (nm2obj.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
-                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm2ref),
+                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),
+                          nm2ref),
                           RC_ERROR);
     }
 
@@ -2156,7 +2211,8 @@ do_equivalence_objectgroup_test (
     if (CORBA::is_nil (naming_manager_2.in ()))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
-                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm2ref),
+                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),
+                          nm2ref),
                           RC_ERROR);
     }
 
@@ -2172,7 +2228,8 @@ do_equivalence_objectgroup_test (
     if (RC_SUCCESS != svc1.set_naming_manager (naming_manager_1))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
-                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm1ref),
+                          ACE_TEXT ("ERROR: invalid ior <%s>\n"),
+                          nm1ref),
                           RC_ERROR);
     }
 
@@ -2193,14 +2250,15 @@ do_equivalence_objectgroup_test (
     }
 
     /// Now validate seamless operations between the two instances of NS_group
-    const char* policy       = "round";
-    const char* test_group_1 = "test_group_1";
-    const char* test_group_2 = "test_group_2";
+    const char* policy       = ACE_TEXT_ALWAYS_CHAR ("round");
+    const char* test_group_1 = ACE_TEXT_ALWAYS_CHAR ("test_group_1");
+    const char* test_group_2 = ACE_TEXT_ALWAYS_CHAR ("test_group_2");
 
     if (RC_SUCCESS != svc1.group_create (test_group_1, policy))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
-                          ACE_TEXT ("ERROR: Unable to create %s\n"),test_group_1),
+                          ACE_TEXT ("ERROR: Unable to create %s\n"),
+                          test_group_1),
                           RC_ERROR);
     }
 
@@ -2210,7 +2268,8 @@ do_equivalence_objectgroup_test (
     if (RC_SUCCESS != svc2.group_create (test_group_2, policy))
     {
       ACE_ERROR_RETURN (( LM_ERROR,
-                          ACE_TEXT ("ERROR: Unable to create %s\n"),test_group_2),
+                          ACE_TEXT ("ERROR: Unable to create %s\n"),
+                          test_group_2),
                           RC_ERROR);
     }
 
@@ -2218,40 +2277,56 @@ do_equivalence_objectgroup_test (
     {
       ++error_count;
       ACE_DEBUG (( LM_DEBUG,
-                   ACE_TEXT ("ERROR: Primary Not Able To Find Object Group %s Created By Primary In Repository\n"), test_group_1));
+                   ACE_TEXT ("ERROR: Primary Not Able To Find Object Group ")
+                   ACE_TEXT ("%s Created By Primary In Repository\n"),
+                   test_group_1));
     } else {
       ACE_DEBUG (( LM_DEBUG,
-                   ACE_TEXT ("INFO: Primary Found Object Group %s Created By Primary In Repository\n"), test_group_1));
+                   ACE_TEXT ("INFO: Primary Found Object Group %s Created By ")
+                   ACE_TEXT ("Primary In Repository\n"),
+                   test_group_1));
     }
 
     if (false == svc2.group_exist(test_group_2))
     {
       ++error_count;
       ACE_DEBUG (( LM_DEBUG,
-                   ACE_TEXT ("ERROR: Backup Not Able To Find Object Group %s Created By Backup In Repository\n"), test_group_2));
+                   ACE_TEXT ("ERROR: Backup Not Able To Find Object Group %s ")
+                   ACE_TEXT ("Created By Backup In Repository\n"),
+                   test_group_2));
     } else {
       ACE_DEBUG (( LM_DEBUG,
-                   ACE_TEXT ("INFO: Backup Found Object Group %s Created By Backup In Repository\n"), test_group_2));
+                   ACE_TEXT ("INFO: Backup Found Object Group %s Created By ")
+                   ACE_TEXT ("Backup In Repository\n"),
+                   test_group_2));
     }
 
     if (false == svc1.group_exist(test_group_2))
     {
       ++error_count;
       ACE_DEBUG (( LM_DEBUG,
-                   ACE_TEXT ("ERROR: Primary Not Able To Find Object Group %s Created By Backup In Repository\n"), test_group_2));
+                   ACE_TEXT ("ERROR: Primary Not Able To Find Object Group %s ")
+                   ACE_TEXT ("Created By Backup In Repository\n"),
+                   test_group_2));
     } else {
       ACE_DEBUG (( LM_DEBUG,
-                   ACE_TEXT ("INFO: Primary Found Object Group %s Created By Backup In Repository\n"), test_group_2));
+                   ACE_TEXT ("INFO: Primary Found Object Group %s Created By ")
+                   ACE_TEXT ("Backup In Repository\n"),
+                   test_group_2));
     }
 
     if (false == svc2.group_exist(test_group_1))
     {
       ++error_count;
       ACE_DEBUG (( LM_DEBUG,
-                   ACE_TEXT ("ERROR: Backup Not Able To Find Object Group %s Created By Primary In Repository\n"), test_group_1));
+                   ACE_TEXT ("ERROR: Backup Not Able To Find Object Group %s ")
+                   ACE_TEXT ("Created By Primary In Repository\n"),
+                   test_group_1));
     } else {
       ACE_DEBUG (( LM_DEBUG,
-                   ACE_TEXT ("INFO: Backup Found Object Group %s Created By Primary In Repository\n"), test_group_1));
+                   ACE_TEXT ("INFO: Backup Found Object Group %s Created By ")
+                   ACE_TEXT ("Primary In Repository\n"),
+                   test_group_1));
     }
 
   }
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/server.cpp
index ada12424c2d..57b661e1bd6 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerance/server.cpp
@@ -8,12 +8,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      const char *location1 = "location1";
-      const char *location2 = "location2";
-      const char *location3 = "location3";
-      const char *location4 = "location4";
-      const char *location5 = "location5";
-      const char *location6 = "location6";
+      const char *location1 = ACE_TEXT_ALWAYS_CHAR ("location1");
+      const char *location2 = ACE_TEXT_ALWAYS_CHAR ("location2");
+      const char *location3 = ACE_TEXT_ALWAYS_CHAR ("location3");
+      const char *location4 = ACE_TEXT_ALWAYS_CHAR ("location4");
+      const char *location5 = ACE_TEXT_ALWAYS_CHAR ("location5");
+      const char *location6 = ACE_TEXT_ALWAYS_CHAR ("location6");
 
       LB_server lb_server (argc, argv);
 
@@ -25,13 +25,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       CosNaming::Name name (1);
       name.length (1);
-      name[0].id = CORBA::string_dup ("basic_name");
+      name[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("basic_name"));
       try {
         (lb_server.name_svc ())->rebind (name, lb_server.object_group ());
       }
       catch (const CORBA::Exception& ex)
       {
-        ex._tao_print_exception ("Unable to bind object group in name service.\n");
+        ex._tao_print_exception (
+          ACE_TEXT ("Unable to bind object group in name service.\n"));
         return 1;
       }
 
@@ -103,7 +104,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       lb_server.orb ()->run ();
 
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("(%P|%t) server - event loop finished\n")));
 
       if (lb_server.destroy () == -1)
         return 1;
@@ -111,7 +113,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("lb_server exception");
+      ex._tao_print_exception (ACE_TEXT ("lb_server exception"));
       return 1;
     }
 
diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp
index bdbb1832048..c9489c4aa14 100644
--- a/TAO/utils/nsgroup/nsgroup.cpp
+++ b/TAO/utils/nsgroup/nsgroup.cpp
@@ -167,7 +167,7 @@ NSGROUP::start_orb (void)
     //
     //////////////////////////////////////////////////////////////////////////
     CORBA::Object_var naming_manager_object =
-      orb_->resolve_initial_references ("NamingManager");
+      orb_->resolve_initial_references ( ACE_TEXT_ALWAYS_CHAR("NamingManager") );
 
     FT_Naming::NamingManager_var naming_manager_ =
       FT_Naming::NamingManager::_narrow (naming_manager_object.in ());
@@ -182,7 +182,7 @@ NSGROUP::start_orb (void)
     //
     //////////////////////////////////////////////////////////////////////////
     CORBA::Object_var naming_object =
-      orb_->resolve_initial_references("NameService");
+      orb_->resolve_initial_references( ACE_TEXT_ALWAYS_CHAR("NameService") );
 
     CosNaming::NamingContextExt_var name_service_ =
       CosNaming::NamingContextExt::_narrow (naming_object.in ());
@@ -200,7 +200,7 @@ NSGROUP::start_orb (void)
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception ("\nException raised initialising ORB\n");
+    ex._tao_print_exception (ACE_TEXT("\nException raised initialising ORB\n"));
     return RC_ERROR;
   }
 
@@ -372,56 +372,54 @@ NSGROUP::parse_command_line (void)
 
     non_option_arg_count++;
 
-    //ACE_DEBUG ((LM_INFO, "Found non-option argument \"%s\"\n", this->argv_[i]));
 
-
-    if( ACE_OS::strncmp (this->argv_[i],"group_create",
-                        ACE_OS::strlen ("group_create")) == 0 ) {
+    if( ACE_OS::strncmp (this->argv_[i],ACE_TEXT("group_create"),
+                        ACE_OS::strlen (ACE_TEXT("group_create"))) == 0 ) {
 
       nsgroup_cmd_ =  NSGROUP_GROUP_CREATE;
 
-    } else if(ACE_OS::strncmp (this->argv_[i], "group_bind",
-                               ACE_OS::strlen ("group_bind")) == 0 ){
+    } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("group_bind"),
+                               ACE_OS::strlen (ACE_TEXT("group_bind"))) == 0 ){
 
       nsgroup_cmd_ =  NSGROUP_GROUP_BIND;
 
-    } else if(ACE_OS::strncmp (this->argv_[i], "group_unbind",
-                               ACE_OS::strlen ("group_unbind")) == 0 ){
+    } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("group_unbind"),
+                               ACE_OS::strlen (ACE_TEXT("group_unbind"))) == 0 ){
 
       nsgroup_cmd_ =  NSGROUP_GROUP_UNBIND;
 
-    } else if(ACE_OS::strncmp (this->argv_[i], "group_modify",
-                               ACE_OS::strlen ("group_modify")) == 0 ){
+    } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("group_modify"),
+                               ACE_OS::strlen (ACE_TEXT("group_modify"))) == 0 ){
 
       nsgroup_cmd_ =  NSGROUP_GROUP_MODIFY;
 
-    } else if(ACE_OS::strncmp (this->argv_[i], "group_list",
-                               ACE_OS::strlen ("group_list")) == 0 ){
+    } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("group_list"),
+                               ACE_OS::strlen (ACE_TEXT("group_list"))) == 0 ){
 
       nsgroup_cmd_ =  NSGROUP_GROUP_LIST;
 
-    } else if(ACE_OS::strncmp (this->argv_[i], "group_remove",
-                               ACE_OS::strlen ("group_remove")) == 0 ){
+    } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("group_remove"),
+                               ACE_OS::strlen (ACE_TEXT("group_remove"))) == 0 ){
 
       nsgroup_cmd_ =  NSGROUP_GROUP_REMOVE;
 
-    } else if(ACE_OS::strncmp (this->argv_[i], "member_list",
-                               ACE_OS::strlen ("member_list")) == 0 ){
+    } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("member_list"),
+                               ACE_OS::strlen (ACE_TEXT("member_list"))) == 0 ){
 
       nsgroup_cmd_ =  NSGROUP_MEMBER_LIST;
 
-    } else if(ACE_OS::strncmp (this->argv_[i], "member_add",
-                               ACE_OS::strlen ("member_add")) == 0 ){
+    } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("member_add"),
+                               ACE_OS::strlen (ACE_TEXT("member_add"))) == 0 ){
 
       nsgroup_cmd_ =  NSGROUP_MEMBER_ADD;
 
-    } else if(ACE_OS::strncmp (this->argv_[i], "member_remove",
-                               ACE_OS::strlen ("member_remove")) == 0 ){
+    } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("member_remove"),
+                               ACE_OS::strlen (ACE_TEXT("member_remove"))) == 0 ){
 
       nsgroup_cmd_ =  NSGROUP_MEMBER_REMOVE;
 
-    } else if(ACE_OS::strncmp (this->argv_[i], "member_show",
-                               ACE_OS::strlen ("member_show")) == 0 ){
+    } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("member_show"),
+                               ACE_OS::strlen (ACE_TEXT("member_show"))) == 0 ){
 
       nsgroup_cmd_ =  NSGROUP_MEMBER_SHOW;