Mon Feb 23 08:08:15 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

66 files changed, 112 insertions, 112 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index 231de7b95fa..4e43658781e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -136,7 +136,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
   if (this->naming_client_.init (orb) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to initialize "
-                       "the TAO_Naming_Client. \n"),
+                       "the TAO_Naming_Client.\n"),
                       -1);
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index e4a5c40fe99..e19477d0dc4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -18,7 +18,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
   if (this->naming_client_.init (orb) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to initialize "
-                       "the TAO_Naming_Client. \n"),
+                       "the TAO_Naming_Client.\n"),
                       -1);
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index e27d6c6f70a..71e9e320dc4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -52,7 +52,7 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "In Handle Connection Requested \n"));
+                "In Handle Connection Requested\n"));
 
   for (CORBA::ULong i = 0;
        i < flowspec.length ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 31a0c3c72e2..2b30cbd763f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -63,7 +63,7 @@ FTP_Client_Callback::handle_timeout (void *)
       mb.wr_ptr (n);
       int result = this->protocol_object_->send_frame (&mb);
       if (result < 0)
-        ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send \n"),-1);
+        ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send\n"),-1);
       ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent succesfully\n"));
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 875afcecd16..20113214d4f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -114,7 +114,7 @@ Server::init (int argc,
       if (my_naming_client_.init (this->orb_.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       ACE_NEW_RETURN (this->streamendpoint_b_, TAO_StreamEndPoint_B, -1);
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index d4bd8fe9341..2f339f6f4f8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -174,7 +174,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating scale factory . . . "));
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done %d \n", gsf));
+      ACE_DEBUG ((LM_DEBUG, "done %d\n", gsf));
 
       recv_latency.dump_results (ACE_TEXT("Receive"), gsf);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 2a0e49e4614..6535bea33bd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -76,7 +76,7 @@ FTP_Client_Callback::handle_timeout (void *)
   mb.wr_ptr (n);
   int result = this->protocol_object_->send_frame (&mb);
   if (result < 0)
-    ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send \n"),-1);
+    ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send\n"),-1);
   ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent succesfully\n"));
   return 0;
 }
@@ -228,7 +228,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
   if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to initialize "
-                       "the TAO_Naming_Client. \n"),
+                       "the TAO_Naming_Client.\n"),
                       -1);
 
   this->fp_ = ACE_OS::fopen (this->filename_,"r");
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index a55e6ee17ee..ca5a98725f1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -82,7 +82,7 @@ Server::init (int argc,
       if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       // Register the video mmdevice object with the ORB
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 7d0c22ae926..2659afd4333 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -69,7 +69,7 @@ FTP_Client_Callback::handle_timeout (void *)
   mb.wr_ptr (n);
   int result = this->protocol_object_->send_frame (&mb);
   if (result < 0)
-    ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send \n"),-1);
+    ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send\n"),-1);
   ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent succesfully\n"));
   return 0;
 }
@@ -196,7 +196,7 @@ Client::bind_to_server (const char *name)
       if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       CosNaming::Name server_mmdevice_name (1);
@@ -257,7 +257,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
       if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       this->fp_ = ACE_OS::fopen (this->filename_, "r");
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 97c49ba3a29..9fa41e91af8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -128,7 +128,7 @@ Server::init (int argc, ACE_TCHAR *argv[])
       if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       // Register the video mmdevice object with the ORB
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 33452156a47..d73d81073d2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -134,7 +134,7 @@ Client::bind_to_server (void)
   if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to initialize "
-                       "the TAO_Naming_Client. \n"),
+                       "the TAO_Naming_Client.\n"),
                       -1);
 
   CosNaming::Name server_mmdevice_name (1);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index eb9490c8fc0..9c4a3d00fbc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -91,7 +91,7 @@ Receiver_Callback::dump_samples (const char* file)
   if (stats_file == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "Stats.dat cannot be opened \n"));
+                  "Stats.dat cannot be opened\n"));
     }
 
   int i;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index adfddba07e3..1371bab30eb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -93,7 +93,7 @@ Sender::parse_args (int argc,
             max_frame_count_ = (long) ACE_OS::atoi (opts.opt_arg ());
             if (max_frame_count_ > 1000000)
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Max Frame Count should be < 10^6 \n"),
+                                 "Max Frame Count should be < 10^6\n"),
                                 -1);
             break;
           }
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index 15686e8c246..c8b003d22a4 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -110,7 +110,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (CORBA::is_nil (inc.in ()))
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Error fetching naming context \n"));
+                      "(%P|%t) Error fetching naming context\n"));
         }
 
       CosNaming::Name service_name;
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 03f2728b975..bdf3372d8d6 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -239,7 +239,7 @@ Manager::run (void)
   catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_DEBUG,
-                         "Error in run \n"),
+                         "Error in run\n"),
                         -1);
     }
 
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index f5103791028..01d25056a80 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -262,7 +262,7 @@ Manager::run (void)
   catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_DEBUG,
-                         "Error in run \n"),
+                         "Error in run\n"),
                         -1);
     }
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index 9c8dd798cd7..b4bcbcaeda5 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -94,7 +94,7 @@ catch (const CORBA::Exception& ex)
   {
     ACE_DEBUG ((LM_ERROR, "Unexpected (non regression) error - test failed\n"));
     ex._tao_print_exception (
-      "Exception in TAO249_ServerRequest_Interceptor::receive_request \n");
+      "Exception in TAO249_ServerRequest_Interceptor::receive_request\n");
     throw;
   }
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index 6f175b1a458..a98700b1e51 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -173,7 +173,7 @@ catch (const CORBA::Exception& ex)
   {
     ACE_DEBUG ((LM_ERROR, "Unexpected (non regression problem) error - test failed\n"));
     ex._tao_print_exception (
-      "Exception in TAO249_ServerRequest_Interceptor2::receive_request \n");
+      "Exception in TAO249_ServerRequest_Interceptor2::receive_request\n");
     throw;
   }
 
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
index 574c0f4f4cb..568d5623fd5 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
@@ -40,7 +40,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         {
           ACE_DEBUG ((LM_ERROR, "Test Failed - Regression. "
                       "Sending UIPMC object ref to server failed with:\n"));
-          marshal._tao_print_exception ("Exception : \n");
+          marshal._tao_print_exception ("Exception :\n");
           result = 1;
         }
 
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
index bc80169a7f0..62d2fa1b2ec 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
@@ -91,7 +91,7 @@ catch (const CORBA::Exception& ex)
   {
     ACE_DEBUG ((LM_ERROR, "Unexpected (non regression) error - test failed\n"));
     ex._tao_print_exception (
-                               "Exception in TAO249_ServerRequest_Interceptor::receive_request \n");
+                               "Exception in TAO249_ServerRequest_Interceptor::receive_request\n");
     throw;
   }
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index c23a0046c76..523154493e4 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -139,7 +139,7 @@ CC_naming_service::init_naming_service (void)
       if (my_name_client_.init (orb_.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       CORBA::Object_var factory_obj = get_obj_from_name ("CosConcurrency",
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 84184769d00..bf88d4568a3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -65,7 +65,7 @@ EC_Reconnect::print_args (void) const
 {
   this->EC_Driver::print_args ();
 
-  ACE_DEBUG ((LM_DEBUG, "EC_Reconnect: \n"
+  ACE_DEBUG ((LM_DEBUG, "EC_Reconnect:\n"
               " consumer_reconnect = %d\n"
               " supplier_reconnect = %d\n"
               " disconnect_count = %d\n",
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index cfe01d9b337..90e1eda5d73 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -431,7 +431,7 @@ Heartbeat_Application::push (const RtecEventComm::EventSet &events)
             {
               ACE_ERROR ((LM_ERROR,
                           "Unable to add new entry "
-                          "to heartbeat database \n"));
+                          "to heartbeat database\n"));
               break;
             }
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index bee5057c8ea..ee84b1fba22 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -108,7 +108,7 @@ void FTClientMain::commandUsage(FILE* out)
     "  Access as attribute:\n"
     "    >N    set attribute to N\n"
     "    <     get attribite\n"
-    "  Try methods to be used by fault tolerant infrastructure: \n"
+    "  Try methods to be used by fault tolerant infrastructure:\n"
     "    !     is_alive\n"
     "    s     get_state\n"
     "    S     set_state\n"
@@ -122,7 +122,7 @@ void FTClientMain::commandUsage(FILE* out)
     "      (FT_TestReplica interface)\n"
     "        d%d before state change\n"
     "        d%d after state change, before replication\n"
-    "        d%d after replication, before reply \n"
+    "        d%d after replication, before reply\n"
     "      (Monitorable interface)\n"
     "        d%d during is alive\n"
     "        d%d is_alive returns false\n"
@@ -548,7 +548,7 @@ int FTClientMain::run (void)
       }
       catch (const CORBA::SystemException& sysex)
       {
-        ACE_OS::fprintf (stdout, "FT Client: Caught system exception: \n");
+        ACE_OS::fprintf (stdout, "FT Client: Caught system exception:\n");
         sysex._tao_print_exception ("FT Client");
 
         retry = 0;
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 3cfb829f6e3..a37500328c2 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -213,7 +213,7 @@ int FT_ReplicaFactory_i::parse_args (int argc, ACE_TCHAR * argv[])
         // fall thru
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s \n"
+                           "usage:  %s\n"
                            " -o <factory ior file>\n"
                            " -n <naming service registration name>\n"
                            " -f <factory registry ior file>\n"
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 7531b0fd5f9..33c4ae7fdfe 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -96,7 +96,7 @@ int TAO_FT_ReplicationManagerController::init (int &argc, ACE_TCHAR *argv[])
   {
     ex._tao_print_exception (
       ACE_TEXT (
-        "TAO_FT_ReplicationManagerController::init: \n"));
+        "TAO_FT_ReplicationManagerController::init:\n"));
     result = -1;
   }
 
@@ -166,7 +166,7 @@ int TAO_FT_ReplicationManagerController::run ()
   catch (const CORBA::Exception& ex)
   {
     ex._tao_print_exception (
-      ACE_TEXT ("TAO_FT_ReplicationManagerController::run: \n"));
+      ACE_TEXT ("TAO_FT_ReplicationManagerController::run:\n"));
     result = -1;
   }
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 2abf3d4c1f7..496a3d40a98 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -79,7 +79,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
   this->request_count_++;
 
 /*  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) receive_request_service_context called [%d] times \n",
+              "(%P|%t) receive_request_service_context called [%d] times\n",
               this->request_count_));
               */
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 48b577d9dc0..6b8b91aa288 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -94,7 +94,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (number < 250)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) ERROR: Did not forward to new location \n"));
+                      "(%P|%t) ERROR: Did not forward to new location\n"));
           ACE_OS::abort ();
         }
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 787ccb9e80f..9e33bcc9650 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -139,7 +139,7 @@ void test_colocal (ForwardRequestTest::test_ptr server)
   if (number < 250)
     {
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) ERROR: Did not forward to new location \n"));
+                  "(%P|%t) ERROR: Did not forward to new location\n"));
       ACE_OS::abort ();
     }
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index f2fe0c0d661..7083f81daae 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -199,7 +199,7 @@ Manager::run (void)
   catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_DEBUG,
-                         "Error in run \n"),
+                         "Error in run\n"),
                         -1);
     }
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 8754b8bacb0..65f59b5c21d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -23,7 +23,7 @@ void
 Simple_Server_i::remote_call (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Print out from process id (%P) hosting the servant \n")));
+              ACE_TEXT ("Print out from process id (%P) hosting the servant\n")));
 
   return;
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 768372bf632..45141f4d2c3 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -146,12 +146,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Testing for tagged component \n"));
+                  "(%P|%t) Testing for tagged component\n"));
 
       if ((ftc.object_group_ref_version != 5) &&
           (ftc.object_group_id != 10))
         ACE_ERROR ((LM_ERROR,
-                    "%P|%t) Not working right \n"));
+                    "%P|%t) Not working right\n"));
 
       if (retval)
         ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index 5b06ea1b9a0..872febf29b6 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -117,7 +117,7 @@ public:
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <foo_excep> called: \n"));
+                  "Callback method <foo_excep> called:\n"));
       try
         {
           excep_holder->raise_exception ();
@@ -138,19 +138,19 @@ public:
   void get_yadda_excep (::Messaging::ExceptionHolder *)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <get_yadda_excep> called: \n"));
+                  "Callback method <get_yadda_excep> called:\n"));
     };
 
   void set_yadda (void)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <set_yadda> called: \n"));
+                  "Callback method <set_yadda> called:\n"));
     };
 
   void set_yadda_excep (::Messaging::ExceptionHolder *)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <set_yadda_excep> called: \n"));
+                  "Callback method <set_yadda_excep> called:\n"));
     };
   ~Handler (void) {};
 };
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 83756525b0e..7210f9c1ab3 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -94,7 +94,7 @@ public:
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <foo_excep> called: \n"
+                  "Callback method <foo_excep> called:\n"
                                   "Testing proper exception handling ...\n"));
       try
         {
@@ -123,19 +123,19 @@ public:
   void get_yadda_excep (::Messaging::ExceptionHolder *)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <get_yadda_excep> called: \n"));
+                  "Callback method <get_yadda_excep> called:\n"));
     };
 
   void set_yadda (void)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <set_yadda> called: \n"));
+                  "Callback method <set_yadda> called:\n"));
     };
 
   void set_yadda_excep (::Messaging::ExceptionHolder *)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <set_yadda_excep> called: \n"));
+                  "Callback method <set_yadda_excep> called:\n"));
     };
 
 };
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index f8878cd9957..ae60fd04171 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -24,7 +24,7 @@ void
 Callback_i::callback_method (void)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
+    ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
 }
 
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index a2e5373f821..a6a95024e5b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -429,7 +429,7 @@ AdminProperties::create_consumers (void)
   catch (const CORBA::Exception& ex)
     {
         ex._tao_print_exception (
-          "\nError: Exception in connecting consumer \n");
+          "\nError: Exception in connecting consumer\n");
     }
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 0d1672c7b02..e041818db73 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -160,7 +160,7 @@ ConnectDisconnect::parse_args(int argc, ACE_TCHAR *argv[])
         {
           ACE_DEBUG((LM_DEBUG,
                      "usage: %s "
-                     "-count testcount \n"
+                     "-count testcount\n"
                      "-consumers number_of_consumers"
                      "-suppliers number_of_suppliers",
                      argv[0],
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 4e67ef9f65a..2adf54c8439 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -146,7 +146,7 @@ Events::parse_args (int argc,
           ACE_DEBUG((LM_DEBUG,
                      "usage: %s "
                      "-use_default_admin "
-                     "-events event_count \n",
+                     "-events event_count\n",
                      argv[0], argv[0]));
 
           arg_shifter.consume_arg ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index fefdbedaded..754a6e91714 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -72,14 +72,14 @@ Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin)
   this->verify_filter_count (filter_admin, 0);
 
   if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "Adding a filter \n"));
+    ACE_DEBUG ((LM_DEBUG, "Adding a filter\n"));
 
   CosNotifyFilter::FilterID id_1 = this->add_filter (filter_admin);
 
   this->verify_filter_count (filter_admin, 1);
 
   if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "Adding another filter \n"));
+    ACE_DEBUG ((LM_DEBUG, "Adding another filter\n"));
 
   this->add_filter (filter_admin);
 
@@ -87,7 +87,7 @@ Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 
   if (TAO_debug_level)
     {
-      ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
+      ACE_DEBUG ((LM_DEBUG, "Calling print_filters\n"));
       this->print_filters (filter_admin);
     }
 
@@ -101,18 +101,18 @@ Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 
   if (TAO_debug_level)
     {
-      ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
+      ACE_DEBUG ((LM_DEBUG, "Calling print_filters\n"));
       this->print_filters (filter_admin);
     }
 
   if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "Calling remove_all_filters \n"));
+    ACE_DEBUG ((LM_DEBUG, "Calling remove_all_filters\n"));
 
   filter_admin->remove_all_filters ();
 
   if (TAO_debug_level)
     {
-      ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
+      ACE_DEBUG ((LM_DEBUG, "Calling print_filters\n"));
       this->print_filters (filter_admin);
     }
 
@@ -163,7 +163,7 @@ Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 {
   CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters ();
 
-  ACE_DEBUG ((LM_DEBUG, "Getting all %d filters...\n ", filter_seq->length ()));
+  ACE_DEBUG ((LM_DEBUG, "Getting all %d filters...\n", filter_seq->length ()));
 
   for (CORBA::ULong i = 0; i < filter_seq->length (); ++i)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 5699ea12acd..6ca0434e2b7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -106,7 +106,7 @@ IdAssignment::init (int argc,
   if (CORBA::is_nil (obj.in ()))
     {
       ACE_ERROR ((LM_ERROR,
-                  " (%P|%t) Unable to locate Notify_Service \n"));
+                  " (%P|%t) Unable to locate Notify_Service\n"));
       return;
     }
 
@@ -237,7 +237,7 @@ IdAssignment::default_consumer_admin_test (CosNotifyChannelAdmin::ChannelID chan
                   " (%P|%t) Unable to create default consumer admin\n"),
                   false);
     }
-  
+
   CosNotifyChannelAdmin::ConsumerAdmin_var def = ec->default_consumer_admin ();
   if (CORBA::is_nil (default_consumer_admin.in()))
     {
@@ -249,7 +249,7 @@ IdAssignment::default_consumer_admin_test (CosNotifyChannelAdmin::ChannelID chan
   if (! default_consumer_admin->_is_equivalent(def.in ()))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-        " (%P|%t) failed for default consumer admin checking \n"),
+        " (%P|%t) failed for default consumer admin checking\n"),
         false);
     }
 
@@ -283,7 +283,7 @@ IdAssignment::default_supplier_admin_test (CosNotifyChannelAdmin::ChannelID chan
                   " (%P|%t) Unable to create default supplier admin\n"),
                   false);
     }
-  
+
   CosNotifyChannelAdmin::SupplierAdmin_var def = ec->default_supplier_admin ();
   if (CORBA::is_nil (default_supplier_admin.in()))
     {
@@ -295,7 +295,7 @@ IdAssignment::default_supplier_admin_test (CosNotifyChannelAdmin::ChannelID chan
   if (! default_supplier_admin->_is_equivalent(def.in ()))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-        " (%P|%t) failed for default supplier admin checking \n"),
+        " (%P|%t) failed for default supplier admin checking\n"),
         false);
     }
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index f0ce981c42e..4bb5813dbb1 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -43,7 +43,7 @@ LifeCycle::parse_args (int argc,
         {
           ACE_DEBUG ((LM_DEBUG,
                       "usage: %s "
-                      "-count testcount \n",
+                      "-count testcount\n",
                       argv[0],
                       argv[0]));
 
@@ -92,7 +92,7 @@ LifeCycle::init (int argc, ACE_TCHAR *argv[])
   if (CORBA::is_nil (notify_factory_.in ()))
     {
       ACE_ERROR ((LM_ERROR,
-                  " (%P|%t) Unable to locate Notify_Service \n"));
+                  " (%P|%t) Unable to locate Notify_Service\n"));
 
       return;
     }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index d171dc845e9..ef04ba96627 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -64,10 +64,10 @@ Sequence::init (int argc,
   if (TAO_debug_level)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Options: event count = %d \n"
-                  "supplier batch size = %d \n"
-                  "consumer batch size = %d \n"
-                  "pacing = %d secs \n"
+                  "Options: event count = %d\n"
+                  "supplier batch size = %d\n"
+                  "consumer batch size = %d\n"
+                  "pacing = %d secs\n"
                   , event_count_
                   , supplier_batch_size_
                   , consumer_batch_size_
@@ -176,7 +176,7 @@ Sequence::parse_args (int argc,
                      "-SupplierBatchSize size "
                      "-ConsumerBatchSize size "
                      "-ConsumerDelay delay "
-                     "-Pacing pacing \n",
+                     "-Pacing pacing\n",
                      argv[0], argv[0]));
 
           arg_shifter.consume_arg ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index 8af82cc6013..919c22d568f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -121,7 +121,7 @@ Simple_Test::parse_args (int argc,
         {
           ACE_DEBUG ((LM_DEBUG,
                       "usage: %s "
-                      "-events event_count \n",
+                      "-events event_count\n",
                       argv[0],
                       argv[0]));
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index b6ce2e54f17..426f2f2525e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -116,10 +116,10 @@ Updates::types_changed (const CosNotification::EventTypeSeq & added,
 {
   if (TAO_debug_level)
     {
-      ACE_DEBUG ((LM_DEBUG, "Added Types.. \n"));
+      ACE_DEBUG ((LM_DEBUG, "Added Types..\n"));
       this->print_event_types (added);
 
-      ACE_DEBUG ((LM_DEBUG, "Removed Types.. \n"));
+      ACE_DEBUG ((LM_DEBUG, "Removed Types..\n"));
       this->print_event_types (removed);
     }
 
@@ -224,7 +224,7 @@ Updates::test_subscription_change (void)
 
     if (TAO_debug_level)
       {
-        ACE_DEBUG ((LM_DEBUG, "obtain_subscription_types \n"));
+        ACE_DEBUG ((LM_DEBUG, "obtain_subscription_types\n"));
         this->print_event_types (obtained.in ());
       }
   }
@@ -260,7 +260,7 @@ Updates::test_subscription_change (void)
 
     if (TAO_debug_level)
       {
-        ACE_DEBUG ((LM_DEBUG, "obtain_subscription_types \n"));
+        ACE_DEBUG ((LM_DEBUG, "obtain_subscription_types\n"));
         this->print_event_types (obtained.in ());
       }
   }
@@ -295,7 +295,7 @@ Updates::test_subscription_change (void)
 
     if (TAO_debug_level)
       {
-        ACE_DEBUG ((LM_DEBUG, "obtain_subscription_types \n"));
+        ACE_DEBUG ((LM_DEBUG, "obtain_subscription_types\n"));
         this->print_event_types (obtained.in ());
       }
   }
@@ -342,7 +342,7 @@ Updates::test_offer_change (void)
 
     if (TAO_debug_level)
       {
-        ACE_DEBUG ((LM_DEBUG, "obtain_offer_types \n"));
+        ACE_DEBUG ((LM_DEBUG, "obtain_offer_types\n"));
         this->print_event_types (obtained.in ());
       }
   }
@@ -378,7 +378,7 @@ Updates::test_offer_change (void)
 
     if (TAO_debug_level)
       {
-        ACE_DEBUG ((LM_DEBUG, "obtain_offer_types \n"));
+        ACE_DEBUG ((LM_DEBUG, "obtain_offer_types\n"));
         this->print_event_types (obtained.in ());
       }
   }
@@ -413,7 +413,7 @@ Updates::test_offer_change (void)
 
     if (TAO_debug_level)
       {
-        ACE_DEBUG ((LM_DEBUG, "obtain_offer_types \n"));
+        ACE_DEBUG ((LM_DEBUG, "obtain_offer_types\n"));
         this->print_event_types (obtained.in ());
       }
   }
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
index 09239cbb0b7..d46024acacc 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -25,7 +25,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception (ACE_TEXT("Error: \n"));
+      ex._tao_print_exception (ACE_TEXT("Error:\n"));
       return 1;
     }
 
diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index ccdaceaccb2..4c02db89fee 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -21,7 +21,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception (ACE_TEXT("Error: \n"));
+      ex._tao_print_exception (ACE_TEXT("Error:\n"));
       return 1;
     }
 
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 57e42a969cf..c29c721f8df 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -126,7 +126,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
                           arg_shifter.consume_arg ();
 
                           if (TAO_debug_level > 0)
-                            ACE_DEBUG ((LM_DEBUG, "POA Create: band parsed - %d, %d \n",
+                            ACE_DEBUG ((LM_DEBUG, "POA Create: band parsed - %d, %d\n",
                                         bands_[b_index].low, bands_[b_index].high));
                           b_index++;
                         }
@@ -153,7 +153,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
                   arg_shifter.consume_arg ();
 
                   if (TAO_debug_level > 0)
-                    ACE_DEBUG ((LM_DEBUG, "ThreadPool parsed - static threads = %d, prio = %d \n",
+                    ACE_DEBUG ((LM_DEBUG, "ThreadPool parsed - static threads = %d, prio = %d\n",
                                 this->thread_pool_static_threads_, this->thread_pool_default_priority_));
 
                   continue;
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 9bf572f3fce..7607939e5a9 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -73,7 +73,7 @@ StructuredPushConsumer_i::offer_change (
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
   ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT ("(%P,%t) StructuredPushConsumer offered change \n")
+    ACE_TEXT ("(%P,%t) StructuredPushConsumer offered change\n")
     ));
 }
 
@@ -213,7 +213,7 @@ StructuredPushConsumer_i::push_structured_event (
   {
     this->problem_ = true;
     ACE_DEBUG ((LM_ERROR,
-      ACE_TEXT ("(%P|%t) Structured Consumer: no filterable data. \n")
+      ACE_TEXT ("(%P|%t) Structured Consumer: no filterable data.\n")
       ));
   }
   this->may_discard_ = 0;
@@ -621,7 +621,7 @@ AnyPushConsumer_i::push (
       {
         this->problem_ = true;
         ACE_DEBUG ((LM_ERROR,
-          ACE_TEXT ("(%P|%t) Any Consumer: no filterable data in structured event. \n")
+          ACE_TEXT ("(%P|%t) Any Consumer: no filterable data in structured event.\n")
           ));
       }
     }
@@ -864,10 +864,10 @@ void Consumer_Main::usage(FILE * out)const
     ACE_TEXT ("                    What type of event to send (pick one, default is -any)\n")
     ACE_TEXT ("  -expect n         How many events of each type are expected.\n")
     ACE_TEXT ("  -fail n           Throw an exception every n events.\n")
-    ACE_TEXT ("  -serial_number n  What serial number to start with \n")
+    ACE_TEXT ("  -serial_number n  What serial number to start with\n")
     ACE_TEXT ("                    or -1 to disable serial number checking.\n")
     ACE_TEXT ("  -v                Verbose output.\n")
-    ACE_TEXT ("  -disconnect       Disconnect from channel on exit (prevents reconnect.) \n")
+    ACE_TEXT ("  -disconnect       Disconnect from channel on exit (prevents reconnect.)\n")
     ACE_TEXT ("  -nonamesvc        Don't use the name service to find EventChannelFactory\n")
     , out);
   //FUZZ: enable check_for_lack_ACE_OS
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 9ea2f3233a5..bd32b35229d 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -310,7 +310,7 @@ void Supplier_Main::usage(FILE * log)const
       ACE_TEXT ("  -pause n          Pause after sending n events. Write to file \"Supplier.paused\"\n")
       ACE_TEXT ("  -serial_number n  What serial number to start with.\n")
       ACE_TEXT ("  -v                Verbose output.\n")
-      ACE_TEXT ("  -disconnect       Disconnect from channel on exit (prevents reconnect.) \n")
+      ACE_TEXT ("  -disconnect       Disconnect from channel on exit (prevents reconnect.)\n")
       ACE_TEXT ("  -nonamesvc        Don't use the name service to find EventChannelFactory\n")
       , log);
   //FUZZ: enable check_for_lack_ACE_OS
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index c8585a5c820..871ea1c1872 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -87,13 +87,13 @@ TAO_Notify_Tests_Worker::svc (void)
       return -1;
     }
 
-  ACE_DEBUG ((LM_ERROR, "Activated Worker Thread for commands @ priority:%d \n", priority));
+  ACE_DEBUG ((LM_ERROR, "Activated Worker Thread for commands @ priority:%d\n", priority));
 #endif
 
 
   try
     {
-      ACE_DEBUG ((LM_DEBUG, "Running Commands... \n"));
+      ACE_DEBUG ((LM_DEBUG, "Running Commands...\n"));
       this->cmd_builder_->execute ();
     }
   catch (const CORBA::Exception& ex)
@@ -145,7 +145,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
       return -1;
     }
 
-  ACE_DEBUG ((LM_ERROR, "Activated ORB Run Worker Thread to run the ORB @ priority:%d \n", priority));
+  ACE_DEBUG ((LM_ERROR, "Activated ORB Run Worker Thread to run the ORB @ priority:%d\n", priority));
 #endif
 
   try
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 194da57f3cb..8c9797dce3b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -81,7 +81,7 @@ void
 TAO_Notify_Tests_Periodic_Consumer::handle_start_event (const CosNotification::PropertySeq& prop_seq)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s received inital (-1)th event \n", this->name_.c_str ()));
+    ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s received inital (-1)th event\n", this->name_.c_str ()));
 
   for (CORBA::ULong i = 0; i < prop_seq.length (); ++i)
     {
@@ -203,7 +203,7 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification
 
   if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s received %d event type (%s,%s) \n", this->name_.c_str (), this->count_,
+      ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s received %d event type (%s,%s)\n", this->name_.c_str (), this->count_,
                   notification.header.fixed_header.event_type.domain_name.in(),
                   notification.header.fixed_header.event_type.type_name.in()));
     }
@@ -247,7 +247,7 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification
         this->client_->done (this);
 
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s done \n", this->name_.c_str ()));
+        ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer %s done\n", this->name_.c_str ()));
     }
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 30582741d3b..86d43a54f03 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -59,7 +59,7 @@ template <class Supplier_Traits> void
 TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed)
 {
   // Let the user see what we're subscribed for,
-  ACE_DEBUG ((LM_DEBUG, "(%P, %t) Calling Supplier offer change: \n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P, %t) Calling Supplier offer change:\n"));
 
   CORBA::ULong i = 0;
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index ec03c827fba..b4e5d216f68 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -91,8 +91,8 @@ RedGreen_Test::destroy_ec ()
           // around to figure out the problem.  Report the incident to the
           // log and be done with it.
           ACE_DEBUG ((LM_INFO,
-                      "INFO: Got a COMM_FAILURE exception while trying to \n"
-                      "      invoke `destroy()' on the Event Channel in the \n"
+                      "INFO: Got a COMM_FAILURE exception while trying to\n"
+                      "      invoke `destroy()' on the Event Channel in the\n"
                       "      RedGreen destroy_ec. This is likely not a problem.\n"));
         }
       catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index ef1d75e82c6..8c0a7edd4e5 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -36,7 +36,7 @@ Client::init (int argc,
   if (my_name_client_.init (manager_.orb()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to initialize "
-                       "the TAO_Naming_Client. \n"),
+                       "the TAO_Naming_Client.\n"),
                       -1);
 
   // Bind PropertySetDef Object.
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 7eb54e76f2c..66d117d3feb 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -428,7 +428,7 @@ TAO_PropertyNamesIterator_Tester::test_next_n (size_t n)
     }
   for (size_t i = 0; i < pnames_var.in ().length (); i++)
     ACE_DEBUG ((LM_DEBUG,
-                "str %s \n",
+                "str %s\n",
                 (const char *) pnames_var[i]));
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index a9caaab92ca..d3dda03a311 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -363,7 +363,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (my_name_client.init (orb.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       CosNaming::NamingContext_var context =
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index c5670db323b..5d1d575a31e 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -215,7 +215,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (my_name_client.init (orb.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       CosNaming::NamingContext_var context =
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index 02da1a0652c..a4438816292 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -24,7 +24,7 @@ void
 Callback_i::callback_method ()
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
+    ACE_DEBUG ((LM_DEBUG, "Callback method called\n"));
 }
 
 
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
index 7e496abba40..0b3846e0c1b 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
@@ -25,7 +25,7 @@ Client_Worker::validate_connection (void)
 
           if(TAO_debug_level > 0)
             ACE_DEBUG (( LM_DEBUG,
-                         "******** VALIDATED ******* \n"));
+                         "******** VALIDATED *******\n"));
         }
       catch (const CORBA::Exception&)
         {
@@ -57,7 +57,7 @@ Client_Worker::svc (void)
   catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) Got an exception \n"));
+                  "(%P|%t) Got an exception\n"));
       ex._tao_print_exception ("Client_Worker : Exception Raised");
 
       return -1;
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index 93cdb85e537..53af9eeb98d 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       client.thr_mgr ()->wait ();
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) threads finished \n"));
+                  "(%P|%t) threads finished\n"));
 
       // Shut down the server if -x option given in command line
       if (do_shutdown)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 102792a0f94..5486e50e4e6 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -27,7 +27,7 @@ Client_Worker::validate_connection (void)
           this->another_->test_method (j);
           if(TAO_debug_level > 0)
             ACE_DEBUG (( LM_DEBUG,
-                         "******** VALIDATED ******* \n"));
+                         "******** VALIDATED *******\n"));
         }
       catch (const CORBA::Exception&)
         {
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index b2ae6f79355..174338d5535 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -106,7 +106,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       client.thr_mgr ()->wait ();
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) threads finished \n"));
+                  "(%P|%t) threads finished\n"));
 
       // Shut down the server if -x option given in command line
       if (do_shutdown)
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
index 95f90ea6b77..aa1368d5e67 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
@@ -22,7 +22,7 @@ Foo_i::baz (void)
 {
   if (this->current_.in() == 0)
     {
-      ACE_DEBUG ((LM_DEBUG, "FOO (%P|%t) No ClientCredentials available \n"));
+      ACE_DEBUG ((LM_DEBUG, "FOO (%P|%t) No ClientCredentials available\n"));
       return;
     }
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index 3b05a755024..db19df43db4 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -552,7 +552,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
 
   ACE_DEBUG ((LM_DEBUG,
-              "All functions work properly \n"));
+              "All functions work properly\n"));
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 3d71472647b..6f0b6211149 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -603,7 +603,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
 
   ACE_DEBUG ((LM_DEBUG,
-              "All functions work properly \n"));
+              "All functions work properly\n"));
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index b1ea6eff065..4ebf36f362b 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -315,7 +315,7 @@ Client_i::obtain_initial_references (void)
       if (my_name_client_.init (orb_.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "[CLIENT] Process/Thread Id : (%P/%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       ACE_DEBUG ((LM_DEBUG,