1 files changed, 48 insertions, 34 deletions

diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
index 578e3e056ae..a1bee3a289b 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp
@@ -23,7 +23,7 @@ private:
 
 TestTask::TestTask(int argc, ACE_TCHAR **argv)
 {
-  orb_ = CORBA::ORB_init (argc, argv, "ServerORB");
+  orb_ = CORBA::ORB_init (argc, argv, ACE_TEXT_ALWAYS_CHAR ("ServerORB"));
   shutdown_ns_ = false;
   parse_args (argc, argv);
 }
@@ -37,7 +37,7 @@ void TestTask::end()
 int
 TestTask::parse_args (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:s"));
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("o:s"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -59,60 +59,70 @@ int TestTask::svc()
 
   try {
     // Get reference to Root POA
-    CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA");
-    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in());
+    CORBA::Object_var obj = orb_->resolve_initial_references (
+      ACE_TEXT_ALWAYS_CHAR ("RootPOA"));
+
+    PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ());
 
     // Activate POA Manager
-    PortableServer::POAManager_var mgr = poa->the_POAManager();
-    mgr->activate();
+    PortableServer::POAManager_var mgr = poa->the_POAManager ();
+    mgr->activate ();
 
     // Find the Naming Service
-    obj = orb_->string_to_object ("corbaloc:iiop:1.2@localhost:9932/NameService");
+    obj = orb_->string_to_object (
+      ACE_TEXT_ALWAYS_CHAR ("corbaloc:iiop:1.2@localhost:9932/NameService"));
+
     CosNaming::NamingContext_var rootB =
-      CosNaming::NamingContext::_narrow(obj.in());
+      CosNaming::NamingContext::_narrow (obj.in ());
 
-    if (CORBA::is_nil(rootB.in())) {
-      ACE_ERROR ((LM_ERROR, "Error, Nil Naming Context reference\n"));
+    if (CORBA::is_nil (rootB.in ())) {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("Error, Nil Naming Context reference\n")));
       return 1;
     }
     // Bind the example Naming Context, if necessary
     CosNaming::NamingContext_var example_nc;
     CosNaming::Name name;
     name.length(1);
-    name[0].id = CORBA::string_dup("example");
+    name[0].id = CORBA::string_dup( ACE_TEXT_ALWAYS_CHAR ("example"));
     try
     {
-      obj = rootB->resolve(name);
+      obj = rootB->resolve (name);
       example_nc =
-        CosNaming::NamingContext::_narrow(obj.in());
+        CosNaming::NamingContext::_narrow (obj.in ());
     }
     catch (const CosNaming::NamingContext::NotFound&)
     {
-      example_nc = rootB->bind_new_context(name);
+      example_nc = rootB->bind_new_context (name);
     }
 
     // Bind the Test object
-    name.length(2);
-    name[1].id = CORBA::string_dup("Hello");
+    name.length (2);
+    name[1].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("Hello"));
 
     // Create an object
-    Hello servant(orb_.in ());
-    PortableServer::ObjectId_var oid = poa->activate_object(&servant);
-    obj = poa->id_to_reference(oid.in());
-    rootB->rebind(name, obj.in());
+    Hello servant (orb_.in ());
+    PortableServer::ObjectId_var oid = poa->activate_object (&servant);
+    obj = poa->id_to_reference (oid.in ());
+    rootB->rebind (name, obj.in ());
 
-    ACE_DEBUG ((LM_INFO, "Hello object bound in Naming Service B\n"));
+    ACE_DEBUG ((LM_INFO,
+                ACE_TEXT ("Hello object bound in Naming Service B\n")));
 
-    name.length(1);
-    name[0].id = CORBA::string_dup ("nsB");
+    name.length (1);
+    name[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ("nsB"));
+
+    obj = orb_->string_to_object (
+      ACE_TEXT_ALWAYS_CHAR ("corbaloc:iiop:1.2@localhost:9931/NameService"));
 
-    obj = orb_->string_to_object ("corbaloc:iiop:1.2@localhost:9931/NameService");
     CosNaming::NamingContext_var rootA =
-      CosNaming::NamingContext::_narrow(obj.in());
+      CosNaming::NamingContext::_narrow (obj.in ());
 
     rootA->bind_context (name, rootB.in ());
 
-    ACE_DEBUG ((LM_INFO, "Root context of NS B bound in Naming Service A under name 'nsB'\n"));
+    ACE_DEBUG ((LM_INFO,
+                ACE_TEXT ("Root context of NS B bound in Naming Service A ")
+                ACE_TEXT ("under name 'nsB'\n")));
 
     CORBA::String_var ior =
       orb_->object_to_string (obj.in ());
@@ -121,14 +131,16 @@ int TestTask::svc()
     FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
     if (output_file == 0)
       ACE_ERROR_RETURN ((LM_ERROR,
-                          "Cannot open output file %s for writing IOR: %C\n",
-                          ior_output_file,
-                          ior.in ()),
-                          1);
-    ACE_OS::fprintf (output_file, "%s", ior.in ());
+                         ACE_TEXT ("Cannot open output file %s for writing ")
+                         ACE_TEXT ("IOR: %C\n"),
+                         ior_output_file,
+                         ior.in ()),
+                         1);
+    ACE_OS::fprintf (output_file, ACE_TEXT ("%s"), ior.in ());
     ACE_OS::fclose (output_file);
 
-    ACE_DEBUG ((LM_INFO, "Wrote IOR file\n"));
+    ACE_DEBUG ((LM_INFO,
+                ACE_TEXT ("Wrote IOR file\n")));
 
     // Normally we run the orb and the orb is shutdown by
     // calling TestTask::end().
@@ -140,7 +152,7 @@ int TestTask::svc()
   }
   catch (CORBA::Exception& ex)
   {
-    ex._tao_print_exception ("CORBA exception: ");
+    ex._tao_print_exception (ACE_TEXT ("CORBA exception: "));
   }
 
   return -1;
@@ -152,7 +164,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   TestTask test_ (argc, argv);
   if (test_.activate() == -1)
     {
-      ACE_ERROR_RETURN ((LM_ERROR, "Unable to start test task.\n"), -1);
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("Unable to start test task.\n")),
+                         -1);
     }
 
   // Wait the tasks to finish.