merged in changes from trunk/TAO revision 84552 - 84573

author: wolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2009-02-23 16:14:17 +0000
committer: wolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2009-02-23 16:14:17 +0000
commit: 23002b1e873da67a177e5129814546d1c85d32b1 (patch)
tree: fad79d4afc32e0d351e6c4f38aa1984917164146
parent: b5d25f71734136632f60679ca69fd8333bf1f6d9 (diff)
download: ATCD-23002b1e873da67a177e5129814546d1c85d32b1.tar.gz
332 files changed, 1076 insertions, 750 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a3ec2e2e6d8..6c970271790 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,365 @@
+Mon Feb 23 13:12:52 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+
+          Removed ciao_{pre,post}activate.
+
+Mon Feb 23 08:08:15 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
+        * DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
+        * docs/tutorials/Quoter/RTCORBA/Admin.cpp
+        * docs/tutorials/Quoter/RTCORBA/Broker.cpp
+        * docs/tutorials/Quoter/RTCORBA/Distributor.cpp
+        * examples/Advanced/ch_3/client.cpp
+        * examples/AMH/Sink_Server/AMH_Servant.cpp
+        * examples/AMH/Sink_Server/Base_Server.cpp
+        * examples/AMH/Sink_Server/MT_AMH_Server.cpp
+        * examples/AMH/Sink_Server/st_server.cpp
+        * examples/AMH/Sink_Server/Timer_Handler.cpp
+        * examples/Buffered_AMI/client.cpp
+        * examples/Callback_Quoter/Consumer_Handler.cpp
+        * examples/Callback_Quoter/Consumer_i.cpp
+        * examples/Callback_Quoter/Consumer_Input_Handler.cpp
+        * examples/Callback_Quoter/Notifier_Input_Handler.cpp
+        * examples/Callback_Quoter/Supplier_i.cpp
+        * examples/Callback_Quoter/Supplier_Timer_Handler.cpp
+        * examples/Content_Server/SMI_Iterator/client.cpp
+        * examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp
+        * examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp
+        * examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+        * examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp
+        * examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+        * examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+        * examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp
+        * examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+        * examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
+        * examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp
+        * examples/Event_Comm/Consumer_Handler.cpp
+        * examples/Event_Comm/notifier.cpp
+        * examples/Event_Comm/Notifier_Handler.cpp
+        * examples/Event_Comm/supplier.cpp
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+        * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
+        * examples/Load_Balancing/Identity_Client.cpp
+        * examples/Load_Balancing/Identity_Server.cpp
+        * examples/Load_Balancing/Load_Balancing_Service.cpp
+        * examples/Load_Balancing_persistent/Identity_Client.cpp
+        * examples/Load_Balancing_persistent/Identity_Server.cpp
+        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+        * examples/Logging/Logging_Test_i.cpp
+        * examples/Persistent_Grid/Grid_Client_i.cpp
+        * examples/Persistent_Grid/Persistent_Client_i.cpp
+        * examples/PluggableUDP/tests/SimplePerformance/client.cpp
+        * examples/Quoter/Quoter_i.cpp
+        * examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+        * examples/RTScheduling/POA_Holder.cpp
+        * examples/RTScheduling/Starter.cpp
+        * examples/RTScheduling/Task_Stats.cpp
+        * examples/Simple/Simple_util.cpp
+        * interop-tests/wchar/client.cpp
+        * orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+        * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+        * orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+        * orbsvcs/examples/Log/Basic/TLS_Client.cpp
+        * orbsvcs/examples/Log/Event/Event_Supplier.cpp
+        * orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+        * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+        * orbsvcs/examples/Notify/Filter/Filter.cpp
+        * orbsvcs/examples/Notify/Lanes/Consumer.cpp
+        * orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+        * orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+        * orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+        * orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+        * orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+        * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+        * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+        * orbsvcs/ImplRepo_Service/Activator_Options.cpp
+        * orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+        * orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+        * orbsvcs/Notify_Service/Notify_Service.cpp
+        * orbsvcs/orbsvcs/AV/AV_Core.cpp
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+        * orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+        * orbsvcs/orbsvcs/AV/Transport.cpp
+        * orbsvcs/orbsvcs/AV/UDP.cpp
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+        * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+        * orbsvcs/orbsvcs/Event_Utilities.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+        * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+        * orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+        * orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+        * orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+        * orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+        * orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
+        * orbsvcs/PSS/PSDL_Code_Gen.cpp
+        * orbsvcs/PSS/PSDL_Exception_Visitor.cpp
+        * orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+        * orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+        * orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+        * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+        * orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+        * orbsvcs/tests/AVStreams/Latency/ping.cpp
+        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+        * orbsvcs/tests/AVStreams/Multicast/server.cpp
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+        * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+        * orbsvcs/tests/Bug_2248_Regression/client.cpp
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+        * orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+        * orbsvcs/tests/Bug_2316_Regression/client.cpp
+        * orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp
+        * orbsvcs/tests/Concurrency/CC_naming_service.cpp
+        * orbsvcs/tests/Event/Basic/Reconnect.cpp
+        * orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+        * orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+        * orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+        * orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+        * orbsvcs/tests/FT_App/FT_Client.cpp
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+        * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+        * orbsvcs/tests/HTIOP/AMI/client.cpp
+        * orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+        * orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+        * orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+        * orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+        * orbsvcs/tests/Notify/Basic/Events.cpp
+        * orbsvcs/tests/Notify/Basic/Filter.cpp
+        * orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+        * orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+        * orbsvcs/tests/Notify/Basic/Sequence.cpp
+        * orbsvcs/tests/Notify/Basic/Simple.cpp
+        * orbsvcs/tests/Notify/Basic/Updates.cpp
+        * orbsvcs/tests/Notify/Destroy/main.cpp
+        * orbsvcs/tests/Notify/Driver/main.cpp
+        * orbsvcs/tests/Notify/lib/Driver.cpp
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+        * orbsvcs/tests/Notify/lib/Supplier_T.cpp
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+        * orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+        * orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+        * orbsvcs/tests/Property/client.cpp
+        * orbsvcs/tests/Property/main.cpp
+        * orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+        * orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+        * orbsvcs/tests/Security/BiDirectional/test_i.cpp
+        * orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp
+        * orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+        * orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+        * orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+        * orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+        * orbsvcs/tests/Simple_Naming/client.cpp
+        * orbsvcs/tests/Time/Client_i.cpp
+        * performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+        * performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
+        * performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+        * performance-tests/Memory/IORsize/Memory_Growth.cpp
+        * performance-tests/POA/Demux/demux_test_server.cpp
+        * performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+        * tao/Strategies/SHMIOP_Profile.cpp
+        * tao/Synch_Reply_Dispatcher.cpp
+        * tao/Synch_Reply_Dispatcher.h
+        * tao/Wait_On_LF_No_Upcall.cpp
+        * TAO_IDL/ast/ast_union_branch.cpp
+        * TAO_IDL/be/be_global.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+        * TAO_IDL/be/be_visitor_operation/operation.cpp
+        * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
+        * TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
+        * TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
+        * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp
+        * TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp
+        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
+        * TAO_IDL/contrib/mcpp/system.cpp
+        * tests/Abstract_Interface/client.cpp
+        * tests/AMH_Oneway/client.cpp
+        * tests/AMI/client.cpp
+        * tests/AMI/simple_client.cpp
+        * tests/BiDirectional/test_i.cpp
+        * tests/BiDirectional_DelayedUpcall/test_i.cpp
+        * tests/BiDirectional_NestedUpcall/test_i.cpp
+        * tests/Big_AMI/client.cpp
+        * tests/Big_Oneways/server.cpp
+        * tests/Big_Twoways/server.cpp
+        * tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+        * tests/Bug_1482_Regression/Reply_Handler.cpp
+        * tests/Bug_1495_Regression/Server_Task.cpp
+        * tests/Bug_1495_Regression/Threaded_Server.cpp
+        * tests/Bug_1535_Regression/bug_1535_regression.cpp
+        * tests/Bug_1693_Test/client.cpp
+        * tests/Bug_2186_Regression/Hello.cpp
+        * tests/Bug_2319_Regression/server.cpp
+        * tests/Bug_2356_Regression/client.cpp
+        * tests/Bug_2542_Regression/bug_2542_regression.cpp
+        * tests/Bug_2543_Regression/bug_2543_regression.cpp
+        * tests/Bug_2654_Regression/client.cpp
+        * tests/Bug_2654_Regression/Hello.cpp
+        * tests/Bug_2683_Regression/client.cpp
+        * tests/Bug_2683_Regression/test_i.cpp
+        * tests/Bug_2805_Regression/client.cpp
+        * tests/Bug_2826_Regression/bug_2826_regression.cpp
+        * tests/Bug_3068_Regression/client.cpp
+        * tests/Bug_3276_Regression/test_i.cpp
+        * tests/Bug_3547_Regression/run_test.pl
+        * tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
+        * tests/Bug_3558_Regression/client.cpp
+        * tests/Bug_3567_Regression/client.cpp
+        * tests/Cache_Growth_Test/Hello.cpp
+        * tests/CDR/basic_types.cpp
+        * tests/Collocation_Oneway_Tests/Client_Task.cpp
+        * tests/Connection_Timeout/client.cpp
+        * tests/Crashed_Callback/Crashed_Callback.cpp
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+        * tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+        * tests/DII_AMI_Forward/client.cpp
+        * tests/DII_Collocation_Tests/oneway/Client_Task.cpp
+        * tests/DII_Collocation_Tests/oneway/Hello.cpp
+        * tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+        * tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+        * tests/DII_Collocation_Tests/twoway/Hello.cpp
+        * tests/DII_Collocation_Tests/twoway/Server_Task.cpp
+        * tests/Faults/client.cpp
+        * tests/Faults/test_i.cpp
+        * tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
+        * tests/Hang_Shutdown/client.cpp
+        * tests/Hang_Shutdown/server.cpp
+        * tests/ICMG_Any_Bug/client.cpp
+        * tests/MProfile/client.cpp
+        * tests/MProfile/test_i.cpp
+        * tests/MProfile_Connection_Timeout/client.cpp
+        * tests/MProfile_Connection_Timeout/test_i.cpp
+        * tests/MProfile_Forwarding/client.cpp
+        * tests/MProfile_Forwarding/Manager.cpp
+        * tests/MProfile_Forwarding/Servant_Locator.cpp
+        * tests/MProfile_Forwarding/test_i.cpp
+        * tests/MT_BiDir/client.cpp
+        * tests/MT_BiDir/Server_Task.cpp
+        * tests/Multiple/Collocation_Tester.cpp
+        * tests/Muxed_GIOP_Versions/client.cpp
+        * tests/Muxed_GIOP_Versions/server.cpp
+        * tests/NestedUpcall/MT_Client_Test/server.cpp
+        * tests/NestedUpcall/Triangle_Test/initiator.cpp
+        * tests/NestedUpcall/Triangle_Test/server_A.cpp
+        * tests/NestedUpcall/Triangle_Test/server_B.cpp
+        * tests/No_Server_MT_Connect_Test/client.cpp
+        * tests/Objref_Sequence_Test/client.cpp
+        * tests/Objref_Sequence_Test/server.cpp
+        * tests/OBV/Collocated/Forward/Client_Task.cpp
+        * tests/OBV/Forward/client.cpp
+        * tests/OBV/Simple/OBV_impl.cpp
+        * tests/OBV/Supports/Supports_Test_impl.cpp
+        * tests/OBV/Truncatable/client.cpp
+        * tests/OBV/Truncatable/TruncatableS_impl.cpp
+        * tests/OBV/ValueBox/client.cpp
+        * tests/Oneways_Invoking_Twoways/client.cpp
+        * tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+        * tests/Oneways_Invoking_Twoways/Sender_i.cpp
+        * tests/ORB_shutdown/Foo_Bar.cpp
+        * tests/ORB_shutdown/server.cpp
+        * tests/Param_Test/multdim_array.cpp
+        * tests/Param_Test/results.cpp
+        * tests/Param_Test/ub_any_seq.cpp
+        * tests/POA/Bug_1592_Regression/test_i.cpp
+        * tests/POA/DSI/Database_i.cpp
+        * tests/POA/Forwarding/client.cpp
+        * tests/POA/Forwarding/server.cpp
+        * tests/POA/Generic_Servant/client.cpp
+        * tests/POA/On_Demand_Loading/Servant_Manager.cpp
+        * tests/POA/TIE/client.cpp
+        * tests/Portable_Interceptors/Bug_3079/server.cpp
+        * tests/Portable_Interceptors/Bug_3582/server.cpp
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+        * tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+        * tests/Portable_Interceptors/Redirection/server.cpp
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+        * tests/QtTests/test_i.cpp
+        * tests/RTCORBA/Banded_Connections/server.cpp
+        * tests/RTCORBA/Client_Protocol/server.cpp
+        * tests/RTCORBA/Diffserv/server.cpp
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+        * tests/RTCORBA/RTMutex/server.cpp
+        * tests/RTCORBA/Server_Protocol/server.cpp
+        * tests/Servant_To_Reference_Test/server.cpp
+        * tests/Server_Connection_Purging/client.cpp
+        * tests/Server_Connection_Purging/Test_i.cpp
+        * tests/Smart_Proxies/dtor/server.cpp
+        * utils/catior/catior.cpp
+          Zapped some not needed spaces at the end of a debug message
+
+Mon Feb 23 07:58:15 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added 3581
+
+        * tests/Portable_Interceptors/Bug_3582/client.cpp:
+          Fixed include
+
+Sun Feb 22 13:53:15 UTC 2009  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
+
+        * tests/Portable_Interceptors/Bug_3582/server.cpp:
+
+          Fixed compiler warning on win platforms.
+
+Sun Feb 22 10:13:07 UTC 2009  Marcel Smit <msmit@remedy.nl>
+
+        * tests/Portable_Interceptors/Bug_3582/client.cpp
+          Fixed compiler error on WinCE.
+
 Fri Feb 20 23:17:07 UTC 2009  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
 
         * tests/Portable_Interceptors/Bug_3582:
-        
+
           Added test program for a bug about TRANSIENT exceptions being
           not intercepted when RTCORBA is used.
 
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
index 07e3830c877..e2f551e93d7 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
@@ -21,7 +21,7 @@ int parse_args (int argc, ACE_TCHAR* argv[])
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage: %s\n "
+                           "usage: %s\n"
                            "-x - call shutdown on server\n",
                            argv[0]),
                            -1);
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
index 0aba027c120..1d08615f6d6 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
@@ -126,7 +126,7 @@ int MessengerServer::parse_args (int argc, ACE_TCHAR* argv[])
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage: %s\n "
+                           "usage: %s\n"
                            "-x (default) - shutdown on client invocation\n"
                            "-p <n> - use polling loop for <n> iterations\n"
                            "-t <n> - schedule timer for <n> seconds\n"
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
index 1ee95d4fd69..d62d2557e71 100644
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp
@@ -117,7 +117,7 @@ AST_UnionBranch::dump (ACE_OSTREAM_TYPE &o)
       AST_UnionLabel *ul = this->label (i);
       ul->dump (o);
 
-      this->dump_i (o, ": \n");
+      this->dump_i (o, ":\n");
     }
 
   AST_Field::dump (o);
@@ -220,12 +220,12 @@ AST_UnionBranch::coerce_labels (AST_Union *u)
   for (unsigned long i = 0; i < this->label_list_length (); ++i)
     {
       AST_UnionLabel *ul = this->label (i);
-      
+
       if (ul->label_kind () == AST_UnionLabel::UL_default)
         {
           continue;
         }
-        
+
       AST_Expression *lv = ul->label_val ();
       lv->set_ev (lv->coerce (u->udisc_type ()));
     }
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 2b2fbeffff6..4bd56a2d91c 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -2549,7 +2549,7 @@ BE_GlobalData::arg_post_proc (void)
   if (!be_global->tc_support () && be_global->opt_tc ())
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Bad Combination -St and -Gt \n")));
+                  ACE_TEXT ("Bad Combination -St and -Gt\n")));
     }
 }
 
@@ -2703,12 +2703,12 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -GI[h|s|b|e|c|a|d]\tGenerate Implementation Files \n")
+      ACE_TEXT (" -GI[h|s|b|e|c|a|d]\tGenerate Implementation Files\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT ("  \t\t\th - Implementation header file name ending.")
-      ACE_TEXT (" Default is I.h \n")
+      ACE_TEXT (" Default is I.h\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
@@ -2718,7 +2718,7 @@ BE_GlobalData::usage (void) const
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT ("  \t\t\tb - Prefix to the implementation class names.")
-      ACE_TEXT (" Default is 'no prefix' \n")
+      ACE_TEXT (" Default is 'no prefix'\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 13000414ec3..9cb9561721c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -153,7 +153,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                          "(%P|%t) Error in "
                          "be_visitor_interface_ch::"
                          "visit_interface while generating "
-                         "_narrow () declaration \n"),
+                         "_narrow () declaration\n"),
                         -1);
     }
 
@@ -165,7 +165,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                          "(%P|%t) Error in "
                          "be_visitor_interface_ch::"
                          "visit_interface while generating "
-                         "_unchecked_narrow () declaration \n"),
+                         "_unchecked_narrow () declaration\n"),
                         -1);
     }
 
@@ -215,14 +215,6 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  if (node->session_component_child () == 1)
-    {
-      *os << "// These two are inherited from SessionComponent."
-          << be_nl << be_nl
-          << "virtual void ciao_preactivate (void);" << be_nl
-          << "virtual void ciao_postactivate (void);" << be_nl;
-    }
-
   // If we inherit from both CORBA::Object and CORBA::AbstractBase,
   // we have to override _add_ref() to avoid ambiguity.
   if (node->has_mixed_parentage ())
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 9d777b639d0..8e5617e9a39 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -355,22 +355,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "::CORBA::release (obj);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-
-  // Empty implementations so the application can override or not.
-  if (node->session_component_child () == 1)
-    {
-      *os << "// These two are inherited from SessionComponent."
-          << be_nl << be_nl
-          << "void" << be_nl
-          << node->full_name () << "::ciao_preactivate (void)" << be_nl
-          << "{" << be_nl
-          << "}" << be_nl << be_nl
-          << "void" << be_nl
-          << node->full_name () << "::ciao_postactivate (void)" << be_nl
-          << "{" << be_nl
-          << "}" << be_nl << be_nl;
-    }
-
   *os << "::CORBA::Boolean" << be_nl
       << node->full_name () << "::_is_a (const char *value)" << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 10c39ec11a2..700a7279d8b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -115,12 +115,12 @@ be_visitor_operation::is_amh_exception_holder (be_interface *node)
       amh_underbar[3] == node_name[3]
       ) // node name starts with "AMH_"
     {
-      //ACE_DEBUG ((LM_DEBUG, "Passed first test of amh_excepholder \n"));
+      //ACE_DEBUG ((LM_DEBUG, "Passed first test of amh_excepholder\n"));
       const char *last_E = ACE_OS::strrchr (node->full_name (), 'E');
       if (last_E != 0
           && ACE_OS::strcmp (last_E, "ExceptionHolder") == 0)
         {
-          //ACE_DEBUG ((LM_DEBUG, "be_visitor_operation: Passed second test of amh_excepholder \n"));
+          //ACE_DEBUG ((LM_DEBUG, "be_visitor_operation: Passed second test of amh_excepholder\n"));
           is_an_amh_exception_holder = 1;
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
index eff9fa07eb2..d9cc78b84f0 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
@@ -164,7 +164,7 @@ be_visitor_typedef_any_op_ch::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_ch::"
                              "visit_array - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -194,7 +194,7 @@ be_visitor_typedef_any_op_ch::visit_enum (be_enum *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_ch::"
                              "visit_enum - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -224,7 +224,7 @@ be_visitor_typedef_any_op_ch::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_ch::"
                              "visit_sequence - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -254,7 +254,7 @@ be_visitor_typedef_any_op_ch::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_ch::"
                              "visit_structure - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -284,7 +284,7 @@ be_visitor_typedef_any_op_ch::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_ch::"
                              "visit_union - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
index 0f06dc504ab..ef462d72fbd 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_typedef, 
-           any_op_cs, 
+ACE_RCSID (be_visitor_typedef,
+           any_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -84,7 +84,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node)
       // grab the most primitive base type in the chain to avoid recusrsively
       // going thru this visit method
       bt = node->primitive_base_type ();
-      
+
       if (!bt)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -103,7 +103,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node)
                              "failed to accept visitor\n"
                              ),  -1);
         }
-        
+
       this->ctx_->alias (0); // reset
     }
   else
@@ -114,7 +114,7 @@ be_visitor_typedef_any_op_cs::visit_typedef (be_typedef *node)
 
       // Grab the immediate base type node.
       bt = be_type::narrow_from_decl (node->base_type ());
-      
+
       if (!bt)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -161,7 +161,7 @@ be_visitor_typedef_any_op_cs::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_cs::"
                              "visit_array - "
-                             "base class visitor failed \n"
+                             "base class visitor failed\n"
                              ),  -1);
         }
     }
@@ -188,7 +188,7 @@ be_visitor_typedef_any_op_cs::visit_enum (be_enum *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_cs::"
                              "visit_enum - "
-                             "base class visitor failed \n"
+                             "base class visitor failed\n"
                              ),  -1);
         }
     }
@@ -215,7 +215,7 @@ be_visitor_typedef_any_op_cs::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_cs::"
                              "visit_sequence - "
-                             "base class visitor failed \n"
+                             "base class visitor failed\n"
                              ),  -1);
         }
     }
@@ -242,7 +242,7 @@ be_visitor_typedef_any_op_cs::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_cs::"
                              "visit_structure - "
-                             "base class visitor failed \n"
+                             "base class visitor failed\n"
                              ),  -1);
         }
     }
@@ -269,7 +269,7 @@ be_visitor_typedef_any_op_cs::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_any_op_cs::"
                              "visit_union - "
-                             "base class visitor failed \n"
+                             "base class visitor failed\n"
                              ),  -1);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
index e27d1750d14..b752d7e0a2b 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
@@ -164,7 +164,7 @@ be_visitor_typedef_cdr_op_ch::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_ch::"
                              "visit_array - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -194,7 +194,7 @@ be_visitor_typedef_cdr_op_ch::visit_enum (be_enum *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_ch::"
                              "visit_enum - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -224,7 +224,7 @@ be_visitor_typedef_cdr_op_ch::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_ch::"
                              "visit_sequence - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -254,7 +254,7 @@ be_visitor_typedef_cdr_op_ch::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_ch::"
                              "visit_structure - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -284,7 +284,7 @@ be_visitor_typedef_cdr_op_ch::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_op_ch::"
                              "visit_union - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
index ba1e87f43be..12f23bcfa90 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_typedef, 
-           cdr_op_cs, 
+ACE_RCSID (be_visitor_typedef,
+           cdr_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -86,7 +86,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_cs::"
                              "visit_typedef - "
-                             "bad primitive base type\n"),  
+                             "bad primitive base type\n"),
                             -1);
         }
 
@@ -96,7 +96,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_cs::"
                              "visit_typedef - "
-                             "failed to accept visitor\n"),  
+                             "failed to accept visitor\n"),
                             -1);
         }
 
@@ -116,7 +116,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_cs::"
                              "visit_typedef - "
-                             "bad base type\n"),  
+                             "bad base type\n"),
                             -1);
         }
 
@@ -126,7 +126,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_cs::"
                              "visit_typedef - "
-                             "failed to accept visitor\n"),  
+                             "failed to accept visitor\n"),
                             -1);
         }
 
@@ -161,7 +161,7 @@ be_visitor_typedef_cdr_op_cs::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_cs::"
                              "visit_array - "
-                             "base class visitor failed \n"),  
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -192,7 +192,7 @@ be_visitor_typedef_cdr_op_cs::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_cs::"
                              "visit_sequence - "
-                             "base class visitor failed \n"),  
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -223,7 +223,7 @@ be_visitor_typedef_cdr_op_cs::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_cs::"
                              "visit_structure - "
-                             "base class visitor failed \n"),  
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -254,7 +254,7 @@ be_visitor_typedef_cdr_op_cs::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_cdr_op_cs::"
                              "visit_union - "
-                             "base class visitor failed \n"),  
+                             "base class visitor failed\n"),
                             -1);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp
index 0c13f01a375..a2b45655ff5 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp
@@ -165,7 +165,7 @@ be_visitor_typedef_serializer_op_ch::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_ch::"
                              "visit_array - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -195,7 +195,7 @@ be_visitor_typedef_serializer_op_ch::visit_enum (be_enum *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_ch::"
                              "visit_enum - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -225,7 +225,7 @@ be_visitor_typedef_serializer_op_ch::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_ch::"
                              "visit_sequence - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -255,7 +255,7 @@ be_visitor_typedef_serializer_op_ch::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_ch::"
                              "visit_structure - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -285,7 +285,7 @@ be_visitor_typedef_serializer_op_ch::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_op_ch::"
                              "visit_union - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp
index 345dc70a1f3..b1bb8a1c76b 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp
@@ -11,7 +11,7 @@
 //    serializer_op_cs.cpp
 //
 // = DESCRIPTION
-//    Visitor generating code for TAO::DCPS::Serializer operators 
+//    Visitor generating code for TAO::DCPS::Serializer operators
 //    in the client stubs
 //
 // = AUTHOR
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_typedef, 
-           serializer_op_cs, 
+ACE_RCSID (be_visitor_typedef,
+           serializer_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -87,7 +87,7 @@ be_visitor_typedef_serializer_op_cs::visit_typedef (be_typedef *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_cs::"
                              "visit_typedef - "
-                             "bad primitive base type\n"),  
+                             "bad primitive base type\n"),
                             -1);
         }
 
@@ -97,7 +97,7 @@ be_visitor_typedef_serializer_op_cs::visit_typedef (be_typedef *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_cs::"
                              "visit_typedef - "
-                             "failed to accept visitor\n"),  
+                             "failed to accept visitor\n"),
                             -1);
         }
 
@@ -117,7 +117,7 @@ be_visitor_typedef_serializer_op_cs::visit_typedef (be_typedef *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_cs::"
                              "visit_typedef - "
-                             "bad base type\n"),  
+                             "bad base type\n"),
                             -1);
         }
 
@@ -127,7 +127,7 @@ be_visitor_typedef_serializer_op_cs::visit_typedef (be_typedef *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_cs::"
                              "visit_typedef - "
-                             "failed to accept visitor\n"),  
+                             "failed to accept visitor\n"),
                             -1);
         }
 
@@ -162,7 +162,7 @@ be_visitor_typedef_serializer_op_cs::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_cs::"
                              "visit_array - "
-                             "base class visitor failed \n"),  
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -193,7 +193,7 @@ be_visitor_typedef_serializer_op_cs::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_cs::"
                              "visit_sequence - "
-                             "base class visitor failed \n"),  
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -224,7 +224,7 @@ be_visitor_typedef_serializer_op_cs::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_cs::"
                              "visit_structure - "
-                             "base class visitor failed \n"),  
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -255,7 +255,7 @@ be_visitor_typedef_serializer_op_cs::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_serializer_op_cs::"
                              "visit_union - "
-                             "base class visitor failed \n"),  
+                             "base class visitor failed\n"),
                             -1);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
index 1b0731237b2..ba71d200918 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
@@ -177,7 +177,7 @@ be_visitor_typedef_ch::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_ch::"
                              "visit_array - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -290,7 +290,7 @@ be_visitor_typedef_ch::visit_enum (be_enum *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_ch::"
                              "visit_enum - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -462,7 +462,7 @@ be_visitor_typedef_ch::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_ch::"
                              "visit_sequence - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -510,7 +510,7 @@ be_visitor_typedef_ch::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_ch::"
                              "visit_structure - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -556,7 +556,7 @@ be_visitor_typedef_ch::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_ch::"
                              "visit_union - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
index 15bffced400..bbda773b42f 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
@@ -163,7 +163,7 @@ be_visitor_typedef_ci::visit_array (be_array *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_ci::"
                              "visit_array - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -247,7 +247,7 @@ be_visitor_typedef_ci::visit_sequence (be_sequence *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_ci::"
                              "visit_sequence - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -278,7 +278,7 @@ be_visitor_typedef_ci::visit_structure (be_structure *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_ci::"
                              "visit_structure - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
@@ -309,7 +309,7 @@ be_visitor_typedef_ci::visit_union (be_union *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_typedef_ci::"
                              "visit_union - "
-                             "base class visitor failed \n"),
+                             "base class visitor failed\n"),
                             -1);
         }
     }
diff --git a/TAO/TAO_IDL/contrib/mcpp/system.cpp b/TAO/TAO_IDL/contrib/mcpp/system.cpp
index 0d5ef52af94..17cdb6c5e79 100644
--- a/TAO/TAO_IDL/contrib/mcpp/system.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/system.cpp
@@ -408,7 +408,7 @@ plus:
                 compat_mode = TRUE;     /* 'compatible' mode        */
                 mcpp_mode = STD;
             }
-            else 
+            else
                 usage( opt);
             standard = (mcpp_mode == STD || mcpp_mode == POST_STD);
             if (old_mode != STD && old_mode != mcpp_mode)
@@ -1483,7 +1483,7 @@ static void def_a_macro(
     skip_nl();                      /* Clear the appended <newline> */
 }
 
-static void     chk_opts( 
+static void     chk_opts(
     int     sflag,      /* Flag of Standard or post-Standard mode   */
     long    std_val,                /* Value of __STDC_VERSION__    */
     int     ansi,                   /* -ansi (GCC only)             */
@@ -1845,7 +1845,7 @@ static void set_sys_dirs(
     set_a_dir( "/usr/local/include");
 #endif
 
-#ifdef  C_INCLUDE_DIR1 
+#ifdef  C_INCLUDE_DIR1
     set_a_dir( C_INCLUDE_DIR1);
 #endif
 #ifdef  C_INCLUDE_DIR2
@@ -2086,7 +2086,7 @@ static char *   norm_path(
             } else {                                /* Impossible   */
                 break;
             }
-        } else {                                    /* Impossible   */ 
+        } else {                                    /* Impossible   */
             break;
         }
     }
@@ -2260,7 +2260,7 @@ static void init_gcc_macro(
                 && scan_token( skip_ws(), (tp = work_buf, &tp), work_end)
                         == NAM
                     && str_eq( work_buf, "define")) {
-                defp = do_define( TRUE);    /* Ignore re-definition */ 
+                defp = do_define( TRUE);    /* Ignore re-definition */
                 if (defp->nargs >= DEF_NOARGS - 1)
                     *predef++ = defp;   /* Register only non-Standard macros*/
             }
@@ -2420,7 +2420,7 @@ void    put_depend(
     }
     /* Any new header.  Append its name to output.  */
     if (llen + fnamlen > MAX_OUT_LEN) {         /* Line is long     */
-        out_p = mcpp_stpcpy( out_p, " \\\n ");       /* Fold it          */
+        out_p = mcpp_stpcpy( out_p, " \\\n");       /* Fold it          */
         llen = 1;
     }
     llen += fnamlen + 1;
@@ -2433,7 +2433,7 @@ void    put_depend(
 }
 
 static char *   md_init(
-    const char *    filename,   /* The source file name             */ 
+    const char *    filename,   /* The source file name             */
     char *  output              /* Output to dependency file        */
 )
 /*
@@ -2547,10 +2547,10 @@ int     do_include(
     int     token_type;
     char *  fname;
     int     delim;                          /* " or <, >            */
-    
+
     // WO: sharp here to capture line info from includer
     sharp ();
-    
+
     if ((delim = skip_ws()) == '\n') {      /* No argument          */
         cerror( no_name, 0, 0L, 0);
         return  FALSE;
@@ -2724,7 +2724,7 @@ static int  has_directory(
 )
 /*
  * If a directory is found in the 'source' filename string (i.e. "includer"),
- * the directory part of the string is copied to 'directory' and 
+ * the directory part of the string is copied to 'directory' and
  * has_directory() returns TRUE.
  * Else, nothing is copied and it returns FALSE.
  */
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index de71d13eca4..9cba579df5c 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -335,6 +335,7 @@ TAO/tests/Portable_Interceptors/Redirection/run_test.pl: !MINIMUM !CORBA_E_COMPA
 TAO/tests/Portable_Interceptors/Bug_3079/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/Bug_3080/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/Portable_Interceptors/Bug_2133/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
+TAO/tests/Portable_Interceptors/Bug_3582/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/ORT/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/Object_Loader/run_test.pl: !STATIC !LabVIEW_RT !WinCE !FUZZ
 TAO/tests/Two_Objects/run_test.pl: !ST
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
index 327da9e598e..c6de33c1e84 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
@@ -65,10 +65,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
                              "usage: %s\n"
-                             "-o <Distributor IOR> (the ior file of stock distributor (default is file://StockDistributor.ior)) \n"
-                             "-r <rate> (set the distribution rate to 'n' seconds (default is 1)) \n"
-                             "-b (start the stock distributor) \n"
-                             "-s (stop the stock distributor) \n"
+                             "-o <Distributor IOR> (the ior file of stock distributor (default is file://StockDistributor.ior))\n"
+                             "-r <rate> (set the distribution rate to 'n' seconds (default is 1))\n"
+                             "-b (start the stock distributor)\n"
+                             "-s (stop the stock distributor)\n"
                              "\n",
                              argv [0]),
                             -1);
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
index 9688521a66f..7ba921f579d 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
@@ -87,9 +87,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
                              "usage: %s\n"
-                             "-o <Distributor IOR> (default is file://StockDistributor.ior) \n"
-                             "-p <Priority> (default is 2) \n"
-                             "-n <Stock name> (default is IBM) \n"
+                             "-o <Distributor IOR> (default is file://StockDistributor.ior)\n"
+                             "-p <Priority> (default is 2)\n"
+                             "-n <Stock name> (default is IBM)\n"
                              "-c Use the naming service"
                              "\n",
                              argv [0]),
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
index 9a88b7de423..891fc309ac4 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
@@ -52,7 +52,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
                              "usage: %s\n"
-                             "-o <Distributor IOR> (default is file://StockDistributor.ior) \n"
+                             "-o <Distributor IOR> (default is file://StockDistributor.ior)\n"
                              "-r <Distributor notification rate> (default is 1 second)\n"
                              "-u <Database update rate> (default is 1 second)\n"
                              "-c Flag that indicates that the object should be registered with naming service\n"
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index 03b0b5e480f..c6761e4d695 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -109,7 +109,7 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception in start_test \n");
+      ex._tao_print_exception ("Exception in start_test\n");
     }
 
   // Footnote: This method is thread-safe:
@@ -127,7 +127,7 @@ AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception in start_test \n");
+      ex._tao_print_exception ("Exception in start_test\n");
     }
 }
 
@@ -140,7 +140,7 @@ AMH_Servant::end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception in end_test \n");
+      ex._tao_print_exception ("Exception in end_test\n");
     }
 }
 
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index 565a3b1b84b..1d75f403db2 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -31,7 +31,7 @@ Base_Server::~Base_Server (void)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "Exception caught while destroying Base_Server \n");
+        "Exception caught while destroying Base_Server\n");
     }
 }
 
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
index 751ea04c3bc..a7111fcc335 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
@@ -21,9 +21,9 @@ void
 MT_AMH_Server::usage (const char *message)
 {
   static const char * usage =
-    "invoke as: mt_server -o <ior_output_file> \n"
-    " -n <num_threads> \n"
-    "-s <sleep_time (in microseconds)> \n";
+    "invoke as: mt_server -o <ior_output_file>\n"
+    " -n <num_threads>\n"
+    "-s <sleep_time (in microseconds)>\n";
 
   // @@ Mayur, why don't you just place the usage message directly in
   //    the below ACE_ERROR macro?  It's not a big deal.  It's just
diff --git a/TAO/examples/AMH/Sink_Server/Timer_Handler.cpp b/TAO/examples/AMH/Sink_Server/Timer_Handler.cpp
index 2eabb3b9e82..f2b3f5f1b52 100644
--- a/TAO/examples/AMH/Sink_Server/Timer_Handler.cpp
+++ b/TAO/examples/AMH/Sink_Server/Timer_Handler.cpp
@@ -33,7 +33,7 @@ Timer_Handler::handle_timeout (const ACE_Time_Value &,
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "Exception in Timer_Handler::handle_timeout \n");
+        "Exception in Timer_Handler::handle_timeout\n");
       return -1;
     }
 
diff --git a/TAO/examples/AMH/Sink_Server/st_server.cpp b/TAO/examples/AMH/Sink_Server/st_server.cpp
index 70bcee1e46d..74a5fbffa15 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/st_server.cpp
@@ -12,8 +12,8 @@ usage (const char *message)
   // Mayur: It makes the newline stand out
 
   static const char * usage =
-    "invoke as: st_server -o <ior_output_file> \n"
-    "-s <sleep_time (in microseconds)> \n";
+    "invoke as: st_server -o <ior_output_file>\n"
+    "-s <sleep_time (in microseconds)>\n";
 
   ACE_ERROR ((LM_ERROR, "%s : %s", message, usage));
 }
@@ -27,7 +27,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   if (amh_server.parse_args () != 1)
     {
-      usage ("IOR file missing \n");
+      usage ("IOR file missing\n");
       ACE_OS::exit (1);
     }
 
@@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   if (servant.parse_args (argc, argv) != 1)
     {
-      usage ("Sleep time unspecified \n");
+      usage ("Sleep time unspecified\n");
       ACE_OS::exit (1);
     }
 
diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp
index 779cdb903e1..6a2646bb8f9 100644
--- a/TAO/examples/Advanced/ch_3/client.cpp
+++ b/TAO/examples/Advanced/ch_3/client.cpp
@@ -73,7 +73,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch  (const CORBA::Exception &x)
     {
-      x._tao_print_exception ("Who is the culprit \n");
+      x._tao_print_exception ("Who is the culprit\n");
       cerr << "Uncaught CORBA exception" << endl;
       return 1;
     }
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index c460fec790d..4bef97a0a61 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -163,7 +163,7 @@ parse_args (int argc, ACE_TCHAR **argv)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "<message_count> must be a multiple <iterations> "
-                         "or the program should be changed to flush explicitly \n"),
+                         "or the program should be changed to flush explicitly\n"),
                         -1);
     }
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp
index 9469856960e..8ebf447ccf7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp
@@ -54,7 +54,7 @@ int
 OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb\n"));
   try
   {
     this->orb_->shutdown(0);
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp
index 9469856960e..8ebf447ccf7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp
@@ -54,7 +54,7 @@ int
 OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb\n"));
   try
   {
     this->orb_->shutdown(0);
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp
index 9469856960e..8ebf447ccf7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp
@@ -54,7 +54,7 @@ int
 OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb\n"));
   try
   {
     this->orb_->shutdown(0);
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
index 9c328747bfc..81301279214 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
@@ -16,7 +16,7 @@ void
 Callback_i::test_method (
 )
 {
-  ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n"));
+  ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n"));
 
 }
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index 5f1027a568d..4e1c687bc54 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -172,11 +172,11 @@ Foo_i::test_var_array_arg (
 )
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[0].in ()));
+                       ACE_TEXT(" %s\n"), messages[0].in ()));
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[1].in ()));
+                       ACE_TEXT(" %s\n"), messages[1].in ()));
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[2].in ()));
+                       ACE_TEXT(" %s\n"), messages[2].in ()));
 }
 
 
@@ -186,7 +186,7 @@ Foo_i::test_special_basic_arg (
 )
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ")
-                       ACE_TEXT(" got special basic arg: %d \n"), value));
+                       ACE_TEXT(" got special basic arg: %d\n"), value));
 }
 
 
@@ -197,7 +197,7 @@ Foo_i::test_objref_arg (
 {
   this->callback_ = Callback::_duplicate (cb);
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ")
-                       ACE_TEXT(" got callback object. \n")));
+                       ACE_TEXT(" got callback object.\n")));
 }
 
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp
index 9469856960e..8ebf447ccf7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp
@@ -54,7 +54,7 @@ int
 OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb\n"));
   try
   {
     this->orb_->shutdown(0);
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
index 9c328747bfc..81301279214 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
@@ -16,7 +16,7 @@ void
 Callback_i::test_method (
 )
 {
-  ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n"));
+  ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n"));
 
 }
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
index 7d38f48fefc..61323f1d1a6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
@@ -175,7 +175,7 @@ FooServantList::deactivate_servant (void)
             {
               servants_[i]->active(false);
               ACE_DEBUG((LM_DEBUG, "(%P|%t)FooServantList::deactivate_servant "
-                "deactivate %dth servant \n", i+1));
+                "deactivate %dth servant\n", i+1));
 
               PortableServer::ObjectId_var id =
                 poa_->servant_to_id (safe_servants_[i].in ());
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
index e749ebdab9f..dfcf34799a5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
@@ -177,11 +177,11 @@ Foo_i::test_var_array_arg (
 )
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[0].in ()));
+                       ACE_TEXT(" %s\n"), messages[0].in ()));
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[1].in ()));
+                       ACE_TEXT(" %s\n"), messages[1].in ()));
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[2].in ()));
+                       ACE_TEXT(" %s\n"), messages[2].in ()));
 }
 
 
@@ -191,7 +191,7 @@ Foo_i::test_special_basic_arg (
 )
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ")
-                       ACE_TEXT(" got special basic arg: %d \n"), value));
+                       ACE_TEXT(" got special basic arg: %d\n"), value));
 }
 
 
@@ -202,7 +202,7 @@ Foo_i::test_objref_arg (
 {
   this->callback_ = Callback::_duplicate (cb);
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ")
-                       ACE_TEXT(" got callback object. \n")));
+                       ACE_TEXT(" got callback object.\n")));
 }
 
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp
index 9469856960e..8ebf447ccf7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp
@@ -54,7 +54,7 @@ int
 OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb\n"));
   try
   {
     this->orb_->shutdown(0);
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
index 52719eae191..eaec63e6e49 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
@@ -319,21 +319,21 @@ void
 ServerApp::usage_statement()
 {
   ACE_ERROR((LM_ERROR,
-              "(%P|%t) usage:  %s \n"
-              "\t[-p <ior_filename_prefix>] \n"
-              "\t[-s <num_servants>] \n"
-              "\t[-c <num_clients>] \n"
-              "\t[-n <num_csd_threads>] \n"
-              "\t[-t <num_orb_threads>] \n"
-              "\t[-l <collocation_test>] \n"
-              "\t[-d <servant_to_deactivate>] \n"
+              "(%P|%t) usage:  %s\n"
+              "\t[-p <ior_filename_prefix>]\n"
+              "\t[-s <num_servants>]\n"
+              "\t[-c <num_clients>]\n"
+              "\t[-n <num_csd_threads>]\n"
+              "\t[-t <num_orb_threads>]\n"
+              "\t[-l <collocation_test>]\n"
+              "\t[-d <servant_to_deactivate>]\n"
               "Default ior_filename_prefix is 'foo'.\n"
               "Default num_servants is 1.\n"
               "Default num_clients is 1.\n"
               "Default num_orb_threads is 1.\n"
               "Default collocation_test flag is 0.\n"
               "Default servant_to_deactivate is -1 means not deactivate servant.\n"
-              "   0  means deactivate all servant. \n"
+              "   0  means deactivate all servant.\n"
               "   >0 means the index (servant_to_deactivate-1) of the servant in the servant list.\n",
               this->exe_name_.c_str ()));
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
index 9469856960e..8ebf447ccf7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
@@ -54,7 +54,7 @@ int
 OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb\n"));
   try
   {
     this->orb_->shutdown(0);
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index ded14f09d17..083f0b4cd56 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -167,7 +167,7 @@ Consumer_Handler::via_naming_service (void)
       if (naming_services_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::Name notifier_ref_name (1);
@@ -219,10 +219,10 @@ Consumer_Handler::init (int argc, ACE_TCHAR **argv)
       if (this->interactive_ == 1)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      " Services provided:\n "
-                      " * Registration <type 'r'>\n "
-                      " * Unregistration <type 'u'>\n "
-                      " * Quit <type 'q'>\n "));
+                      " Services provided:\n"
+                      " * Registration <type 'r'>\n"
+                      " * Unregistration <type 'u'>\n"
+                      " * Quit <type 'q'>\n"));
 
           ACE_NEW_RETURN (consumer_input_handler_,
                           Consumer_Input_Handler (this),
diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
index e34b8e7c082..2b8df7edfbc 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
@@ -144,7 +144,7 @@ Consumer_Input_Handler::unregister_consumer ()
       this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in());
 
       ACE_DEBUG ((LM_DEBUG,
-                  " Consumer Unregistered \n "));
+                  " Consumer Unregistered \n"));
       consumer_handler_->unregistered_ = 1;
       consumer_handler_->registered_ = 0;
     }
@@ -173,7 +173,7 @@ Consumer_Input_Handler::quit_consumer_process ()
           this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in ());
 
           ACE_DEBUG ((LM_DEBUG,
-                      " Consumer Unregistered \n "));
+                      " Consumer Unregistered \n"));
           consumer_handler_->unregistered_ = 0;
           consumer_handler_->registered_ = 0;
         }
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.cpp b/TAO/examples/Callback_Quoter/Consumer_i.cpp
index 871286236c1..266f9796c60 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_i.cpp
@@ -46,7 +46,7 @@ Consumer_i::shutdown (void)
   // Instruct the ORB to shutdown.
 
   ACE_DEBUG ((LM_DEBUG,
-              " consumer shutting down \n "));
+              " consumer shutting down \n"));
 
   this->orb_->shutdown ();
 }
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index ea8233ff39c..d2ae843ec17 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -81,7 +81,7 @@ Notifier_Input_Handler::init_naming_service (void)
   catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Unable to bind %s \n",
+                         "Unable to bind %s\n",
                          "Notifier"),
                         -1);
     }
@@ -206,7 +206,7 @@ Notifier_Input_Handler::run (void)
 
 
   ACE_DEBUG ((LM_DEBUG,
-              " Type \"q\" to quit \n "));
+              " Type \"q\" to quit \n"));
 
   int result = this->orb_manager_.run ();
 
diff --git a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp
index bd4df9d7029..549dbd3945d 100644
--- a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp
@@ -52,16 +52,16 @@ Supplier_Timer_Handler:: handle_timeout (const ACE_Time_Value & /* tv */,
 {
 
   ACE_DEBUG ((LM_DEBUG,
-              "Sending Stock Market Information to Notifier... \n"));
+              "Sending Stock Market Information to Notifier...\n"));
 
   // The next current stock rates are obtained from a file.
   if (this->get_stock_information () == -1)
     return 0;
-  
-  
+
+
   // Send the stock information to the notifier.  Graceful exit when
   // the notifier doesnt accept the information.
-  if (this->supplier_obj_->send_market_status (stockname_, 
+  if (this->supplier_obj_->send_market_status (stockname_,
                                                value_) < 0)
     {
       this->reactor_->end_event_loop ();
@@ -80,7 +80,7 @@ int
 Supplier_Timer_Handler::get_stock_information (void)
 {
   // Scan the file and obtain the stock information.
-  if (fscanf (file_ptr_, 
+  if (fscanf (file_ptr_,
               "%s %ld\n",
               stockname_,
               &value_) != EOF)
@@ -97,5 +97,5 @@ Supplier_Timer_Handler::get_stock_information (void)
       this->reactor_->end_event_loop ();
       return -1;
     }
-} 
+}
 
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index 36f9af89128..bfbe6a7e00a 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -186,7 +186,7 @@ Supplier::run (void)
   long timer_id = 0;
 
   ACE_DEBUG ((LM_DEBUG,
-              "Market Status Supplier Daemon is running...\n "));
+              "Market Status Supplier Daemon is running...\n"));
 
   // This sets the period for the stock-feed.
   ACE_Time_Value period (period_value_);
@@ -217,7 +217,7 @@ Supplier::via_naming_service (void)
       if (naming_services_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::Name notifier_ref_name (1);
       notifier_ref_name.length (1);
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index ee1e0adfb68..7d2ce5f2f18 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -75,7 +75,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (CORBA::is_nil (factory.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("Object pointed to by:\n ")
+                             ACE_TEXT ("Object pointed to by:\n")
                              ACE_TEXT ("%s\n")
                              ACE_TEXT ("is not an Iterator_Factory ")
                              ACE_TEXT ("object.\n"),
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index 76ce8eb38a6..7e70334ebc4 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -63,7 +63,7 @@ Consumer_Handler::init (int argc,
       if (this->get_notifier () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the notifier "
-                           "the TAO_Naming_Client. \n"),
+                           "the TAO_Naming_Client.\n"),
                           -1);
 
       // Subscribe ourselves with the notifier's broker.
@@ -88,7 +88,7 @@ Consumer_Handler::get_notifier (void)
       if (naming_services_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::Name notifier_ref_name (1);
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index 063f16a5040..00cd5c92746 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -105,7 +105,7 @@ Notifier_Handler::init (int argc,
       if (this->naming_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::Name notifier_ref_name (1);
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index fe40065e6c2..2492e7205fa 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -38,7 +38,7 @@ Notifier::Notifier (int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Notifier_Server.init failed\n ");
+      ex._tao_print_exception ("Notifier_Server.init failed\n");
     }
 
   // Register with the ORB's Reactor to receive a signal to shut us
diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp
index 6b5a5c3d985..9769666f031 100644
--- a/TAO/examples/Event_Comm/supplier.cpp
+++ b/TAO/examples/Event_Comm/supplier.cpp
@@ -61,7 +61,7 @@ Supplier::init (int argc, ACE_TCHAR *argv[])
                        "register_handler"),
                       -1);
   ACE_DEBUG ((LM_DEBUG,
-              "Supplier initialized.. \n"));
+              "Supplier initialized..\n"));
   return 0;
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index 3560baff0af..f036d5d85f8 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -503,7 +503,7 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     {
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
-                  "(%t|%T): sched_policy nil.\n "));
+                  "(%t|%T): sched_policy nil.\n"));
 #endif
       //24 hrs from now - infinity
       ACE_Time_Value deadline_tv = ACE_OS::gettimeofday () + ACE_Time_Value (24*60*60,0);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index 9e84dcec991..f50be5236b0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -460,7 +460,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
   {
 #ifdef KOKYU_DSRT_LOGGING
     ACE_DEBUG ((LM_DEBUG,
-                "(%t|%T): sched_policy nil.\n "));
+                "(%t|%T): sched_policy nil.\n"));
 #endif
     //24 hrs from now - infinity
     ACE_Time_Value deadline_tv = ACE_OS::gettimeofday () + ACE_Time_Value (24*60*60,0);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
index b563e8a8acb..bf7f1acd804 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
@@ -65,7 +65,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
   if (output_file == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%s cannot be opened \n",
+                  "%s cannot be opened\n",
                   file_name));
     }
 
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index ee7763ea1cc..3d663347fce 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -97,7 +97,7 @@ Identity_Client::init (int argc,
 int
 Identity_Client::run (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized \n"));
+  ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized\n"));
 
   // Contact the <Object_Group_Factory> to obtain an <Object_Group>.
   CORBA::ORB_var orb = orb_manager_.orb ();
diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp
index 61f9ce77722..536436b2a58 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Server.cpp
@@ -172,7 +172,7 @@ int
 Identity_Server::run (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Identity_Server: Initialized \n"));
+              "Identity_Server: Initialized\n"));
 
   int result;
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
index abfcba7652f..ad4264ba54e 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
@@ -115,7 +115,7 @@ int
 Load_Balancing_Service::run (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Load_Balancer: Initialized \n"));
+              "Load_Balancer: Initialized\n"));
 
   int result;
 
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 2615c0335e2..a0b47c5629a 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -106,8 +106,8 @@ Identity_Client::run (void)
 
   if (obj.in () == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%N|%l) <ERROR> [Identity_Client::run] \n")
-                       ACE_TEXT ("factory_resolve \n")),
+                       ACE_TEXT ("(%N|%l) <ERROR> [Identity_Client::run]\n")
+                       ACE_TEXT ("factory_resolve\n")),
                       -1);
 
   Load_Balancer::Object_Group_Factory_var factory =
@@ -151,7 +151,7 @@ Identity_Client::run (void)
         orb->object_to_string (object_group.in ());
 
       ACE_DEBUG ((LM_DEBUG,
-                  "The ior string is %s \n", iorstring.in ()));
+                  "The ior string is %s\n", iorstring.in ()));
 #if defined (DOORS_MEASURE_STATS)
       // Grab timestamp again.
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -162,7 +162,7 @@ Identity_Client::run (void)
 
     }
 
-  ACE_OS::printf ("*=*=*=*=Aggregated result *=*=*=*=*= \n");
+  ACE_OS::printf ("*=*=*=*=Aggregated result *=*=*=*=*=\n");
   throughput.dump_results (ACE_TEXT("Aggregated"), gsf);
 #endif /*TAO_MEASURE_STATS */
 
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index 04c0dce0d5a..ff8308fc06d 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -130,7 +130,7 @@ Identity_Server::register_groups (void)
   catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%N | %l) <Unbind> harmless here \n"));
+                  "(%N | %l) <Unbind> harmless here\n"));
     }
 
   // Unbind the previously registered round robin group
@@ -141,7 +141,7 @@ Identity_Server::register_groups (void)
   catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%N | %l) <Unbind> harmless here \n"));
+                  "(%N | %l) <Unbind> harmless here\n"));
     }
 
 
@@ -214,7 +214,7 @@ Identity_Server::create_objects (size_t number_of_objects,
       catch (const CORBA::Exception&)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "(%N | %l) Harmless here \n"));
+                      "(%N | %l) Harmless here\n"));
         }
 
       // Bind the servant in the random <Object_Group>.
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 781defc5cc2..e1100a6ef3b 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -70,7 +70,7 @@ Object_Group_Factory_i::make_round_robin (const char * id)
                                  (void *)this->rr_groups_) != 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to bind \n"),
+                             "Unable to bind\n"),
                             0);
         }
     }
@@ -148,7 +148,7 @@ Object_Group_Factory_i::make_random (const char * id)
                                  (void *)this->random_groups_) != 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to bind \n"),
+                             "Unable to bind\n"),
                             0);
         }
     }
@@ -399,7 +399,7 @@ Object_Group_Factory_i::resolve (const char * id)
                             now - latency_base);
 
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  ACE_OS::printf ("*=*=*=*=Aggregated result *=*=*=*=*= \n");
+  ACE_OS::printf ("*=*=*=*=Aggregated result *=*=*=*=*=\n");
   this->throughput_.dump_results (ACE_TEXT("Aggregated"), gsf);
 
 #endif /*DOORS_MEASURE_STATS*/
@@ -633,7 +633,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member)
                                       (void *)this->members_) != 0)
             {
               ACE_ERROR ((LM_ERROR,
-                          "Unable to bind \n"));
+                          "Unable to bind\n"));
 
             }
         }
@@ -698,7 +698,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member)
                                  (void *)this->member_id_list_) != 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      "Unable to bind \n"));
+                      "Unable to bind\n"));
           return;
         }
     }
@@ -847,7 +847,7 @@ Object_Group_i::read_from_memory (void)
       else
         {
           ACE_ERROR ((LM_ERROR,
-                      "Unable to find tha HASH MAP  in the MMAP file \n"));
+                      "Unable to find tha HASH MAP  in the MMAP file\n"));
         }
     }
 
@@ -867,7 +867,7 @@ Object_Group_i::read_from_memory (void)
       else
         {
           ACE_ERROR ((LM_ERROR,
-                      "Unable to find tha HASH MAP  in the MMAP file \n"));
+                      "Unable to find tha HASH MAP  in the MMAP file\n"));
         }
     }
 
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index f0a14d4e605..2c1e443afd1 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -83,7 +83,7 @@ Logger_Client::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);
 
   // Resolve an instance of the Logger_Factory
@@ -194,22 +194,22 @@ Logger_Client::run (void)
       // Setup the first log record
       this->init_record (rec1,
                          Logger::LM_DEBUG,
-                         "log() test (1) \n");
+                         "log() test (1)\n");
 
       // Setup the second log record
       this->init_record (rec2,
                          Logger::LM_MAX,
-                         "log() test (2) \n");
+                         "log() test (2)\n");
 
       // Setup the third log record
       this->init_record (rec3,
                          Logger::LM_INFO,
-                         "logv() test (3) \n");
+                         "logv() test (3)\n");
 
       // Setup the fourth log record
       this->init_record (rec4,
                          Logger::LM_EMERGENCY,
-                         "log_twoway() test (4) \n");
+                         "log_twoway() test (4)\n");
 
       // If debugging, output the new log records
       if (TAO_debug_level > 0)
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index b476733f8f1..725dd396fab 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -83,7 +83,7 @@ Grid_Client_i::run (const char *name,
           for (CORBA::Short ctr = 0; ctr < height_; ctr++)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          "Grid value [%d][%d] =  %d \n",index_, ctr,value_+ctr));
+                          "Grid value [%d][%d] =  %d\n",index_, ctr,value_+ctr));
               // Set a value on the grid
               grid->set (index_,
                          ctr,
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
index 3ce24e90c3c..b1dbe5e67e6 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
@@ -77,7 +77,7 @@ Persistent_Client_i::run (const char *name,
                                                ctr);
 
               ACE_DEBUG ((LM_DEBUG,
-                          "Grid value [%d][%d] =  %d \n",index_, ctr,ret_val));
+                          "Grid value [%d][%d] =  %d\n",index_, ctr,ret_val));
             }
         }
 
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index 7c894276bbb..90a23593053 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -162,7 +162,7 @@ Client::svc (void)
       else
       {
         ACE_DEBUG ((LM_DEBUG,
-                    "Time for %u Msgs: %u usec \n",
+                    "Time for %u Msgs: %u usec\n",
                     this->niterations_,
                     dur));
 
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index e0a210fbca1..f0d2ecae026 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -206,7 +206,7 @@ Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
               if (i == factories_ptr->length ())
                 {
                   ACE_ERROR ((LM_ERROR,
-                              "Quoter::copy: Last factory did not work. \n"
+                              "Quoter::copy: Last factory did not work.\n"
                               "No more factories are available. I give up.\n"));
                   throw CosLifeCycle::NoFactory (factoryKey);
                 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
index 8c9e05db43a..bcf04daf6a1 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
@@ -55,7 +55,7 @@ DT_Test::check_supported_priorities (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Not enough priority levels on this platform"
-                      " to run the test, aborting \n"));
+                      " to run the test, aborting\n"));
           ACE_OS::exit (2);
         }
       else ACE_DEBUG ((LM_DEBUG, "max_priority = %d, min_priority = %d\n",
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index cbdf77393e8..2e5c487fef4 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -120,7 +120,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
                   arg_shifter.consume_arg ();
 
                   //if (TAO_debug_level > 0)
-                  ACE_DEBUG ((LM_DEBUG, "band parsed - %d, %d \n",
+                  ACE_DEBUG ((LM_DEBUG, "band parsed - %d, %d\n",
                               bands_[b_index].low, bands_[b_index].high));
                   b_index++;
                 }
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 9e32d62cbb8..9344d721953 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -10,7 +10,7 @@ Starter::Starter (CORBA::ORB_ptr orb)
   if (this->naming_client_.init (orb) != 0)
     ACE_ERROR ((LM_ERROR,
     " (%P|%t) Unable to initialize "
-    "the TAO_Naming_Client. \n"));
+    "the TAO_Naming_Client.\n"));
 }
 
 void
diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp
index f1c8001cc90..48c841f8687 100644
--- a/TAO/examples/RTScheduling/Task_Stats.cpp
+++ b/TAO/examples/RTScheduling/Task_Stats.cpp
@@ -69,7 +69,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
   if (output_file == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "%s cannot be opened \n",
+                  "%s cannot be opened\n",
                   file_name));
     }
 
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index dc289b3bbb1..ed34fd728e9 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -242,7 +242,7 @@ Server<Servant>::register_name (const char *name)
   catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Unable to bind %C \n"),
+                         ACE_TEXT ("Unable to bind %C\n"),
                          name),
                         -1);
     }
@@ -387,7 +387,7 @@ Client<ServerInterface>::init (const char *name,
         {
           // No IOR specified. Use the Naming Service
           ACE_DEBUG((LM_DEBUG,
-                     ACE_TEXT ("Using the Naming Service \n")));
+                     ACE_TEXT ("Using the Naming Service\n")));
           int retv = this->obtain_initial_references (name);
           if (retv ==-1)
             return -1;
@@ -417,7 +417,7 @@ Client<ServerInterface>::obtain_initial_references (const char *name)
       if (naming_client_.init (orb_.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("[CLIENT] Process/Thread Id : (%P/%t) Unable to initialize ")
-                           ACE_TEXT ("the TAO_Naming_Client. \n")),
+                           ACE_TEXT ("the TAO_Naming_Client.\n")),
                           -1);
 
       CosNaming::Name server_name (1);
diff --git a/TAO/interop-tests/wchar/client.cpp b/TAO/interop-tests/wchar/client.cpp
index 4a5f9a7c678..1cadcf12b92 100644
--- a/TAO/interop-tests/wchar/client.cpp
+++ b/TAO/interop-tests/wchar/client.cpp
@@ -330,7 +330,7 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
     CORBA::String_var server_orb =
       server->orb_name();
     ACE_ERROR ((LM_ERROR,
-                "wchar_interop test (TAO client, %s server) %s \n",
+                "wchar_interop test (TAO client, %s server) %s\n",
                 server_orb.in(),
                 (result ? "passed" : "failed")));
     if (kill_server)
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index 52e377f8dcd..e991d5f5245 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -207,7 +207,7 @@ ACE_TMAIN (int argc, ACE_TCHAR ** argv)
   Concurrency_Service concurrency_service;
 
   ACE_DEBUG ((LM_DEBUG,
-              "\n \t Concurrency Service:SERVER \n \n"));
+              "\n \t Concurrency Service:SERVER \n\n"));
 
   try
     {
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index 5d9230fa4cd..5dc0bd322e2 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -174,10 +174,10 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv [])
     case '?':
     default:
       ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT("Usage: %s \n")
+        ACE_TEXT("Usage: %s\n")
         ACE_TEXT("  -j join the object group\n")
         ACE_TEXT("  -p set as primary\n")
-        ACE_TEXT("  -s <global|local> \n")
+        ACE_TEXT("  -s <global|local>\n")
         ACE_TEXT("\n"),
         argv[0]));
       return -1;
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index 6f68f698f4a..505122dd7d9 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -42,7 +42,7 @@ int parse_args(int argc, ACE_TCHAR* argv[])
   if (result == -1 || (id.length () == 0 && output.length () == 0))
   {
     ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT("Usage: %s \n")
+      ACE_TEXT("Usage: %s\n")
       ACE_TEXT("  [-i id]  set the id that is used to register to the naming service\n")
       ACE_TEXT("  [-k kind] set the kind that is used to register to the naming service\n")
       ACE_TEXT("  [-o filename] set the output file name for the IOR\n")
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index ba4650f533e..270cf5c858e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -208,7 +208,7 @@ Activator_Options::print_usage (void) const
               "\n"
               "ImR_Activator [-c cmd] [-d 0|1|2] [-e buflen] [-o file] [-l] [-n name] [-m maxenv]\n"
               "\n"
-              "  -c command  Runs service commands \n"
+              "  -c command  Runs service commands\n"
               "              ('install' or 'remove' or 'install_no_imr')\n"
               "  -d level    Sets the debug level\n"
               "  -e buflen   Set the environment buffer length in bytes for activated servants\n"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index fcdbccd45f9..af5a05a83d1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -171,7 +171,7 @@ run_service_command (Activator_Options& opts)
     }
   else
     {
-      ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d \n",
+      ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d\n",
         opts.service_command ()));
       return -1;
     }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index 73c98447e11..15d28889e53 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -341,7 +341,7 @@ ImR_Activator_i::start_server(const char* name,
 
   if (debug_ > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, "ImR Activator: Successfully started <%s>, pid=%d \n", name, pid));
+      ACE_DEBUG ((LM_DEBUG, "ImR Activator: Successfully started <%s>, pid=%d\n", name, pid));
     }
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 3da805060a0..e13d1f3e60b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -153,7 +153,7 @@ run_service_command (Options& opts)
     }
   else
     {
-      ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d \n",
+      ACE_ERROR ((LM_ERROR, "Error: Unknown service command :%d\n",
         opts.service_command ()));
       return -1;
     }
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index c20a7f8047d..1d7be573714 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -220,7 +220,7 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn
     limit - 1,
     locked_out));
   for (CORBA::ULong i = 0; i < info.startup.environment.length (); ++i)
-    ACE_DEBUG ((LM_DEBUG, "Environment Variable: %s=%s \n",
+    ACE_DEBUG ((LM_DEBUG, "Environment Variable: %s=%s\n",
     info.startup.environment[i].name.in (),
     info.startup.environment[i].value.in ()));
 
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index 2b7b01da304..8078f8690ed 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -109,7 +109,7 @@ RTEvent_Logging_Service::init (int argc, ACE_TCHAR* argv[])
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%P|%t) Unable to initialize "
-                         "the factory. \n"),
+                         "the factory.\n"),
                         -1);
     }
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 0d692b10c14..8b74787ca4f 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -510,7 +510,7 @@ Worker::svc (void)
       return -1;
     }
 
-  ACE_DEBUG ((LM_DEBUG, "Activated Worker Thread to run the ORB @ priority:%d \n", priority));
+  ACE_DEBUG ((LM_DEBUG, "Activated Worker Thread to run the ORB @ priority:%d\n", priority));
 #endif
 
   try
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
index f503e2f22e8..5148e9085d5 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
@@ -77,7 +77,7 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
   if (result == -1)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Bind not done successfully \n"));
+                  "Bind not done successfully\n"));
     }
   else if (result == 1)
     {
diff --git a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
index 65932b082f1..06b73624aef 100644
--- a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
@@ -167,12 +167,12 @@ TAO_PSDL_Exception_Visitor::print_class_for_exception (void)
   *ps_sh << "          TAO_OutputCDR &\n";
   *ps_sh << "\n";
   *ps_sh << "        ) const;\n";
-  *ps_sh << "      \n";
+  *ps_sh << "     \n";
   *ps_sh << "      virtual void _tao_decode (\n";
   *ps_sh << "          TAO_InputCDR &\n";
   *ps_sh << "\n";
   *ps_sh << "        );\n";
-  *ps_sh << "      \n";
+  *ps_sh << "     \n";
 
   if (this->identifiers_.size () > 1)
     {
@@ -208,14 +208,14 @@ TAO_PSDL_Exception_Visitor::print_class_for_exception (void)
         }
     }
 
-  *ps_sh << "      \n";
+  *ps_sh << "     \n";
   *ps_sh << "      virtual CORBA::TypeCode_ptr _type (void) const;\n";
   *ps_sh << "    };\n";
   *ps_sh << "\n";
   *ps_sh << "static ::CORBA::TypeCode_ptr _tc_"
        << this->exception_name_ << ";\n";
-  *ps_sh << "    \n";
-  *ps_sh << "    \n";
+  *ps_sh << "   \n";
+  *ps_sh << "   \n";
   *ps_sh << "#endif /* end #if !defined */\n";
-  *ps_sh << "    \n";
+  *ps_sh << "   \n";
 }
diff --git a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
index 7200656d61b..878f19db993 100644
--- a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
@@ -545,7 +545,7 @@ TAO_PSDL_Struct_Visitor::print_class_for_structure (ACE_CString struct_name)
 
   *ps_sh << "};\n";
 
-  *ps_sh << "class  " << struct_name << "_out \n";
+  *ps_sh << "class  " << struct_name << "_out\n";
   *ps_sh << "{\n";
   *ps_sh << "  public:\n";
   *ps_sh << "    " << struct_name << "_out ("
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index e3dc8eaab7f..da07a2dd6f8 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -188,7 +188,7 @@ FactoryClient::find_channel (const char* channel_id)
         orb_->object_to_string (channel.in ());
 
       ACE_DEBUG ((LM_DEBUG,
-              "Find returned - %s \n",
+              "Find returned - %s\n",
                   str.in ()));
 
       this->find_channel_id (channel.in ());
@@ -210,7 +210,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel)
     orb_->object_to_string (channel);
 
   ACE_DEBUG ((LM_DEBUG,
-              "trying to find the Channel %s \n",
+              "trying to find the Channel %s\n",
               str.in ()));
 
   char *channel_id =
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index daf111cb87e..a2e11f0c2de 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -86,7 +86,7 @@ FactoryDriver::start (int argc, ACE_TCHAR *argv [])
       if (naming_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 =
@@ -97,7 +97,7 @@ FactoryDriver::start (int argc, ACE_TCHAR *argv [])
                                   context.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Unable to initialize "
-                           "the factory. \n"),
+                           "the factory.\n"),
                           1);
 
       // activate the factory in the root poa.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index 58d98e61e29..5511ff6ae54 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -25,7 +25,7 @@ CosEC_ServantBase::~CosEC_ServantBase (void)
 {
   // No-Op.
 #if 0
-  ACE_DEBUG ((LM_DEBUG, "in cosec servant base %d \n", this));
+  ACE_DEBUG ((LM_DEBUG, "in cosec servant base %d\n", this));
 #endif
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 6469689e533..1656ddd70e2 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -34,7 +34,7 @@ Consumer::parse_args (int argc, ACE_TCHAR *argv [])
                       "Usage: %s "
                       " -n <COS Event Service name>"
                       " -c event_count"
-                      " \n",
+                      "\n",
                       argv[0]));
           return -1;
         }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index 40966550e3e..3093afb565f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -77,7 +77,7 @@ Multiple::init_CosEC (void)
       if (this->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);
 
       CosNaming::Name ec_ref_name (1);
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index a0b2cb3628f..3bb98542efa 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -33,7 +33,7 @@ Supplier::parse_args (int argc, ACE_TCHAR *argv [])
           ACE_DEBUG ((LM_DEBUG,
                       "Usage: %s "
                       " -n <COS Event Service name>"
-                      " \n",
+                      "\n",
                       argv[0]));
           return -1;
         }
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index 77bad840e2d..c2c926fc03a 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -111,7 +111,7 @@ TLS_Client::run_tests (void)
   CORBA::Long retval = basic_log->get_n_records ().lo();
 #endif
 
-  ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
+  ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d\n", retval));
 
   ACE_DEBUG ((LM_DEBUG,
               "Calling BasicLog::get_current_size...\n"));
@@ -121,7 +121,7 @@ TLS_Client::run_tests (void)
   retval = basic_log->get_current_size ().lo();
 #endif
 
-  ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
+  ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval));
 
   ACE_DEBUG ((LM_DEBUG, "Querying the Log: %s\n", QUERY_1));
   DsLogAdmin::Iterator_var iter_out;
@@ -142,7 +142,7 @@ TLS_Client::run_tests (void)
 #endif
 
   ACE_DEBUG ((LM_DEBUG,
-              "Deleting records... \n"));
+              "Deleting records...\n"));
 
   retval = basic_log->delete_records (QUERY_LANG, QUERY_2);
 
@@ -154,7 +154,7 @@ TLS_Client::run_tests (void)
   retval = basic_log->get_n_records ().lo();
 #endif
 
-  ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
+  ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d\n",
               retval));
 
   ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
@@ -164,7 +164,7 @@ TLS_Client::run_tests (void)
   retval = basic_log->get_current_size ().lo();
 #endif
 
-  ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
+  ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval));
 
   basic_log->destroy ();
 }
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index f41ca5befd4..32dcb270078 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -122,7 +122,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
       CORBA::Long retval = event_log->get_n_records ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
+      ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d\n", retval));
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_current_size...\n"));
@@ -132,7 +132,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
       retval = event_log->get_current_size ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
+      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval));
 
       ACE_DEBUG ((LM_DEBUG, "Querying the Log: %s\n", QUERY_1));
       DsLogAdmin::Iterator_var iter_out;
@@ -152,7 +152,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 #endif
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Deleting records... \n"));
+                  "Deleting records...\n"));
 
       retval = event_log->delete_records (QUERY_LANG, QUERY_2);
 
@@ -164,7 +164,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
       retval = event_log->get_n_records ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
+      ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d\n",
                   retval));
 
       ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
@@ -174,7 +174,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
       retval = event_log->get_current_size ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
+      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval));
 
      // Disconnect from the EC
       this->consumer_->disconnect_push_consumer ();
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 9cc2bd0d94c..28061b61d0b 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -193,7 +193,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
       CORBA::Long retval = notify_log_->get_n_records ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
+      ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d\n", retval));
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling NotifyLog::get_current_size...\n"));
@@ -203,7 +203,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
        retval = notify_log_->get_current_size ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
+      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval));
 
       ACE_DEBUG ((LM_DEBUG, "Querying the Log: %s\n", QUERY_1));
       DsLogAdmin::Iterator_var iter_out;
@@ -223,7 +223,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 #endif
 
      ACE_DEBUG ((LM_DEBUG,
-                 "Deleting records... \n"));
+                 "Deleting records...\n"));
 
      retval = notify_log_->delete_records (QUERY_LANG, QUERY_2);
 
@@ -235,7 +235,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
      retval = notify_log_->get_n_records ().lo();
 #endif
 
-     ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
+     ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d\n",
                  retval));
 
      ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
@@ -245,7 +245,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
      retval = notify_log_->get_current_size ().lo();
 #endif
 
-     ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
+     ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval));
 
      this->notify_log_->destroy();
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index e4b3cbda2e9..f15eb352a41 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -170,7 +170,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
       CORBA::Long retval = event_log->get_n_records ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
+      ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d\n", retval));
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_current_size...\n"));
@@ -180,7 +180,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
       retval = event_log->get_current_size ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
+      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval));
 
       ACE_DEBUG ((LM_DEBUG, "Querying the Log: %s\n", QUERY_1));
       DsLogAdmin::Iterator_var iter_out;
@@ -200,7 +200,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
 #endif
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Deleting records... \n"));
+                  "Deleting records...\n"));
 
       retval = event_log->delete_records (QUERY_LANG, QUERY_2);
 
@@ -212,7 +212,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
       retval = event_log->get_n_records ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
+      ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d\n",
                   retval));
 
       ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
@@ -222,7 +222,7 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
       retval = event_log->get_current_size ().lo();
 #endif
 
-      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
+      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval));
 
      // Disconnect from the EC
      this->consumer_->disconnect_push_consumer ();
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index 6f1b03d89ec..04a7df4e395 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -423,7 +423,7 @@ Filter_StructuredPushSupplier::send_event
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   ACE_DEBUG ((LM_DEBUG,
-              "%C is sending an event \n", my_name_.fast_rep ()));
+              "%C is sending an event\n", my_name_.fast_rep ()));
 
   proxy_consumer_->push_structured_event (event);
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 9c166e7ccdc..02e5c007748 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -108,7 +108,7 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu
 
       // The current thread priority and the event priority must match.
       if (event_priority != thread_priority)
-        ACE_DEBUG ((LM_DEBUG, "(%P, %t) Error: Event priority and thread priority are different. \n"));
+        ACE_DEBUG ((LM_DEBUG, "(%P, %t) Error: Event priority and thread priority are different.\n"));
 
       // Disconnect from the EC
       this->disconnect ();
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index bd8bb1c2c74..e66ba23fa80 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -225,7 +225,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                               -1);
           else
             ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT ("(%t) Task activation at priority %d failed. \n")));
+                        ACE_TEXT ("(%t) Task activation at priority %d failed.\n")));
         }
 
       orb_run_task.thr_mgr ()->wait ();
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 85b51bb21a5..9c2e44e458d 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -234,7 +234,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                               -1);
           else
             ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT ("(%t) Task activation at priority %d failed. \n")));
+                        ACE_TEXT ("(%t) Task activation at priority %d failed.\n")));
         }
 
       orb_run_task.thr_mgr ()->wait ();
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index 08a7dd3247d..9e06af2c97a 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -169,7 +169,7 @@ TAO_Notify_ThreadPool_Consumer::dump_throughput (void)
 {
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
-  ACE_DEBUG ((LM_DEBUG, "(%P,%t) Consumer %d \n", proxy_supplier_id_));
+  ACE_DEBUG ((LM_DEBUG, "(%P,%t) Consumer %d\n", proxy_supplier_id_));
 
   ACE_Throughput_Stats::dump_throughput (ACE_TEXT("Total"), gsf,
                                          t_last_ - t_first_,
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 2a23ddca625..26a3a3779cb 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -229,7 +229,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                               -1);
           else
             ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT ("(%t) Task activation at priority %d failed. \n")));
+                        ACE_TEXT ("(%t) Task activation at priority %d failed.\n")));
         }
 
       orb_run_task.thr_mgr ()->wait ();
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 087f830a6a8..83bc0304d81 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -231,7 +231,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                               -1);
           else
             ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT ("(%t) Task activation at priority %d failed. \n")));
+                        ACE_TEXT ("(%t) Task activation at priority %d failed.\n")));
         }
 
       orb_run_task.thr_mgr ()->wait ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 8eef5fff7c9..b53ac941df0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -833,7 +833,7 @@ TAO_AV_Core::init_transport_factories (void)
           const ACE_CString &name = (*factory)->name ();
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "%s \n",
+                        "%s\n",
                         name.c_str ()));
 
           (*factory)->factory (
@@ -1070,7 +1070,7 @@ TAO_AV_Core::init_flow_protocol_factories (void)
           const ACE_CString &name = (*factory)->name ();
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "%s \n",
+                        "%s\n",
                         name.c_str ()));
 
           (*factory)->factory (
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index c0181dafeb4..feef03c032e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -348,7 +348,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address,
       else
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "AV BOTH %s \n",
+                      "AV BOTH %s\n",
                       protocol_tokenizer[1]));
 
           TAO_Tokenizer address_tokenizer (protocol_tokenizer[1], ':');
@@ -598,7 +598,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry)
       ACE_TCHAR buf [BUFSIZ];
       addr->addr_to_string (buf, BUFSIZ);
       ACE_DEBUG ((LM_DEBUG,
-                  "Peer Address %s \n",
+                  "Peer Address %s\n",
                   buf));
 
     }
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 5131d70f7e2..873ff23c099 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -793,7 +793,7 @@ TAO_AV_UDP_QoS_Acceptor::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *hand
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "(%N,%l) Acceptor Svc Handler QOS ENABLED \n"));
+                "(%N,%l) Acceptor Svc Handler QOS ENABLED\n"));
 
   TAO_AV_UDP_QoS_Session_Helper helper;
 
@@ -1040,7 +1040,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
   catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%N,%l) Negotiator Not Found \n"));
+                  "(%N,%l) Negotiator Not Found\n"));
     }
 
   this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler);
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 7a080c1aed3..ff59fbe31d3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -219,7 +219,7 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint,
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "TAO_AV_Acceptor_Registry::open \n"));
+                "TAO_AV_Acceptor_Registry::open\n"));
 
   TAO_AV_FlowSpecSetItor last_flowspec
     = flow_spec_set.end ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 6dfe56be525..712232f0556 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -551,7 +551,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr,
       local_addr->addr_to_string (buf,BUFSIZ);
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO_AV_UDP_ACCEPTOR::open:%s \n",
+                    "TAO_AV_UDP_ACCEPTOR::open:%s\n",
                     buf));
     }
 
@@ -762,7 +762,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
       local_addr->addr_to_string (buf,BUFSIZ);
 
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_CONNECTOR::connect:%s \n",buf));
+        ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_CONNECTOR::connect:%s\n",buf));
     }
 
   // call activate svc handler.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index 9da65cee9b4..8f26a1bc535 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -313,12 +313,12 @@ TAO_ECG_CDR_Message_Receiver::handle_input (
                   "******************************\n"));
 
       ACE_ERROR ((LM_ERROR,
-                  "ERROR DETECTED \n"));
+                  "ERROR DETECTED\n"));
 
       if (crc == 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      "Sending process may not have computed CRC \n"));
+                      "Sending process may not have computed CRC\n"));
         }
       else
         {
@@ -327,13 +327,13 @@ TAO_ECG_CDR_Message_Receiver::handle_input (
         }
 
       ACE_ERROR ((LM_ERROR,
-                  "Message was received from [%s:%s:%d] \n",
+                  "Message was received from [%s:%s:%d]\n",
                   from.get_host_name (),
                   from.get_host_addr (),
                   from.get_port_number()));
 
       ACE_ERROR ((LM_ERROR,
-                  "Num errors = %d \n",
+                  "Num errors = %d\n",
                   ++err_count));
       ACE_ERROR ((LM_ERROR,
                   "This is a bad thing. Attempting to ignore ..\n"));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index ff13abc9980..8d5f51a6eb0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -244,7 +244,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
       || CORBA::is_nil (this->supplier_ec_.in ()))
     return;
 
-  // ACE_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i \n"));
+  // ACE_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i\n"));
 
   this->open_i (c_qos);
 }
@@ -443,7 +443,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (void)
 void
 TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events)
 {
-  // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) - \n"));
+  // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) -\n"));
 
   if (events.length () == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index ed8e4d4e1b3..62e4a446f95 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -104,7 +104,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
   RtecScheduler::handle_t h_final_consumer_rep_rt_info = 0;
 
 #ifdef EC_KOKYU_LOGGING
-  ACE_DEBUG ((LM_DEBUG, "consumer rt_info found in consumerqos[%d] \n", npos));
+  ACE_DEBUG ((LM_DEBUG, "consumer rt_info found in consumerqos[%d]\n", npos));
 #endif
 
   if (npos >= 0 && establish_final_consumer_dependency == 1)
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 9438282afce..0c44bea3fd1 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -9,8 +9,8 @@
 #include "orbsvcs/Event_Utilities.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (orbsvcs, 
-           Event_Utilities, 
+ACE_RCSID (orbsvcs,
+           Event_Utilities,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -140,7 +140,7 @@ void event_debug (const char* p,
 void
 ACE_ConsumerQOS_Factory::debug (const RtecEventChannelAdmin::ConsumerQOS& qos)
 {
-  ACE_DEBUG ((LM_DEBUG, "ConsumerQOS { \n"));
+  ACE_DEBUG ((LM_DEBUG, "ConsumerQOS {\n"));
   ACE_DEBUG ((LM_DEBUG, "  is_gateway: %d\n", qos.is_gateway));
 
   for (u_int i = 0; i < qos.dependencies.length (); ++i)
@@ -200,7 +200,7 @@ ACE_SupplierQOS_Factory::insert (RtecEventComm::EventSourceID sid,
 
 void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& qos)
 {
-  ACE_DEBUG ((LM_DEBUG, "SupplierQOS { \n"));
+  ACE_DEBUG ((LM_DEBUG, "SupplierQOS {\n"));
   ACE_DEBUG ((LM_DEBUG, "  is_gateway: %d\n", qos.is_gateway));
 
   for (u_int i = 0; i < qos.publications.length (); ++i)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index 98fb0329c25..dc009be5324 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -245,7 +245,7 @@ TAO_FT_IOGR_Property::encode_properties (
       if (TAO_debug_level > 2)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "TAO-FT (%P|%t) - The group tagged component ",
-                           "is null \n"),
+                           "is null\n"),
                           0);
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
index 56d8c25b846..200545a05cb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp
@@ -53,7 +53,7 @@ namespace FTRTEC {
 #else
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) SCTP not enabled. ",
-                  " Enable SCTP and rebuild ACE+TAO \n"));
+                  " Enable SCTP and rebuild ACE+TAO\n"));
 #endif /* TAO_HAS_SCIOP */
       argc--; argv++;
     }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index e2af033bd2a..d58362ced8f 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -353,7 +353,7 @@ TAO::HTIOP::Profile::create_profile_body (TAO_OutputCDR &encap) const
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) TAO - IIOP_Profile::create_profile_body "
-                  "no object key marshalled \n"));
+                  "no object key marshalled\n"));
     }
 
   if (this->version_.major > 1
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
index 8b3f9827196..f9e57d5a2d4 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -271,7 +271,7 @@ TAO::HTIOP::Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
             {
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT("TAO (%P|%t) - TAO::HTIOP::Transport::set_bidir_info, "),
-                          ACE_TEXT("error getting listen_point \n")));
+                          ACE_TEXT("error getting listen_point\n")));
 
               return;
             }
@@ -345,7 +345,7 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list,
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("(%P|%t) Could not resolve local host")
-                             ACE_TEXT (" name \n")),
+                             ACE_TEXT (" name\n")),
                             -1);
         }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 39cc9e497e1..072a257810c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -211,7 +211,7 @@ TAO_LB_LoadMinimum::next_member (
       //       very lightweight and stateless.
 /*
        ACE_DEBUG ((LM_DEBUG,
-                   "CALLING RANDOM  REFERENCE FOR LOCATION \n"));
+                   "CALLING RANDOM  REFERENCE FOR LOCATION\n"));
 */
 
       return TAO_LB_Random::_tao_next_member (object_group,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index e7244a6b396..70f6caf7b04 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -174,7 +174,7 @@ TAO_Persistent_Context_Index::recreate_all (void)
   IND_DEF::ENTRY *entry = 0;
 
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file... \n"));
+    ACE_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file...\n"));
 
   // For each entry in <index_>, create a Naming Context servant.
   do
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index ee6d772f2bd..35c1afd2b2b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -54,7 +54,7 @@ TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const
 {
   if (DEBUG_LEVEL > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
-                "TAO_Notify_AnyEvent::push \n"));
+                "TAO_Notify_AnyEvent::push\n"));
 
   consumer->push (*this->event_);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 4e3a43e7803..b9cfff8d090 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -48,7 +48,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[])
         {
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) The -MTDispatching option has been deprecated, use -DispatchingThreads \n")));
+                      ACE_TEXT ("(%P|%t) The -MTDispatching option has been deprecated, use -DispatchingThreads\n")));
         }
       else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads"))))
         {
@@ -59,7 +59,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[])
         {
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) The -MTSourceEval option has been deprecated, use -SourceThreads \n")));
+                      ACE_TEXT ("(%P|%t) The -MTSourceEval option has been deprecated, use -SourceThreads\n")));
         }
       else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads"))))
         {
@@ -70,27 +70,27 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[])
         {
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) The -MTLookup option has been deprecated, use -SourceThreads \n")));
+                      ACE_TEXT ("(%P|%t) The -MTLookup option has been deprecated, use -SourceThreads\n")));
         }
       else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads"))))
         {
           supplier_threads += ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) The -LookupThreads option has been deprecated, use -SourceThreads \n")));
+                      ACE_TEXT ("(%P|%t) The -LookupThreads option has been deprecated, use -SourceThreads\n")));
         }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-MTListenerEval")) == 0)
         {
           arg_shifter.consume_arg ();
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) The -MTListenerEval option has been deprecated, use -DispatchingThreads \n")));
+                      ACE_TEXT ("(%P|%t) The -MTListenerEval option has been deprecated, use -DispatchingThreads\n")));
         }
       else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads"))))
         {
           // Since this option is always added to consumer_threads, we'll
           // deprecate it in favor of that option.
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) The -ListenerThreads option has been deprecated, use -DispatchingThreads \n")));
+                      ACE_TEXT ("(%P|%t) The -ListenerThreads option has been deprecated, use -DispatchingThreads\n")));
           consumer_threads += ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index dd5bd4600a6..e5441d5d6a9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -69,7 +69,7 @@ TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager ()
 {
   if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, "destroying consumer/supplier map count = %d/%d, \n",
+      ACE_DEBUG ((LM_DEBUG, "destroying consumer/supplier map count = %d/%d,\n",
                   this->consumer_map().proxy_count (), this->supplier_map().proxy_count ()));
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 0b98a0a028a..0efb6c66d69 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -100,7 +100,7 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (void)
       if (TAO_debug_level > 0)
         ex._tao_print_exception (
           ACE_TEXT (
-            "TAO_Notify_Method_Request_Dispatch::: error sending event.\n "));
+            "TAO_Notify_Method_Request_Dispatch::: error sending event.\n"));
     }
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
index 1bd9f4641ea..272b3320799 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -26,7 +26,7 @@ TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute
     {
       if (TAO_debug_level > 0)
         ex._tao_print_exception (
-          "TAO_Notify_Method_Request_Updates::execute error sending updates\n ");
+          "TAO_Notify_Method_Request_Updates::execute error sending updates\n");
     }
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 203af4d4e6d..9d5f89873a7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -338,7 +338,7 @@ void TAO::PG_FactoryRegistry::register_factory (
   }
 
   ACE_DEBUG(( LM_DEBUG,
-    "%s: Added factory: [%d] %s@%s \n",
+    "%s: Added factory: [%d] %s@%s\n",
       this->identity_.c_str(),
       static_cast<int> (length + 1),
       role,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index a3d764fce8f..f0ab31d5342 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -228,7 +228,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
   if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("PG (%P|%t) exit Object_Group add_member \n")));
+                  ACE_TEXT("PG (%P|%t) exit Object_Group add_member\n")));
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index f993f934a76..8edd78de92b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -399,7 +399,7 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("TAO (%P|%t) Invalid UIPMC endpoint format: ")
-                                 ACE_TEXT ("endpoint priorities no longer supported. \n"),
+                                 ACE_TEXT ("endpoint priorities no longer supported.\n"),
                                  value.c_str ()),
                                 -1);
             }
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
index db3b608c9ea..be16d03fb37 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
@@ -453,7 +453,7 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
           ACE_ERROR((LM_ERROR,
                    "Error in %s: Line %d - Error in creating "
                    "array to hold lock information "
-                   "ServerScheduler not created\n "
+                   "ServerScheduler not created\n"
                    __FILE__,
                    __LINE__));
           ACE_OS::exit(1);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index f04309b4f70..1d48d7fe276 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -124,7 +124,7 @@ TAO::IIOP_SSL_Connector::make_connection (
   if (TAO_debug_level > 4)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%P|%t) IIOP_SSL_Connector::connect ")
-                ACE_TEXT ("making a new connection \n")));
+                ACE_TEXT ("making a new connection\n")));
 
   // Get the right synch options
   ACE_Synch_Options synch_options;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 7379cbb33c7..2966cb4bc9e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -600,7 +600,7 @@ TAO::SSLIOP::Acceptor::parse_options_i (int &argc, ACE_CString ** argv)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("TAO (%P|%t) Invalid SSLIOP endpoint format: ")
-                             ACE_TEXT ("endpoint priorities no longer supported. \n"),
+                             ACE_TEXT ("endpoint priorities no longer supported.\n"),
                              value.c_str ()),
                             -1);
         }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 68ea93b65d9..54866ce1e73 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -459,7 +459,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
     {
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) Initializing SSLIOP_Endpoint \n")
+                    ACE_TEXT ("TAO (%P|%t) Initializing SSLIOP_Endpoint\n")
                     ));
 
       if (this->base_connector_.creation_strategy ()->make_svc_handler (
@@ -535,7 +535,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
       if (TAO_debug_level > 4)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ")
-                    ACE_TEXT ("making a new connection \n")));
+                    ACE_TEXT ("making a new connection\n")));
 
       // Purge connections (if necessary)
       this->orb_core ()->lane_resources ().transport_cache ().purge ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 5a029427c1c..7da5f41f889 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -248,7 +248,7 @@ TAO::SSLIOP::Transport::set_bidir_context_info (
             {
               ACE_ERROR ((LM_ERROR,
                           "TAO (%P|%t) - SSLIOP_Transport::set_bidir_info, ",
-                          "error getting listen_point \n"));
+                          "error getting listen_point\n"));
               return;
             }
         }
@@ -316,7 +316,7 @@ TAO::SSLIOP::Transport::get_listen_point (
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("(%P|%t) Could not resolve local host")
-                         ACE_TEXT (" name \n")),
+                         ACE_TEXT (" name\n")),
                         -1);
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 0b748403cb5..6424d1b5c05 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -1972,9 +1972,9 @@ ACE_DynScheduler::output_dispatch_priorities (FILE *file)
             "Minimum Critical Priority:         %3d\n\n\n"
 
             "DISPATCH PRIORITIES:\n\n"
-            "                                  (critical              \n"
-            "                                   instant)              \n"
-            "             dispatch              dynamic      static   \n"
+            "                                  (critical             \n"
+            "                                   instant)             \n"
+            "             dispatch              dynamic      static  \n"
             "operation          ID  priority  subpriority  subpriority\n"
             "---------    --------  --------  -----------  -----------\n",
       dispatch_count, threads_, tasks_, status_,
@@ -2170,7 +2170,7 @@ ACE_DynScheduler::output_preemption_timeline (FILE *file)
 {
   if (ACE_OS::fprintf (
         file, "\n\nPREEMPTION TIMELINE:\n\n"
-        "              dispatch     start      stop  \n"
+        "              dispatch     start      stop \n"
         "operation           ID    (nsec)    (nsec)\n"
         "---------  -----------    ------    ------\n") < 0)
   {
@@ -2254,7 +2254,7 @@ ACE_DynScheduler::output_viewer_timeline (FILE *file)
   //FUZZ: disable check_for_lack_ACE_OS
   if (ACE_OS::fprintf (
       file, "\n\nVIEWER TIMELINE:\n\n"
-            "                                    arrival  deadline   completion    execution  \n"
+            "                                    arrival  deadline   completion    execution \n"
             "operation  utilization   overhead    (nsec)    (nsec)  time (nsec)  time (nsec)\n"
             "---------  -----------   --------   -------  --------  -----------  -----------\n") < 0)
   {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 767762cfdfb..e63938825fa 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -2448,7 +2448,7 @@ assign_priorities_i (void)
       RtecScheduler::RT_Info* rt_info_ptr =
         this->entry_ptr_array_[i]->actual_rt_info ();
       ACE_DEBUG ((LM_DEBUG,
-                  " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n ",
+                  " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n",
                   rt_info_ptr->entry_point.in (),
                   rt_info_ptr->handle,
                   rt_info_ptr->criticality,
@@ -2473,7 +2473,7 @@ assign_priorities_i (void)
       RtecScheduler::RT_Info* rt_info_ptr =
         this->entry_ptr_array_[i]->actual_rt_info ();
       ACE_DEBUG ((LM_DEBUG,
-                  " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n ",
+                  " %s [%d] crit=%d,prio=%d,preemption_prio=%d,subprio=%d\n",
                   rt_info_ptr->entry_point.in (),
                   rt_info_ptr->handle,
                   rt_info_ptr->criticality,
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 1ca3d9c6f47..823b31def06 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -251,7 +251,7 @@ static char header[] =
 static char footer[] =
 "\n"
 "// This sets up Scheduler_Factory to use the runtime version.\n"
-"int scheduler_factory_setup = \n"
+"int scheduler_factory_setup =\n"
 "  ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos);\n"
 "\n"
 "// EOF\n";
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
index 1f754d71b06..357e58b3856 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
@@ -36,7 +36,7 @@ RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
           ACE_OS::exit (1);
         }
     } catch (const CORBA::Exception& ex) {
-      ex._tao_print_exception ("Caught an exception \n");
+      ex._tao_print_exception ("Caught an exception\n");
     }
   return intface._retn ();
 }
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,
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
index a6d283a04fd..e9c076a49ea 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
@@ -158,7 +158,7 @@ ClientApp::arg_dependency_checks()
     {
       ACE_ERROR((LM_ERROR,
                  "Error: Required command-line option (-n <client id>).\n"
-                 "       The client id should be positive integer. \n"));
+                 "       The client id should be positive integer.\n"));
       this->usage_statement();
       return -1;
     }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index a4c787de59f..ff17f55bab5 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -975,7 +975,7 @@ Cubit_Client::cube_rti_data (int,
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "Input: \n"));
+                      "Input:\n"));
 
           print_RtiPacket (input);
         }
@@ -992,7 +992,7 @@ Cubit_Client::cube_rti_data (int,
 
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "Output: \n"));
+                      "Output:\n"));
 
           print_RtiPacket (*vout.ptr ());
 
@@ -1045,7 +1045,7 @@ Cubit_Client::cube_any (int i)
       if (arg_long != ret_long)
         {
           ACE_ERROR ((LM_ERROR,
-                      "** cube_any(%d)  ERROR (got %d, expect %d) \n",
+                      "** cube_any(%d)  ERROR (got %d, expect %d)\n",
                       (CORBA::Long) this->func (i),
                       ret_long, arg_long));
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index eaf8a8140f2..ae8fce95a5b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -360,7 +360,7 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
   if (TAO_debug_level > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Input: \n"));
+                  "Input:\n"));
       print_RtiPacket (input);
     }
 
@@ -375,7 +375,7 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
   if (TAO_debug_level > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Output: \n"));
+                  "Output:\n"));
       print_RtiPacket (*output.ptr ());
     }
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
index e94b583dd38..9a208bc2eea 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
@@ -6,7 +6,7 @@
 void
 print_RtiPacket (Cubit::RtiPacket const &arg)
 {
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "packetHeader.packetLength %d\n"
               "packetHeader.federationHandle %d\n"
               "packetHeader.channelHandle %d\n"
@@ -16,7 +16,7 @@ print_RtiPacket (Cubit::RtiPacket const &arg)
               arg.packetHeader.channelHandle,
               arg.packetHeader.packetColor));
 
-  for (CORBA::ULong j = 0; j < arg.msgs.length (); ++j) 
+  for (CORBA::ULong j = 0; j < arg.msgs.length (); ++j)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "* message * %d\n",
@@ -25,12 +25,12 @@ print_RtiPacket (Cubit::RtiPacket const &arg)
       Cubit::RtiObjectUpdateMessageHeader const &oumh = arg.msgs[j].oumh ();
 
       ACE_DEBUG ((LM_DEBUG,
-                  "\tupdateLength: %d\n" 
+                  "\tupdateLength: %d\n"
                   "\tupdateTag: %d\n"
-                  "\tobjectHandle: %d\n" 
+                  "\tobjectHandle: %d\n"
                   "\ttimestamp: %f\n"
-                  //"\teventRetractionHandle: \n"
-                  "\tclassHandle: %d\n" 
+                  //"\teventRetractionHandle:\n"
+                  "\tclassHandle: %d\n"
                   "\tsendingFederateHandle: %d\n"
                   "\tuserTag: %s\n"
                   "\ttransportationHandle: %x\n"
@@ -46,7 +46,7 @@ print_RtiPacket (Cubit::RtiPacket const &arg)
                   oumh.transportationHandle,
                   oumh.orderingHandle));
 
-      for (CORBA::ULong k = 0; k < oumh.messagePayload.length (); ++k) 
+      for (CORBA::ULong k = 0; k < oumh.messagePayload.length (); ++k)
         {
           Cubit::HandleValuePair const & hvp=oumh.messagePayload[k];
           ACE_DEBUG ((LM_DEBUG, "\t\thandle: %d\n", hvp.handle));
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 664254a8b1e..3ce978c9347 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -61,7 +61,7 @@ Globals::parse_args (int argc, ACE_TCHAR *argv[])
                            "[-t <number_of_servants>]      // # of servant threads to create     \n\t\t\t"
                            "[-f <ior_file> ]               // specify a file to output all ior's \n\t\t\t"
                            "[-m ]                          // Use multiple priorities for threads\n\t\t\t"
-                           "[-r ]                          // Run the thread-per-rate test       \n"
+                           "[-r ]                          // Run the thread-per-rate test      \n"
                            ,argv [0]),
                           -1);
       }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index b135c758168..1c210efa808 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -144,7 +144,7 @@ Task_State::parse_args (int argc,ACE_TCHAR *argv[])
                   "[-g <granularity>]     // choose the granularity of the timing of CORBA calls                      \n\t\t\t"
                   "[-c]                   // run the number of context switches test.                                 \n\t\t\t"
                   "[-l]                   // use direct function calls, as opposed to CORBA requests.  ONLY to be used with -u option.\n\t\t\t"
-                  "[-m]                   // use multiple priorities for the low priority clients.                    \n"
+                  "[-m]                   // use multiple priorities for the low priority clients.                   \n"
                   ,argv [0]));
       return -1;
     }
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
index 9dadc696535..bc96aa14c43 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
@@ -20,12 +20,12 @@ Memory_Growth::send_objref (const Test::PayLoad & /*p*/
   ACE_Manual_Event me;
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Going to wait .. \n"));
+              "(%P|%t) Going to wait ..\n"));
 
   me.wait ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Wokeup from wait .. \n"));
+              "(%P|%t) Wokeup from wait ..\n"));
   return;
 }
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 5472b29e5f1..986c3735279 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -129,7 +129,7 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
       if (this->use_user_id_)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "Using the USER_ID policy ... \n"));
+                      "Using the USER_ID policy ...\n"));
 
           policies[0] =
             this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
@@ -137,7 +137,7 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
       else
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "Using the SYSTEM_ID policy ... \n"));
+                      "Using the SYSTEM_ID policy ...\n"));
 
           policies[0] =
             this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID);
@@ -411,7 +411,7 @@ Demux_Test_Server::init_naming_service (void)
   if (this->my_name_client_.init (this->orb_.in ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to initialize "
-                       "the ACE_Naming_Client. \n"),
+                       "the ACE_Naming_Client.\n"),
                       -1);
 
   // success
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index 22b55b519ca..e723a7ad997 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -128,10 +128,10 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time)
       double tmp = 1000 / elapsed_time.real_time;
 
       ACE_DEBUG ((LM_DEBUG,
-                  "\titerations\t = %d, \n"
-                  "\treal_time\t = %0.06f ms, \n"
-                  "\tuser_time\t = %0.06f ms, \n"
-                  "\tsystem_time\t = %0.06f ms, \n"
+                  "\titerations\t = %d,\n"
+                  "\treal_time\t = %0.06f ms,\n"
+                  "\tuser_time\t = %0.06f ms,\n"
+                  "\tsystem_time\t = %0.06f ms,\n"
                   "\t%0.00f calls/second\n",
                   iterations,
                   elapsed_time.real_time   < 0.0 ? 0.0 : elapsed_time.real_time,
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index a064804316a..11460b69f09 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -244,7 +244,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) SHMIOP_Profile::parse_string () - \n")
+                      ACE_TEXT ("TAO (%P|%t) SHMIOP_Profile::parse_string () -\n")
                       ACE_TEXT ("TAO (%P|%t) ACE_INET_Addr::set () failed")));
         }
 
diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp
index 26f92dc5d37..20992fef308 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Synch_Reply_Dispatcher.cpp
@@ -87,7 +87,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (
   {
     // Data block is on the heap, so just duplicate it.
     this->reply_cdr_ = *params.input_cdr_;
-    this->reply_cdr_.clr_mb_flags( ACE_Message_Block::DONT_DELETE );
+    this->reply_cdr_.clr_mb_flags (ACE_Message_Block::DONT_DELETE);
   }
   else
   {
diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h
index 1a464fa7559..94d9e139dba 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.h
+++ b/TAO/tao/Synch_Reply_Dispatcher.h
@@ -81,7 +81,7 @@ private:
   /// The buffer that is used to initialise the data block
   char buf_[ACE_CDR::DEFAULT_BUFSIZE];
 
-  /// datablock that is created on teh stack to initialise the CDR
+  /// Datablock that is created on the stack to initialise the CDR
   /// stream underneath.
   ACE_Data_Block db_;
 
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index 65159a31c69..4d9c205610b 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -101,7 +101,7 @@ namespace TAO
 
     if ((this->transport_->opened_as () == TAO::TAO_CLIENT_ROLE) &&
         (this->transport_->bidirectional_flag () == 0) &&
-        (tss->upcalls_temporarily_suspended_on_this_thread_ == true))
+        (tss->upcalls_temporarily_suspended_on_this_thread_))
       return false;
 
     return true;
diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp
index a161b873df5..e9106a3608e 100644
--- a/TAO/tests/AMH_Oneway/client.cpp
+++ b/TAO/tests/AMH_Oneway/client.cpp
@@ -58,7 +58,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         {
           roundtrip->test_method (time);
 
-          ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i));
+          ACE_DEBUG ((LM_DEBUG, "Sent call # %d\n", i));
         }
       orb->destroy();
       // The following sleep is a workaround for a defect in the Windows
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index f2fdd14ffbd..972b6230df0 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -58,7 +58,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
                            "-d "
-                           "-c"
                            "-k <ior> "
                            "-n <nthreads> "
                            "-i <niterations> "
@@ -129,7 +128,7 @@ public:
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <foo_excep> called: \n"));
+                  "Callback method <foo_excep> called:\n"));
       try
         {
           excep_holder->raise_exception ();
@@ -150,19 +149,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)
   {
@@ -171,7 +170,7 @@ public:
   void inout_arg_test (const char *)
   {
     ACE_DEBUG ((LM_DEBUG,
-                "Callback method <set_yadda_excep> called: \n"));
+                "Callback method <set_yadda_excep> called:\n"));
   }
 
   void inout_arg_test_excep (::Messaging::ExceptionHolder *)
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index d30f6cee7a8..a3c35d1c91d 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -104,7 +104,7 @@ public:
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <foo_excep> called: \n"
+                  "Callback method <foo_excep> called:\n"
                   "Testing proper exception handling ...\n"));
       try
         {
@@ -148,19 +148,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"));
     };
 
   void inout_arg_test (
@@ -168,7 +168,7 @@ public:
       )
   {
     ACE_DEBUG ((LM_DEBUG,
-                "Callback method <set_yadda_excep> called: \n"));
+                "Callback method <set_yadda_excep> called:\n"));
   }
 
   void inout_arg_test_excep (::Messaging::ExceptionHolder *)
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index 8660e7678a1..a9b91dcda89 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -82,7 +82,7 @@ dump_node (BaseNode* bn, int indent)
       else
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "%x <BaseNode> \n",
+                      "%x <BaseNode>\n",
                       bn));
         }
     }
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index a5679c92250..1759a635cfc 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/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/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
index 8c5391e8782..5e87948297e 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/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"));
 }
 
 
@@ -36,7 +36,7 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &,
 {
   if (TAO_debug_level > 0)
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("About to make a remote call in the Upcall \n")));
+              ACE_TEXT ("About to make a remote call in the Upcall\n")));
 
   for (int times = 0;
         times < this->no_iterations_;
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index 038cf606fbd..776ec609487 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -23,7 +23,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"));
 }
 
 
@@ -36,7 +36,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback)
     {
       if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("About to make a remote call in the Upcall \n")));
+                  ACE_TEXT ("About to make a remote call in the Upcall\n")));
 
       for (int times = 0;
            times < this->no_iterations_;
diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index a5d4ba5ad5f..a8b4332aed0 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -101,7 +101,7 @@ public:
       ++reply_count_;
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <foo_excep> called: \n"
+                  "Callback method <foo_excep> called:\n"
                                   "Testing proper exception handling ...\n"));
       try
         {
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 5930ef0261a..e9c9f4d4c88 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -177,7 +177,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       ACE_DEBUG ((LM_DEBUG ,"done\n"));
-      ACE_DEBUG ((LM_DEBUG, "Waiting for sessions to finish. . . \n"));
+      ACE_DEBUG ((LM_DEBUG, "Waiting for sessions to finish. . .\n"));
       for (int k = 0;
            k != 300 && !session_control_impl->all_sessions_finished ();
            ++k)
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index 88fa53c56a0..a65ee6f0295 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -191,7 +191,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           return 1;
         }
 
-      ACE_DEBUG ((LM_DEBUG, "All sessions finished . . . \n"));
+      ACE_DEBUG ((LM_DEBUG, "All sessions finished . . .\n"));
 
       for (j = 0; j != peer_count; ++j)
         {
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index 897dc94f960..5e353e9c229 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -23,7 +23,7 @@ Thread_Pool::Thread_Pool (ACE_Thread_Manager *thr_mgr,
                       n_threads) == -1)
     ACE_ERROR ((LM_ERROR,
                 "%p\n",
-                "activate failed \n"));
+                "activate failed\n"));
 }
 
 Thread_Pool::~Thread_Pool (void)
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index a7a6aaa7236..74d01c679a9 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -24,7 +24,7 @@ Reply_Handler::next_prime_excep (
   catch (const CORBA::COMM_FAILURE& )
     {
       /*ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <next_prime_excep> called: \n"));
+                  "Callback method <next_prime_excep> called:\n"));
                   */
 
       ACE_Time_Value tv (10, 0);
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
index 25ad9f957ff..b5d44d45c54 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
@@ -38,7 +38,7 @@ Server_Task::svc (void)
       if (CORBA::is_nil (poa_object.in ()))
         {
           ACE_ERROR ((LM_ERROR,
-                      " (%P|%t) Unable to initialize the POA \n"));
+                      " (%P|%t) Unable to initialize the POA\n"));
           return 1;
         }
 
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
index 8f71c9889fb..3cc9f9e1099 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
@@ -70,7 +70,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (CORBA::is_nil (poa_object.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             " (%P|%t) Unable to initialize the POA. \n" ),
+                             " (%P|%t) Unable to initialize the POA.\n" ),
                              1);
         }
 
@@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         {
           ACE_ERROR_RETURN ((LM_ERROR,
             "(%P|%t) Could not obtain reference to "
-            "server request interceptor. \n"),
+            "server request interceptor.\n"),
             -1);
         }
 
@@ -105,7 +105,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (CORBA::is_nil (forward_location.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil \n",
+                             "Object reference <%s> is nil\n",
                              ior_input_file),
                              1);
         }
@@ -152,7 +152,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           ACE_ERROR ((LM_ERROR, "ERROR: Forward location has not occured!\n"));
         }
 
-      ACE_DEBUG ((LM_DEBUG, "Threaded Server event loop finished \n"));
+      ACE_DEBUG ((LM_DEBUG, "Threaded Server event loop finished\n"));
       root_poa->destroy (1, 1);
 
       orb->destroy ();
diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
index 8c524bf9f41..d5147c7eb47 100644
--- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -59,7 +59,7 @@ test_create_object_before_servant_reactivation (
   if (CORBA::is_nil (object.in ()))
     {
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) nil reference in create_reference_with_id \n"));
+                  "(%P|%t) nil reference in create_reference_with_id\n"));
 
       return;
     }
@@ -83,7 +83,7 @@ test_create_object_before_servant_reactivation (
   if(CORBA::is_nil (object.in ()))
     {
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) nil reference in string_to_object (servant reactivation) \n"));
+                  "(%P|%t) nil reference in string_to_object (servant reactivation)\n"));
       return;
     }
 
@@ -113,7 +113,7 @@ test_create_object_before_POA_reactivation(
   if (CORBA::is_nil (object.in ()))
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) nil reference in create_reference_with_id \n"));
+                  "(%P|%t) nil reference in create_reference_with_id\n"));
       return;
     }
 
@@ -130,7 +130,7 @@ test_create_object_before_POA_reactivation(
   if (CORBA::is_nil (object.in ()))
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) nil reference in string_to_object (POA reactivation) \n"));
+                  "(%P|%t) nil reference in string_to_object (POA reactivation)\n"));
 
       return;
     }
@@ -213,7 +213,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Caught a CORBA exception \n");
+      ex._tao_print_exception ("Caught a CORBA exception\n");
       return 1;
     }
   catch (...)
diff --git a/TAO/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp
index a7afff47008..6415ed9e0be 100644
--- a/TAO/tests/Bug_1693_Test/client.cpp
+++ b/TAO/tests/Bug_1693_Test/client.cpp
@@ -67,13 +67,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         if (check != l)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "ERROR: Extracted value not equal "
-                             "to the encoded value \n"),
+                             "to the encoded value\n"),
                             -1);
 
       }
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Test passed \n"));
+                  "(%P|%t) Test passed\n"));
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp
index e776306b641..1795e201f6a 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2186_Regression/Hello.cpp
@@ -34,7 +34,7 @@ Hello::request_callback (Test::Hello_ptr call_me)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "Exception attempting to callback client obj ref: \n");
+        "Exception attempting to callback client obj ref:\n");
       throw;
     }
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Call back succeeded !!!\n"));
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index 4edf0a6103f..5b8c5527390 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -114,7 +114,7 @@ void
 ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr,
                              Test::Timestamp)
 {
-  ACE_OS::printf("Recieved Timestamp # %d \n", calls_received);
+  ACE_OS::printf("Recieved Timestamp # %d\n", calls_received);
   ACE_OS::sleep(1);
   ++calls_received;
 
@@ -270,7 +270,7 @@ static ACE_THR_FUNC_RETURN start_client(void* _arg)
   for (int i = 0; i < num_calls; i++)
     {
       roundtrip->test_method(time);
-      ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i));
+      ACE_DEBUG ((LM_DEBUG, "Sent call # %d\n", i));
     }
 
   return 0;
diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp
index 6c8b5a4b771..a6441e24e56 100644
--- a/TAO/tests/Bug_2356_Regression/client.cpp
+++ b/TAO/tests/Bug_2356_Regression/client.cpp
@@ -74,7 +74,7 @@ public:
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <foo_excep> called: \n"
+                  "Callback method <foo_excep> called:\n"
                   "Testing proper exception handling ...\n"));
       try
         {
diff --git a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
index 9cfd441ad82..7485773f3ef 100644
--- a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
+++ b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
@@ -31,7 +31,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Caught a CORBA exception \n");
+      ex._tao_print_exception ("Caught a CORBA exception\n");
       return 1;
     }
   catch (...)
diff --git a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
index 994a321e912..ba1e926aa44 100644
--- a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
+++ b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
@@ -56,7 +56,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
      }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Caught a CORBA exception \n");
+      ex._tao_print_exception ("Caught a CORBA exception\n");
       return 1;
     }
   catch (...)
diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp
index d99b2077260..c6bafdf411d 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2654_Regression/Hello.cpp
@@ -33,7 +33,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 void
 Hello::set_callback (Test::CallBack_ptr cb)
 {
-  ACE_DEBUG ((LM_DEBUG,"(%P|%t) got callback \n"));
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t) got callback\n"));
   this->callback_ = Test::CallBack::_duplicate(cb);
   this->callback_->method2();
 }
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index 2657001e5b4..45b9238c353 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -105,7 +105,7 @@ Worker::svc()
         {
           excep = true;
           ACE_ERROR ((LM_ERROR,
-                      "(%t) Exception caught: %s after %d invocations \n",
+                      "(%t) Exception caught: %s after %d invocations\n",
                       ex._name(), i));
           i = 39;
         }
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index 5b9a07d517d..de8846a7d5c 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -41,7 +41,7 @@ public:
             target->ping();
             if (this->do_shutdown_)
               {
-                ACE_DEBUG ((LM_DEBUG,"(%P|%t) Calling shutdown \n"));
+                ACE_DEBUG ((LM_DEBUG,"(%P|%t) Calling shutdown\n"));
                 this->do_shutdown_ = false;
                 target->shutdown ();
               }
diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp
index 4b4cdfae441..c5fad9a50c5 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2683_Regression/test_i.cpp
@@ -18,7 +18,7 @@ test_i::ping (void)
 void
 test_i::shutdown (void)
 {
-  ACE_DEBUG ((LM_DEBUG,"(%P|%t) requesting shutdown \n"));
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t) requesting shutdown\n"));
   this->killer_->activate ();
 }
 
@@ -32,7 +32,7 @@ int
 ORB_Killer::svc ()
 {
   ACE_OS::sleep (1);
-  ACE_DEBUG ((LM_DEBUG,"(%P|%t) doing shutdown \n"));
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t) doing shutdown\n"));
   orb_->shutdown(1);
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) shutdown complete\n"));
   return 0;
diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp
index 845d502273d..1a7b0b03208 100644
--- a/TAO/tests/Bug_2805_Regression/client.cpp
+++ b/TAO/tests/Bug_2805_Regression/client.cpp
@@ -132,7 +132,7 @@ public:
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <foo_excep> called: \n"));
+                  "Callback method <foo_excep> called:\n"));
       try
         {
           excep_holder->raise_exception ();
@@ -153,19 +153,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)
   {
@@ -174,7 +174,7 @@ public:
   void inout_arg_test (const char *)
   {
     ACE_DEBUG ((LM_DEBUG,
-                "Callback method <set_yadda_excep> called: \n"));
+                "Callback method <set_yadda_excep> called:\n"));
   }
 
   void inout_arg_test_excep (::Messaging::ExceptionHolder *)
diff --git a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
index 84e46e61156..955ef36251f 100644
--- a/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
+++ b/TAO/tests/Bug_2826_Regression/bug_2826_regression.cpp
@@ -14,7 +14,7 @@ class Foo_i : public virtual POA_foo
 public:
   virtual void check ()
   {
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) checking \n"));
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) checking\n"));
   }
 };
 
diff --git a/TAO/tests/Bug_3068_Regression/client.cpp b/TAO/tests/Bug_3068_Regression/client.cpp
index ba6e64b1b1e..c61101acf34 100644
--- a/TAO/tests/Bug_3068_Regression/client.cpp
+++ b/TAO/tests/Bug_3068_Regression/client.cpp
@@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
       case '?':
       default:
-        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s -k <ior> \n"),
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s -k <ior>\n"),
                            argv [0]), -1);
       }
   // Indicates sucessful parsing of the command line
diff --git a/TAO/tests/Bug_3276_Regression/test_i.cpp b/TAO/tests/Bug_3276_Regression/test_i.cpp
index 1e80fe881e7..adfc0cca40e 100644
--- a/TAO/tests/Bug_3276_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3276_Regression/test_i.cpp
@@ -12,13 +12,13 @@ void
 Simple_Server_i::remote_call ()
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Print out from process id (%P) hosting the servant \n"));
+              "Print out from process id (%P) hosting the servant\n"));
 }
 
 void
 Simple_Server_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Servant in process id (%P) received shutdown request. Complying... \n"));
+              "Servant in process id (%P) received shutdown request. Complying...\n"));
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
index 905ef9a78c6..5ea95176562 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_Client.cpp
@@ -9,8 +9,6 @@
 
 unsigned char Msg[1000] = { 0 } ;
 
-const ACE_TCHAR *iorFile = ACE_TEXT("file://gazza.ior");
-
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
@@ -21,14 +19,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Use a simple ObjectKey to access the Stock Quoter.
     // (Client ORB must be initialized with
     // -ORBInitRef MyStockQuoter=corbaloc:...)
+    CORBA::Object_var udp_obj =
+      orb->resolve_initial_references ("UDPTest");
+
     CORBA::Object_var stock_quoter_obj =
       orb->resolve_initial_references ("MyStockQuoter");
 
-    CORBA::Object_var object = orb->string_to_object (iorFile);
-    UDPTestI_var server = UDPTestI::_narrow (object.in ());
+    UDPTestI_var server = UDPTestI::_narrow (udp_obj.in ());
 
-    // Narrow the reference to the Stock_Quoter interface
-    //UDPTestI_var UDP = UDPTestI::_narrow (UDP_obj.in());
     Stock_Quoter_var quoter = Stock_Quoter::_narrow (stock_quoter_obj.in());
 
     memset( Msg, 1, 1000 ) ;
diff --git a/TAO/tests/Bug_3547_Regression/run_test.pl b/TAO/tests/Bug_3547_Regression/run_test.pl
index a4de8339dc4..9834efd7eb7 100755
--- a/TAO/tests/Bug_3547_Regression/run_test.pl
+++ b/TAO/tests/Bug_3547_Regression/run_test.pl
@@ -12,7 +12,7 @@ $status = 0;
 
 $SV = new PerlACE::Process ("server", "-ORBListenEndpoints iiop://:4177;diop://:15177");
 
-$CL = new PerlACE::Process ("client", "-ORBInitRef UDPTest=corbaloc:diop::15177/UDPTest -ORBDefaultInitRef corbaloc:iiop::4177");
+$CL = new PerlACE::Process ("client", "-ORBInitRef UDPTest=corbaloc:diop:localhost:15177/UDPTest -ORBDefaultInitRef corbaloc:iiop:localhost:4177 -ORBDebugLevel 10");
 
 $server = $SV->Spawn ();
 
diff --git a/TAO/tests/Bug_3558_Regression/client.cpp b/TAO/tests/Bug_3558_Regression/client.cpp
index cba717c0c77..9173e7bf9c5 100644
--- a/TAO/tests/Bug_3558_Regression/client.cpp
+++ b/TAO/tests/Bug_3558_Regression/client.cpp
@@ -197,7 +197,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       for (int i = 0; i < argc; i++)
         largv[i] = argv[i];
 
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%D client adding args: \n")));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%D client adding args:\n")));
       for (int i = 0; i < extra_argc; i++)
         {
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\t\t%s\n"), extra[i]));
diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp
index add8c04ba9c..37bdddd9a43 100644
--- a/TAO/tests/Bug_3567_Regression/client.cpp
+++ b/TAO/tests/Bug_3567_Regression/client.cpp
@@ -142,7 +142,7 @@ public:
                       result,
                       out_l));
         }
-      ACE_OS::sleep (1);        
+      ACE_OS::sleep (1);
       ami_test_var_->sendc_set_yadda (0, 5);
 
       --number_of_replies;
@@ -152,7 +152,7 @@ public:
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Callback method <foo_excep> called: \n"));
+                  "Callback method <foo_excep> called:\n"));
       try
         {
           excep_holder->raise_exception ();
@@ -173,19 +173,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)
   {
@@ -194,7 +194,7 @@ public:
   void inout_arg_test (const char *)
   {
     ACE_DEBUG ((LM_DEBUG,
-                "Callback method <set_yadda_excep> called: \n"));
+                "Callback method <set_yadda_excep> called:\n"));
   }
 
   void inout_arg_test_excep (::Messaging::ExceptionHolder *)
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index a0e1259d4c8..6064e05ece0 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -197,13 +197,13 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
             }
           else
             ACE_ERROR_RETURN ((LM_ERROR,
-                               "Any did not receive a short [%d] \n",
+                               "Any did not receive a short [%d]\n",
                                i),
                               1);
         }
       else
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Any decode failed [%d] \n",
+                           "Any decode failed [%d]\n",
                            i),
                           1);
     }
@@ -259,9 +259,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                 TAO_InputCDR input (output);
                 if (TAO_debug_level > 0)
                   {
-                    ACE_DEBUG ((LM_DEBUG, "Output CDR: \n"));
+                    ACE_DEBUG ((LM_DEBUG, "Output CDR:\n"));
                     ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64));
-                    ACE_DEBUG ((LM_DEBUG, "Input CDR: \n"));
+                    ACE_DEBUG ((LM_DEBUG, "Input CDR:\n"));
                     ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64));
                   }
 
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index 38cc37de3d4..f1bfd44f74a 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -257,8 +257,8 @@ ClientApp::arg_dependency_checks()
   if (this->client_id_ <= 0)
     {
       ACE_ERROR((LM_ERROR,
-                 "Error: Invalid command-line option (-n <client id>). \n"
-                 "       The client id should be positive integer. \n"));
+                 "Error: Invalid command-line option (-n <client id>).\n"
+                 "       The client id should be positive integer.\n"));
       this->usage_statement();
       return -1;
     }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
index 5bd3e2fd165..738af1ea9df 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
@@ -98,7 +98,7 @@ ServantList<T>::deactivate(PortableServer::POA_ptr poa)
   catch (...)
   {
     ACE_ERROR((LM_ERROR, "(%P|%t)ServantList_T::deactivate_servant "
-    "Caught unknown exception \n"));
+    "Caught unknown exception\n"));
   }
 }
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
index 6cf19e95125..2db50ba7eb8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
@@ -5,7 +5,7 @@
 extern const char* ONEWAY_ARG_TEST_STR;
 extern CORBA::Boolean special_value;
 
-Foo_B_Statistics::Foo_B_Statistics(unsigned num_remote_clients, 
+Foo_B_Statistics::Foo_B_Statistics(unsigned num_remote_clients,
                                    unsigned num_collcated_clients)
 : num_clients_ (num_remote_clients + num_collcated_clients),
   num_collcated_clients_ (num_collcated_clients),
@@ -63,14 +63,14 @@ Foo_B_Statistics::actual(unsigned op_num, StringVector sv)
 }
 
 
-void 
+void
 Foo_B_Statistics::expected_callbacks (unsigned num_cbs)
 {
   expected_callbacks_ = num_cbs * this->num_collcated_clients_;
 }
 
 
-void 
+void
 Foo_B_Statistics::actual_callbacks (unsigned num_cbs)
 {
   actual_callbacks_ += num_cbs;
@@ -94,7 +94,7 @@ Foo_B_Statistics::actual_vs_expected()
     {
       ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
         "servant_error_count_=%u\n", servant_error_count_));
-      if (ret) 
+      if (ret)
         ret = false;
     }
 
@@ -103,9 +103,9 @@ Foo_B_Statistics::actual_vs_expected()
   if (actual_callbacks_ != expected_callbacks_)
     {
       ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-        "actual_callbacks_=%u expected_callbacks_=%u \n", 
+        "actual_callbacks_=%u expected_callbacks_=%u\n",
         actual_callbacks_, expected_callbacks_));
-      if (ret) 
+      if (ret)
         ret = false;
     }
 
@@ -115,9 +115,9 @@ Foo_B_Statistics::actual_vs_expected()
       if (this->expected_op_count_[z] != this->actual_op_count_[z])
         {
           ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-            "expected_op_count_[%u]=%u actual_op_count_[%u]=%u \n", 
+            "expected_op_count_[%u]=%u actual_op_count_[%u]=%u\n",
             z, expected_op_count_[z], z, actual_op_count_[z]));
-          if (ret) 
+          if (ret)
             ret = false;
         }
     }
@@ -131,15 +131,15 @@ Foo_B_Statistics::actual_vs_expected()
       {
         case FOO_B_STAT_LONG:
           {
-            unsigned actual_size 
+            unsigned actual_size
               = this->actual_in_long_[i].size ();
-            unsigned expected_size 
+            unsigned expected_size
               = this->num_clients_ * stats.expected_op_count_[i];
             if (actual_size != expected_size)
               {
                 ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
                   "actual_size=%u expected_size=%u\n", actual_size, expected_size));
-                if (ret) 
+                if (ret)
                   ret = false;
               }
             sort (this->actual_in_long_[i]);
@@ -149,9 +149,9 @@ Foo_B_Statistics::actual_vs_expected()
                 if (this->actual_in_long_[i][j] != this->actual_in_long_[i][j + 1] - 1)
                   {
                     ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-                      "actual_in_long_[%u][%u]=%d actual_in_long_[%u][%u]=%d\n", 
+                      "actual_in_long_[%u][%u]=%d actual_in_long_[%u][%u]=%d\n",
                       i, j, actual_in_long_[i][j], i, j+1, actual_in_long_[i][j + 1]));
-                    if (ret) 
+                    if (ret)
                       ret = false;
                   }
               }
@@ -160,15 +160,15 @@ Foo_B_Statistics::actual_vs_expected()
 
         case FOO_B_STAT_STRING:
           {
-            unsigned actual_size 
+            unsigned actual_size
               = this->actual_in_string_[i].size ();
-            unsigned expected_size 
+            unsigned expected_size
               = this->num_clients_ * stats.expected_op_count_[i];
             if (actual_size != expected_size)
               {
                 ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
                   "actual_size=%u expected_size=%u\n", actual_size, expected_size));
-                if (ret) 
+                if (ret)
                   ret = false;
               }
 
@@ -182,9 +182,9 @@ Foo_B_Statistics::actual_vs_expected()
                 if (ACE_OS::strcmp (buffer, ONEWAY_ARG_TEST_STR) != 0)
                   {
                     ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-                      "actual_in_string_[%u][%u]=%s \n", 
+                      "actual_in_string_[%u][%u]=%s\n",
                       i, k, actual_in_string_[i][k].c_str()));
-                    if (ret) 
+                    if (ret)
                       ret = false;
                   }
                 lvec.push_back (client_id);
@@ -197,21 +197,21 @@ Foo_B_Statistics::actual_vs_expected()
                 if (lvec[j] != lvec[j + 1] - 1)
                   {
                     ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-                      "lvec[%u]=%d lvec[%u]=%d\n", 
+                      "lvec[%u]=%d lvec[%u]=%d\n",
                       j, lvec[j], j+1, lvec[j + 1]));
-                    if (ret) 
+                    if (ret)
                       ret = false;
                   }
               }
           }
           break;
-        
+
         case FOO_B_STAT_NONE:
         default:
           break;
       }
-         
-    }   
+
+    }
 
   return ret;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 730d8f2e922..6cd944f8473 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -181,11 +181,11 @@ Foo_B_i::test_var_array_arg(const Var_Array messages)
 {
   this->op_count_[13] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ")
-  //                     ACE_TEXT(" %s \n"), messages[0].in ()));
+  //                     ACE_TEXT(" %s\n"), messages[0].in ()));
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ")
-  //                     ACE_TEXT(" %s \n"), messages[1].in ()));
+  //                     ACE_TEXT(" %s\n"), messages[1].in ()));
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ")
-  //                     ACE_TEXT(" %s \n"), messages[2].in ()));
+  //                     ACE_TEXT(" %s\n"), messages[2].in ()));
   unsigned cur_client_id = 0;
 
   for (unsigned i = 0 ; i < 3; i ++)
@@ -224,7 +224,7 @@ Foo_B_i::test_special_basic_arg(CORBA::Boolean value,
 {
   this->op_count_[14] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_special_basic_arg ")
-  //                     ACE_TEXT(" got special basic arg: %d \n"), value));
+  //                     ACE_TEXT(" got special basic arg: %d\n"), value));
 
   CORBA::Boolean expected_special_value = client_id % 2;
   if (expected_special_value != value)
@@ -243,7 +243,7 @@ Foo_B_i::test_objref_arg(Callback_ptr cb)
   ACE_UNUSED_ARG(cb);
   this->op_count_[15] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_objref_arg ")
-  //                     ACE_TEXT(" got callback object. \n")));
+  //                     ACE_TEXT(" got callback object.\n")));
 }
 
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index 4ebb3c385ef..21b94144ddd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -154,8 +154,8 @@ ClientApp::arg_dependency_checks()
   if (this->client_id_ <= 0)
     {
       ACE_ERROR((LM_ERROR,
-                 "Error: Invalid command-line option (-n <client id>). \n"
-                 "       The client id should be positive integer. \n"));
+                 "Error: Invalid command-line option (-n <client id>).\n"
+                 "       The client id should be positive integer.\n"));
       this->usage_statement();
       return -1;
     }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index 6238c5a253c..c5df1f5b733 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -255,8 +255,8 @@ ClientApp::arg_dependency_checks()
   if (this->client_id_ <= 0)
     {
       ACE_ERROR((LM_ERROR,
-                 "Error: Invalid command-line option (-n <client id>). \n"
-                 "       The client id should be positive integer. \n"));
+                 "Error: Invalid command-line option (-n <client id>).\n"
+                 "       The client id should be positive integer.\n"));
       this->usage_statement();
       return -1;
     }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index 02e5f8d531e..d2b3b5b90a8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -157,8 +157,8 @@ ClientApp::arg_dependency_checks()
   if (this->client_id_ <= 0)
     {
       ACE_ERROR((LM_ERROR,
-                 "Error: Invalid command-line option (-n <client id>). \n"
-                 "       The client id should be positive integer. \n"));
+                 "Error: Invalid command-line option (-n <client id>).\n"
+                 "       The client id should be positive integer.\n"));
       this->usage_statement();
       return -1;
     }
diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp
index e574f52ba2f..535e7632c0d 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.cpp
+++ b/TAO/tests/Cache_Growth_Test/Hello.cpp
@@ -19,7 +19,7 @@ Hello::get_string (void)
   if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
     {
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) The size is growing \n"));
+                  "(%P|%t) The size is growing\n"));
     }
 
   return CORBA::string_dup ("Hello there!");
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
index 405fce98fc4..8d4f66f76ca 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
@@ -90,7 +90,7 @@ Client_Task::svc (void)
 
       hello->onewayTest();
 
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - returned from onewayTest() call \n"));
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - returned from onewayTest() call\n"));
 
       hello->shutdown ();
     }
diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp
index 77c2900b9bc..81e0bae0828 100644
--- a/TAO/tests/Connection_Timeout/client.cpp
+++ b/TAO/tests/Connection_Timeout/client.cpp
@@ -84,13 +84,13 @@ test_timeout (CORBA::Object_ptr object)
       if (el.real_time > 0.200)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%P|%t) ERROR: Too long to timeout: %F \n",
+                             "(%P|%t) ERROR: Too long to timeout: %F\n",
                              el.real_time),
                              1);
         }
       else
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Success, timeout: %F \n",
+                    "(%P|%t) Success, timeout: %F\n",
                     el.real_time));
     }
 
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index 80580ae7033..511d85e87d2 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -19,7 +19,7 @@ void
 Crashed_Callback::crash_now_please (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Crashed_Callback - crashing application \n"));
+              "(%P|%t) Crashed_Callback - crashing application\n"));
 // Tru64 seems to hang and not abort and dump core when abort() is called
 // here. This needs further investigation. This fix is a temporary one.
 // Likewise for OpenVMS.
diff --git a/TAO/tests/DII_AMI_Forward/client.cpp b/TAO/tests/DII_AMI_Forward/client.cpp
index 6077ffc9852..44aa03178cc 100644
--- a/TAO/tests/DII_AMI_Forward/client.cpp
+++ b/TAO/tests/DII_AMI_Forward/client.cpp
@@ -84,7 +84,7 @@ do_primary_test (CORBA::Object_var &server,
 int do_shutdown_test (CORBA::Object_var &server)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "[client] invoking shutdown on the server \n "));
+              "[client] invoking shutdown on the server \n"));
   try
     {
       CORBA::Request_var req = server->_request("shutdown");
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
index a71f7e39973..f202d38bda6 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
@@ -220,7 +220,7 @@ Client_Task::svc (void)
   catch (...)
     {
       error_count_ ++;
-      ACE_ERROR ((LM_ERROR, "(%P|%t)Client_Task::svc - caught unknown exception \n"));
+      ACE_ERROR ((LM_ERROR, "(%P|%t)Client_Task::svc - caught unknown exception\n"));
       return 1;
     }
 
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
index 9c7a8deb9d7..4b4a1e3839c 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
@@ -144,7 +144,7 @@ Hello::test_var_array_arg(const Test::Var_Array messages)
   {
     if (debug)
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_var_array_arg ")
-                        ACE_TEXT("messages[%d] = %s \n"), i, messages[i].in ()));
+                        ACE_TEXT("messages[%d] = %s\n"), i, messages[i].in ()));
     if (ACE_OS::strncmp (messages[i].in (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
       ERROR_COUNT ("Hello::test_var_array_arg")
   }
@@ -156,7 +156,7 @@ Hello::test_special_basic_arg(CORBA::Char value)
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_special_basic_arg ")
-                          ACE_TEXT(" got special basic arg: %c \n"), value));
+                          ACE_TEXT(" got special basic arg: %c\n"), value));
   if (value != TEST_SPECIAL_VALUE)
     ERROR_COUNT ("Hello::test_special_basic_arg")
 }
@@ -167,7 +167,7 @@ void Hello::test_objref_arg (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_objref_arg \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_objref_arg\n")));
 
   if (CORBA::is_nil (test))
     ERROR_COUNT ("Hello::test_objref_arg")
@@ -190,7 +190,7 @@ void Hello::test_object_arg (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg\n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (o);
 
   CORBA::ULong error_count = 0;
@@ -209,7 +209,7 @@ void Hello::test_args_1 (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1\n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (arg1);
 
   CORBA::ULong error_count = 0;
@@ -234,7 +234,7 @@ void Hello::test_args_2 (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2\n")));
   if (ACE_OS::strncmp (arg1, TEST_STR, ACE_OS::strlen (TEST_STR)) != 0 )
     ERROR_COUNT ("Hello::test_args_2")
 
@@ -258,7 +258,7 @@ void Hello::test_args_3 (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3 \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3\n")));
   if (ACE_OS::strncmp (arg1, TEST_STR, ACE_OS::strlen (arg1)) != 0)
     ERROR_COUNT ("Hello::test_args_3")
   if (ACE_OS::strncmp (arg2.get_buffer (), TEST_STR, ::Test::BOUNDED_VAR_SIZE) != 0)
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
index db57bf3a4bf..21b76077e47 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
@@ -129,7 +129,7 @@ Server_Task::svc (void)
  catch (...)
    {
      error_count_ ++;
-     ACE_ERROR ((LM_ERROR, "(%P|%t)Server_Task::svc - caught unknown exception \n"));
+     ACE_ERROR ((LM_ERROR, "(%P|%t)Server_Task::svc - caught unknown exception\n"));
      return 1;
    }
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
index 446a1ddfe2b..fa640489fbb 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
@@ -292,7 +292,7 @@ Client_Task::svc (void)
   catch (...)
     {
       ++error_count_;
-      ACE_ERROR ((LM_ERROR, "(%P|%t)Client_Task::svc - caught unknown exception \n"));
+      ACE_ERROR ((LM_ERROR, "(%P|%t)Client_Task::svc - caught unknown exception\n"));
       return 1;
     }
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
index 6122ce28dca..da2b21ba6ed 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
@@ -161,7 +161,7 @@ Hello::test_var_array_arg(const Test::Var_Array messages)
   {
     if (debug)
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_var_array_arg ")
-                        ACE_TEXT("messages[%d] = %s \n"), i, messages[i].in ()));
+                        ACE_TEXT("messages[%d] = %s\n"), i, messages[i].in ()));
     if (ACE_OS::strncmp (messages[i].in (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
       ERROR_COUNT ("Hello::test_var_array_arg")
   }
@@ -173,7 +173,7 @@ Hello::test_special_basic_arg(CORBA::Char value)
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_special_basic_arg ")
-                          ACE_TEXT(" got special basic arg: %c \n"), value));
+                          ACE_TEXT(" got special basic arg: %c\n"), value));
   if (value != TEST_SPECIAL_VALUE)
     ERROR_COUNT ("Hello::test_special_basic_arg")
 }
@@ -184,7 +184,7 @@ void Hello::test_objref_arg (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_objref_arg \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_objref_arg\n")));
 
   if (CORBA::is_nil (test))
     ERROR_COUNT ("Hello::test_objref_arg")
@@ -207,7 +207,7 @@ void Hello::test_object_arg (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg\n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (o);
 
   CORBA::ULong error_count = 0;
@@ -226,7 +226,7 @@ void Hello::test_args_1 (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1\n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (arg1);
 
   CORBA::ULong error_count = 0;
@@ -251,7 +251,7 @@ void Hello::test_args_2 (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2\n")));
   if (ACE_OS::strncmp (arg1, TEST_STR, ACE_OS::strlen (TEST_STR)) != 0 )
     ERROR_COUNT ("Hello::test_args_2")
 
@@ -275,7 +275,7 @@ void Hello::test_args_3 (
   )
 {
   if (debug)
-    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3 \n")));
+    ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3\n")));
   if (ACE_OS::strncmp (arg1, TEST_STR, ACE_OS::strlen (arg1)) != 0)
     ERROR_COUNT ("Hello::test_args_3")
   if (ACE_OS::strncmp (arg2.get_buffer (), TEST_STR, ::Test::BOUNDED_VAR_SIZE) != 0)
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
index c05ba7cef99..f7984939597 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
@@ -127,7 +127,7 @@ Server_Task::svc (void)
  catch (...)
    {
      error_count_ ++;
-     ACE_ERROR ((LM_ERROR, "(%P|%t)Server_Task::svc - caught unknown exception \n"));
+     ACE_ERROR ((LM_ERROR, "(%P|%t)Server_Task::svc - caught unknown exception\n"));
      return 1;
    }
 
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 5a9ca57dfac..6b75438f351 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -181,7 +181,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // For other case this is expected.
       if (do_self_shutdown == 0)
         {
-          x._tao_print_exception ("ERROR: Unexpected exception \n");
+          x._tao_print_exception ("ERROR: Unexpected exception\n");
         }
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index b8f5d176105..e8582c9ddeb 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -55,7 +55,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
 {
   if (is_clean == 0)
     {
-      ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown \n"));
+      ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
 #if defined (DIGITAL_UNIX) || defined (DEC_CXX) || defined (ACE_OPENVMS)
       ACE_OS::_exit();
 #else
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
index c8696ddd004..b7af4d6d5b2 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
@@ -47,7 +47,7 @@ Client_Task::svc (void)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception Caught \n");
+      ex._tao_print_exception ("Exception Caught\n");
       return -1;
     }
 
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index 9dc192dc8a1..2763c058f75 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -79,28 +79,28 @@ namespace Test
         {
           ACE_UNUSED_ARG (f);
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Caught COMM_FAILURE Exception \n"));
+                      "(%P|%t) Caught COMM_FAILURE Exception\n"));
 
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) This is expected \n"));
+                      "(%P|%t) This is expected\n"));
 
           return 0;
         }
       catch (const CORBA::Exception& ex)
         {
-          ex._tao_print_exception ("Caught CORBA Exception \n");
+          ex._tao_print_exception ("Caught CORBA Exception\n");
 
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Error in test \n"));
+                      "(%P|%t) Error in test\n"));
 
           return -1;
         }
       catch (...)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Caught a C++ exception \n"));
+                      "(%P|%t) Caught a C++ exception\n"));
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Error in test \n"));
+                      "(%P|%t) Error in test\n"));
 
           return -1;
         }
@@ -125,7 +125,7 @@ namespace Test
       try
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Calling shutdown \n"));
+                      "(%P|%t) Calling shutdown\n"));
 
           // Just wait for the main thread to start sending out
           // messages
@@ -147,7 +147,7 @@ namespace Test
           if (el.real_time > 1)
             {
               ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) ERROR: Too long to shutdown \n"));
+                          "(%P|%t) ERROR: Too long to shutdown\n"));
 
               return 0;
             }
@@ -155,15 +155,15 @@ namespace Test
       catch (...)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Caught exception during shutdown \n"));
+                      "(%P|%t) Caught exception during shutdown\n"));
 
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Error in test \n"));
+                      "(%P|%t) Error in test\n"));
           return -1;
         }
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Returning from shutdown \n"));
+                  "(%P|%t) Returning from shutdown\n"));
       return 0;
     }
   private:
@@ -204,7 +204,7 @@ namespace Test
                             1);
 
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Activating shutdown thread \n"));
+                    "(%P|%t) Activating shutdown thread\n"));
 
         Shutdown_Task st (orb.in ());
 
@@ -220,15 +220,15 @@ namespace Test
       }
     catch (const CORBA::Exception& ex)
       {
-        ex._tao_print_exception ("CORBA Exception caught \n");
+        ex._tao_print_exception ("CORBA Exception caught\n");
         ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) Eror in test \n"));
+                    "(%P|%t) Eror in test\n"));
         return -1;
       }
     catch (...)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Error in test \n"));
+                    "(%P|%t) Error in test\n"));
         return -1;
       }
 
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index d4bc9d0acfb..0c0f71a19b0 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -74,7 +74,7 @@ namespace Test
       }
     catch (const CORBA::Exception& ex)
       {
-        ex._tao_print_exception ("Caught CORBA exception \n");
+        ex._tao_print_exception ("Caught CORBA exception\n");
         return -1;
       }
 
diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index 388a9562284..8638de85caa 100644
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.cpp
@@ -58,7 +58,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (CORBA::is_nil (hello.in ()))
         {
           ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Test::Hello reference \n"),
+                             "Nil Test::Hello reference\n"),
                             1);
         }
 
@@ -80,7 +80,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (CORBA::is_nil (obj2.in ()))
         {
           ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Any_To_Object reference \n"),
+                             "Nil Any_To_Object reference\n"),
                             1);
         }
 
@@ -90,7 +90,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (CORBA::is_nil (hello_world.in ()))
         {
           ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Test::HelloWorld reference \n"),
+                             "Nil Test::HelloWorld reference\n"),
                             1);
         }
 
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index 82281029544..e610b16c39a 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -102,7 +102,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Caught an exception \n");
+      ex._tao_print_exception ("Caught an exception\n");
       return -1;
     }
   return 0;
diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp
index 6c4ccf90aef..b3f4772e9fa 100644
--- a/TAO/tests/MProfile/test_i.cpp
+++ b/TAO/tests/MProfile/test_i.cpp
@@ -20,7 +20,7 @@ CORBA::Long
 Simple_Server_i::remote_call (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Print out from process id (%P) hosting the servant \n"));
+              "Print out from process id (%P) hosting the servant\n"));
 
   return this->val_++;
 }
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index 4037d69546c..596ae335751 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -134,16 +134,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (freq != 919263)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) ERROR in the test \n")));
+                    ACE_TEXT ("(%P|%t) ERROR in the test\n")));
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) Shutting server down \n")));
+                  ACE_TEXT ("(%P|%t) Shutting server down\n")));
 
       server->shutdown ();
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Caught an exception \n");
+      ex._tao_print_exception ("Caught an exception\n");
       return -1;
     }
 
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
index 2ac070dd5c3..81c92cbb04c 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
@@ -27,7 +27,7 @@ CORBA::ULongLong
 Simple_Server_i::remote_call (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Print out from process id (%P) hosting the servant \n"));
+              "Print out from process id (%P) hosting the servant\n"));
 
   return freq;
 }
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index ebf35905893..f1489871650 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -183,7 +183,7 @@ Manager::make_iors_register (void)
 
   if (third_ior == 0)
     ACE_DEBUG ((LM_DEBUG,
-                "Here is the culprit \n"));
+                "Here is the culprit\n"));
   // Third Server
   CORBA::Object_var object_tertiary =
     this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (third_ior));
@@ -214,7 +214,7 @@ Manager::make_iors_register (void)
 
   if (object_tertiary.in () == 0)
     ACE_DEBUG ((LM_DEBUG,
-                " There is a problem \n"));
+                " There is a problem\n"));
 
   TAO_IOP::TAO_IOR_Manipulation::IORList iors_again (3);
   iors_again.length(3);
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
index 275d0c7f0a4..4185fda90f6 100644
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
@@ -49,7 +49,7 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
   CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
 
   ACE_DEBUG ((LM_DEBUG,
-              "The OID is <%s> \n", s.in ()));
+              "The OID is <%s>\n", s.in ()));
   if (ACE_OS::strstr (s.in (), "Simple_Server") == 0)
     {
       throw CORBA::OBJECT_NOT_EXIST ();
@@ -60,10 +60,10 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
     Simple_Server::_narrow (this->objref_.in ());
 
   ACE_DEBUG ((LM_DEBUG,
-              "Got the narrowed secondary server too... \n"));
+              "Got the narrowed secondary server too...\n"));
 
   ACE_DEBUG ((LM_DEBUG,
-              "About to throw exception.. \n"));
+              "About to throw exception..\n"));
 
   throw PortableServer::ForwardRequest (
     CORBA::Object::_duplicate (
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index 706dab2171e..2864a422a4b 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -56,7 +56,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         {
           //FUZZ: disable check_for_NULL
           ACE_ERROR_RETURN  ((LM_ERROR,
-                              "The received objref is NULL \n"),
+                              "The received objref is NULL\n"),
                              -1);
           //FUZZ: enable check_for_NULL
         }
@@ -75,7 +75,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Caught an exception \n");
+      ex._tao_print_exception ("Caught an exception\n");
       return -1;
     }
   return 0;
@@ -88,7 +88,7 @@ void run_test (Simple_Server_ptr server)
       try
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "About to make remote call \n"));
+                      "About to make remote call\n"));
           ACE_OS::sleep (2);
 
           // Make a remote call
@@ -99,7 +99,7 @@ void run_test (Simple_Server_ptr server)
           ACE_OS::sleep (25);
           ACE_DEBUG ((LM_DEBUG, " hope you did\n")); */
           ACE_DEBUG ((LM_DEBUG,
-                      "I am going to shutdown \n"));
+                      "I am going to shutdown\n"));
           server->shutdown ();
           ACE_OS::sleep (23);
         }
diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp
index e994bbf6c62..4fb6535c3ab 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.cpp
+++ b/TAO/tests/MProfile_Forwarding/test_i.cpp
@@ -18,7 +18,7 @@ void
 Simple_Server_i::remote_call (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Print out from process id (%P) hosting the servant \n"));
+              "Print out from process id (%P) hosting the servant\n"));
 }
 
 
diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp
index c13aefd6fef..fa16e325137 100644
--- a/TAO/tests/MT_BiDir/Server_Task.cpp
+++ b/TAO/tests/MT_BiDir/Server_Task.cpp
@@ -64,9 +64,9 @@ Server_Task::svc (void)
               connection_no =
                 this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ();
               ACE_ERROR ((LM_DEBUG,
-                          "(%P|%t) ERROR: New connections have been created \n"));
+                          "(%P|%t) ERROR: New connections have been created\n"));
               ACE_ERROR ((LM_DEBUG,
-                          "(%P|%t) ERROR: We will crash now... \n"));
+                          "(%P|%t) ERROR: We will crash now...\n"));
               ACE_OS::abort ();
             }
 
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index 32fc32eb646..62b9bd177d6 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -138,7 +138,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         receiver->get_event_count ();
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Number of events received.. [%d] \n",
+                  "(%P|%t) Number of events received.. [%d]\n",
                   count));
 
       root_poa->destroy (1,
diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp
index 0bde4660875..4e75b286b50 100644
--- a/TAO/tests/Multiple/Collocation_Tester.cpp
+++ b/TAO/tests/Multiple/Collocation_Tester.cpp
@@ -34,7 +34,7 @@ Collocation_Tester::match_answer (const char *actual_answer,
   else
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Call to <%C> returned with success: %C \n"), method_name, actual_answer));
+                  ACE_TEXT ("Call to <%C> returned with success: %C\n"), method_name, actual_answer));
       return 0;
     }
 }
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index e6b2d2fabc3..630a944d033 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -117,7 +117,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (!server_shutdown)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "starting string_to_object %s \n",
+                      "starting string_to_object %s\n",
                       corbaloc_arg));
 
           for (int c = 0; c < (niterations * 2); c++)
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 9f7bb8991fc..2ed67f53282 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -286,13 +286,13 @@ SelfClient::svc (void)
                   if (CORBA::is_nil (newserver.in()))
                     {
                       ACE_DEBUG ((LM_DEBUG,
-                                  "(%P|%t)  Not found it \n"));
+                                  "(%P|%t)  Not found it\n"));
 
                     }
                   else
                     {
                       ACE_DEBUG ((LM_DEBUG,
-                                  "(%P|%t) Found it \n"));
+                                  "(%P|%t) Found it\n"));
                     }
                 }
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index 6d3e576e1db..04dbf25ca9e 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -120,7 +120,7 @@ int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
+              "\n \t NestedUpCalls.Triangle_Test: Object A Server \n\n"));
 
   try
     {
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index eb428b22f60..3433e5fea2a 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -272,7 +272,7 @@ int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n"));
+              "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n\n"));
 
   try
     {
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index fa1a29d8ddb..dd47d9447c5 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -117,7 +117,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   Object_A_Server object_A_Server;
 
   ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
+              "\n \t NestedUpCalls.Triangle_Test: Object A Server \n\n"));
 
   try
     {
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index 185c4c16fa8..bee7d17754c 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -117,7 +117,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   Object_B_Server object_B_Server;
 
   ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls.Triangle_Test: Object B Server \n \n"));
+              "\n \t NestedUpCalls.Triangle_Test: Object B Server \n\n"));
 
   try
     {
diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
index a63fac3b1ee..6dddbd46c07 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
@@ -151,7 +151,7 @@ Client::svc (void)
   catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Expected exceptions \n"));
+                  "(%P|%t) Expected exceptions\n"));
     }
   return 0;
 }
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
index 2487abff11c..3e29c2e7fb6 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
@@ -234,7 +234,7 @@ Client_Task::dump_node (BaseNode *bn, int indent)
   else
   {
     ACE_DEBUG ((LM_DEBUG,
-                "%x <BaseNode> \n",
+                "%x <BaseNode>\n",
                 bn));
   }
 
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index 20bab6128fe..dabff3e82c4 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -56,7 +56,7 @@ dump_node (BaseNode *bn, int indent)
   else
   {
     ACE_DEBUG ((LM_DEBUG,
-                "%x <BaseNode> \n",
+                "%x <BaseNode>\n",
                 bn));
   }
 
diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp
index 6b37d9f1af8..8ae13d5288a 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.cpp
+++ b/TAO/tests/OBV/Simple/OBV_impl.cpp
@@ -28,7 +28,7 @@ Event_impl::_copy_value (void)
 void
 Event_impl::do_print (void)
 {
-  ACE_DEBUG((LM_DEBUG, "(value %d)  \n",
+  ACE_DEBUG((LM_DEBUG, "(value %d) \n",
              (CORBA::ULong) this->value_()));
 }
 
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index aed6a334db4..26ef074e232 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -45,10 +45,10 @@ void
 vt_graph_impl::print (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Printing graph data... \n"));
+              "Printing graph data...\n"));
 
   ACE_DEBUG ((LM_DEBUG,
-              "Number of nodes: [%d] \n", nodes_ ().length ()));
+              "Number of nodes: [%d]\n", nodes_ ().length ()));
 
   for (size_t i = 0; i < nodes_ ().length (); i++)
     nodes_ ()[i]->print ();
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
index cd1b9c88096..774c9861e46 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
@@ -21,7 +21,7 @@ Test_impl::op1 (
   if (TAO_debug_level > 0)
     ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("(%P|%t)Test_impl::op1")
-               ACE_TEXT(" id=%s basic_data=%u desc=%s \n"),
+               ACE_TEXT(" id=%s basic_data=%u desc=%s\n"),
                id, iv->basic_data (), desc));
 
    char *tmp =
@@ -46,7 +46,7 @@ Test_impl::op2 (
   if (TAO_debug_level > 0)
     ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("(%P|%t)Test_impl::op2")
-               ACE_TEXT(" id=%s basic_data=%u data1=%u desc=%s \n"),
+               ACE_TEXT(" id=%s basic_data=%u data1=%u desc=%s\n"),
                id, iv->basic_data (), iv->data1 (), desc));
   char *tmp =
     CORBA::string_alloc (ACE_OS::strlen (id) + ACE_OS::strlen (desc) + 2);
@@ -71,7 +71,7 @@ Test_impl::op3 (
   if (TAO_debug_level > 0)
     ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("(%P|%t)Test_impl::op3")
-               ACE_TEXT(" id=%s basic_data=%u data=%u data4=%u desc=%s \n"),
+               ACE_TEXT(" id=%s basic_data=%u data=%u data4=%u desc=%s\n"),
                id, iv->basic_data (), iv->nv4()->data (), iv->data4 (), desc));
 
   char *tmp =
@@ -106,21 +106,21 @@ Test_impl::op4 (
   {
     ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("(%P|%t)Test_impl::op4")
-               ACE_TEXT(" id=%s basic_data=%u data1=%u desc=%s \n"),
+               ACE_TEXT(" id=%s basic_data=%u data1=%u desc=%s\n"),
                id, iv1->basic_data (), iv1->data1 (), desc));
     ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("(%P|%t)Test_impl::op4")
-               ACE_TEXT(" id=%s basic_data=%u data=%u data4=%u desc=%s \n"),
+               ACE_TEXT(" id=%s basic_data=%u data=%u data4=%u desc=%s\n"),
                id, iv2->basic_data (), iv2->nv4()->data (),
                iv2->data4 (), desc));
     ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("(%P|%t)Test_impl::op4")
-               ACE_TEXT(" id=%s basic_data=%u data=%u data4=%u desc=%s \n"),
+               ACE_TEXT(" id=%s basic_data=%u data=%u data4=%u desc=%s\n"),
                id, iv3->basic_data (), iv3->nv4()->data (),
                iv3->data4 (), desc));
     ACE_DEBUG((LM_DEBUG,
                ACE_TEXT("(%P|%t)Test_impl::op4")
-               ACE_TEXT(" id=%s basic_data=%u data1=%u desc=%s \n"),
+               ACE_TEXT(" id=%s basic_data=%u data1=%u desc=%s\n"),
                id, iv4->basic_data (), iv4->data1 (), desc));
   }
 
@@ -165,7 +165,7 @@ Test_impl::op5 (const CORBA::Any& val,
       if (TAO_debug_level > 0)
         ACE_DEBUG((LM_DEBUG,
                    ACE_TEXT("(%P|%t)Test_impl::op5")
-                   ACE_TEXT(" id=%s basic_data=%u data1=%u desc=%s \n"),
+                   ACE_TEXT(" id=%s basic_data=%u data1=%u desc=%s\n"),
                    id, iv->basic_data (), iv->data1 (), desc));
       char *tmp =
         CORBA::string_alloc (ACE_OS::strlen (id) + ACE_OS::strlen (desc) + 2);
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index a9e9359b692..2bc631f9667 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -475,7 +475,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                       ACE_TEXT ("passed") : ACE_TEXT ("failed")));
       }
 
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - shutdown orb \n"));
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - shutdown orb\n"));
 
 
       test->shutdown ();
@@ -484,11 +484,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (fail)
         {
-          ACE_ERROR ((LM_ERROR, "(%P|%t) client: test failed \n"));
+          ACE_ERROR ((LM_ERROR, "(%P|%t) client: test failed\n"));
           return 1;
         }
       else
-        ACE_DEBUG((LM_DEBUG, "(%P|%t) client: test passed \n"));
+        ACE_DEBUG((LM_DEBUG, "(%P|%t) client: test passed\n"));
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index 2223c5efa18..5044f87e6ea 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -354,7 +354,7 @@ int test_basic_invocations (Test * test_object)
   catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) test_basic_invocations: caught a C++ exception \n"));
+                "(%P|%t) test_basic_invocations: caught a C++ exception\n"));
       fail = 1;
     }
 
@@ -520,7 +520,7 @@ int test_boxed_string_invocations (Test * test_object)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_string_invocations: "
-                  "caught a C++ exception \n"));
+                  "caught a C++ exception\n"));
       fail = 1;
     }
 
@@ -688,7 +688,7 @@ int test_boxed_sequence_invocations (Test * test_object)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_sequence_invocations: "
-                  "caught a C++ exception \n"));
+                  "caught a C++ exception\n"));
       fail = 1;
     }
 
@@ -942,7 +942,7 @@ int test_boxed_struct_invocations (Test * test_object)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_struct_invocations: "
-                  "caught a C++ exception \n"));
+                  "caught a C++ exception\n"));
       fail = 1;
     }
 
@@ -1181,7 +1181,7 @@ int test_boxed_array_invocations (Test * test_object)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_array_invocations: "
-                  "caught a C++ exception \n"));
+                  "caught a C++ exception\n"));
       fail = 1;
     }
 
@@ -1411,7 +1411,7 @@ int test_boxed_union_invocations (Test * test_object)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_union_invocations: "
-                  "caught a C++ exception \n"));
+                  "caught a C++ exception\n"));
       fail = 1;
     }
 
@@ -1454,7 +1454,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) Initialization failure: caught a C++ exception \n"));
+                "(%P|%t) Initialization failure: caught a C++ exception\n"));
       return 1;
     }
 
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.cpp b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
index 6f5abfb1e81..27cb46e1a42 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.cpp
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.cpp
@@ -13,7 +13,7 @@ Foo_Bar::Foo_Bar (CORBA::ORB_ptr orb)
 Foo_Bar::~Foo_Bar (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Shutting down the ORB again \n"));
+              "(%P|%t) Shutting down the ORB again\n"));
 
   this->orb_->shutdown (1);
 }
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index 32e0c905bb2..32a16e3f383 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -78,6 +78,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Test successful.. \n"));
+              "(%P|%t) Test successful..\n"));
   return 0;
 }
diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index 6f28879687e..ca5d67393cb 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.cpp
@@ -100,12 +100,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       //------------- End of donated untouched section
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Call delete on the server \n"));
+                  "(%P|%t) Call delete on the server\n"));
 
       server->DeleteExtra (vServers.in ());
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Calling shutdown \n"));
+                  "(%P|%t) Calling shutdown\n"));
       server->shutdown ();
 
     }
diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index b3f3d3c820b..53da8b757dc 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -44,7 +44,7 @@ ServerServant::CreateExtra (CORBA::ULong len,
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Create extra called with "
-              " length [%d] \n", len));
+              " length [%d]\n", len));
 
   ACE_NEW_THROW_EX (seq,
                     ServerSequence (len),
@@ -68,7 +68,7 @@ ServerServant::CreateExtra (CORBA::ULong len,
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Returned from CreateExtra () \n"));
+              "(%P|%t) Returned from CreateExtra ()\n"));
 }
 
 
@@ -77,7 +77,7 @@ void
 ServerServant::DeleteExtra (const ServerSequence &seq)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Deleting sequences \n"));
+              "(%P|%t) Deleting sequences\n"));
 
   PortableServer::ObjectId_var oid;
   PortableServer::ServantBase *servant = 0;
@@ -97,7 +97,7 @@ ServerServant::DeleteExtra (const ServerSequence &seq)
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Returned after deleting sequences \n"));
+              "(%P|%t) Returned after deleting sequences\n"));
 
 }
 
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index 14c19f52bc4..6646e95283c 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -22,7 +22,7 @@ CORBA::Long
 Receiver_i::receive_call (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t)  Doing a ping... \n"));
+              "(%P|%t)  Doing a ping...\n"));
 
   this->sender_->ping ();
 
@@ -39,6 +39,6 @@ void
 Receiver_i::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) About to invoke shudown... \n"));
+              "(%P|%t) About to invoke shudown...\n"));
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 54a39be83e6..d7920f91791 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -50,6 +50,6 @@ void
 Sender_i::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) About to invoke shudown... \n"));
+              "(%P|%t) About to invoke shudown...\n"));
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
index c8f5a79fac9..7adc60840d8 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
@@ -119,7 +119,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       ACE_DEBUG ((LM_DEBUG,
-                  "Event Loop finished \n"));
+                  "Event Loop finished\n"));
 
       orb->destroy ();
     }
diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
index 470979302c0..46086a944d2 100644
--- a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
+++ b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp
@@ -26,7 +26,7 @@ test_i::op (void)
     {
       ACE_ERROR ((LM_ERROR,
                   "PortableInterceptor::ServerRequestInterceptor::"
-                  "receive_request() not called \n"
+                  "receive_request() not called\n"
                   "prior to target operation execution.\n"));
 
       throw CORBA::INTERNAL ();
diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp
index d5a8f140043..59a6445c636 100644
--- a/TAO/tests/POA/DSI/Database_i.cpp
+++ b/TAO/tests/POA/DSI/Database_i.cpp
@@ -250,7 +250,7 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
         reinterpret_cast<Employee *> (temp);
       ACE_DEBUG ((LM_DEBUG,
                   "Employee with key = %C will be removed from the database: "
-                  "name = %C and id = %d \n",
+                  "name = %C and id = %d\n",
                   key,
                   employee->name (),
                   employee->id ()));
diff --git a/TAO/tests/POA/Forwarding/client.cpp b/TAO/tests/POA/Forwarding/client.cpp
index 4b94365937e..fad5e856b92 100644
--- a/TAO/tests/POA/Forwarding/client.cpp
+++ b/TAO/tests/POA/Forwarding/client.cpp
@@ -77,7 +77,7 @@ do_calls (test_ptr test)
 
           // Print the result of doit () method of the test reference.
           ACE_DEBUG ((LM_DEBUG,
-                      "doit() returned %d \n",
+                      "doit() returned %d\n",
                       result));
         }
 
diff --git a/TAO/tests/POA/Forwarding/server.cpp b/TAO/tests/POA/Forwarding/server.cpp
index 40228b2e77d..444b323a98f 100644
--- a/TAO/tests/POA/Forwarding/server.cpp
+++ b/TAO/tests/POA/Forwarding/server.cpp
@@ -46,9 +46,9 @@ parse_args (int argc, ACE_TCHAR **argv)
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "\nusage:  %s \n"
-                           "-f forward to IOR \n"
-                           "-o output file for IOR \n"
+                           "\nusage:  %s\n"
+                           "-f forward to IOR\n"
+                           "-o output file for IOR\n"
                            "\n",
                            argv [0]),
                           -1);
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
index f90e4bf7db1..3b8725f1aae 100644
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ b/TAO/tests/POA/Generic_Servant/client.cpp
@@ -88,10 +88,10 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time,
       double tmp = 1000 / elapsed_time.real_time;
 
       ACE_DEBUG ((LM_DEBUG,
-                  "\titerations\t = %d, \n"
-                  "\treal_time\t = %0.06f ms, \n"
-                  "\tuser_time\t = %0.06f ms, \n"
-                  "\tsystem_time\t = %0.06f ms, \n"
+                  "\titerations\t = %d,\n"
+                  "\treal_time\t = %0.06f ms,\n"
+                  "\tuser_time\t = %0.06f ms,\n"
+                  "\tsystem_time\t = %0.06f ms,\n"
                   "\t%0.00f calls/second\n",
                   iterations,
                   elapsed_time.real_time   < 0.0 ? 0.0 : elapsed_time.real_time,
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
index 11632c2e416..8b6a8d91629 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -131,7 +131,7 @@ ServantManager_i::parse_string (const ACE_TCHAR *s)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "the servant dll:%s\n the factory_function:%s\n ",
+                "the servant dll:%s\n the factory_function:%s\n",
                 this->dllname_.c_str (),
                 this->create_symbol_.c_str ()));
 }
diff --git a/TAO/tests/POA/TIE/client.cpp b/TAO/tests/POA/TIE/client.cpp
index 24fd72e1d52..6c9f8fd6a06 100644
--- a/TAO/tests/POA/TIE/client.cpp
+++ b/TAO/tests/POA/TIE/client.cpp
@@ -91,9 +91,9 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time,
       double tmp = 1000 / elapsed_time.real_time;
 
       ACE_DEBUG ((LM_DEBUG,
-                  "\treal_time\t = %0.06f ms, \n"
-                  "\tuser_time\t = %0.06f ms, \n"
-                  "\tsystem_time\t = %0.06f ms, \n"
+                  "\treal_time\t = %0.06f ms,\n"
+                  "\tuser_time\t = %0.06f ms,\n"
+                  "\tsystem_time\t = %0.06f ms,\n"
                   "\t%0.00f calls/second\n",
                   elapsed_time.real_time   < 0.0 ? 0.0 : elapsed_time.real_time,
                   elapsed_time.user_time   < 0.0 ? 0.0 : elapsed_time.user_time,
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index 70a10caa970..5dea1681124 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -208,7 +208,7 @@ Test_Multdim_Array::print (const Param_Test::Multdim_Array_slice *a)
         {
           for (CORBA::ULong k=0; k < Param_Test::DIM1; k++)
             {
-              ACE_DEBUG ((LM_DEBUG, "\t\tElement #%d #%d #%d = %d \n",i,j,k, a[i][j][k]));
+              ACE_DEBUG ((LM_DEBUG, "\t\tElement #%d #%d #%d = %d\n",i,j,k, a[i][j][k]));
             }
         }
     }
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index a575b1c0bac..101e607c389 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -80,8 +80,8 @@ Results::print_stats (void)
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n*=*=*=*=*= Average *=*=*=*=*=*=\n"
-                  "\treal_time\t= %0.06f ms, \n"
-                  "\tuser_time\t= %0.06f ms, \n"
+                  "\treal_time\t= %0.06f ms,\n"
+                  "\tuser_time\t= %0.06f ms,\n"
                   "\tsystem_time\t= %0.06f ms\n"
                   "\t%0.00f calls/second\n"
                   "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=\n",
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index e9863a613ac..f2df08223b8 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -117,7 +117,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref)
           {
                   if (TAO_debug_level > 0)
                     ACE_DEBUG ((LM_DEBUG,
-                          "setting coffee object \n" ));
+                          "setting coffee object\n" ));
             try
               {
                 // get access to a Coffee Object
@@ -138,7 +138,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref)
         case 3:
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "setting constant string \n" ));
+                        "setting constant string\n" ));
                 this->in_[i] <<= "Const string";
                 this->inout_[i] <<= 0; // different from in_
           break;
diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp
index ecf8f39d04c..9356b031cd6 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp
@@ -42,7 +42,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            "Usage:  %s "
                            "-o <IOR> "
                            "-c <CrashPoint> "
-                           "-n <server number> \n",
+                           "-n <server number>\n",
                            argv[0]),
                           -1);
       }
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp
index 0e7b81662bb..ffa6087e66d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/client.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
 #include "testC.h"
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -94,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                       "CLIENT: Request %d handled by object %d.\n",
                       i,
                       number));
-          sleep (1);
+          ACE_OS::sleep (1);
         }
 
       server->shutdown ();
diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp
index f38d518bbc1..ec367253e1c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_3582/server.cpp
@@ -30,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Usage:  %s "
                            "-o <IOR> "
-                           "-n <server number> \n",
+                           "-n <server number>\n",
                            argv[0]),
                           -1);
       }
@@ -91,14 +91,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa_manager->activate ();
 
       // Run the ORB event loop.
-      try
-        {
-          orb->run ();
-        }
-      catch (const CORBA::BAD_INV_ORDER & ex)
-        {
-          // no op
-        };
+      orb->run ();
 
       root_poa->destroy (1, 1);
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index 45e2319b7fa..430eec2ee3d 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -170,7 +170,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   catch (const CORBA::BAD_PARAM&)
     {
       ACE_ERROR ((LM_ERROR,
-                  "ERROR: Service Context Error \n"));
+                  "ERROR: Service Context Error\n"));
     }
 }
 
@@ -247,7 +247,7 @@ Echo_Client_Request_Interceptor::receive_exception (
   catch (const CORBA::BAD_PARAM&)
     {
       ACE_ERROR ((LM_ERROR,
-                  "ERROR: Service Context Error \n"));
+                  "ERROR: Service Context Error\n"));
     }
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 4e3211fd27b..082e29a7826 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -80,7 +80,7 @@ Echo_Client_Request_Interceptor::send_request (
       if (paramlist->length () != 2)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) All parameters not available \n"));
+                      "(%P|%t) All parameters not available\n"));
 
         }
 
@@ -91,7 +91,7 @@ Echo_Client_Request_Interceptor::send_request (
           paramlist[second].mode != CORBA::PARAM_OUT)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) ERROR in the extracted argument list \n"));
+                      "(%P|%t) ERROR in the extracted argument list\n"));
         }
 
       CORBA::Long param = 0;
@@ -102,7 +102,7 @@ Echo_Client_Request_Interceptor::send_request (
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR in send_request while checking "
                       "the value of the extracted "
-                      "arguments \n"));
+                      "arguments\n"));
         }
 
       CORBA::TypeCode_var second_typecode = paramlist[second].argument.type ();
@@ -150,7 +150,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       if (paramlist->length () != 2)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) All parameters not available \n"));
+                      "(%P|%t) All parameters not available\n"));
 
         }
 
@@ -161,7 +161,7 @@ Echo_Client_Request_Interceptor::receive_reply (
           paramlist[second].mode != CORBA::PARAM_OUT)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) ERROR in the extracted argument list \n"));
+                      "(%P|%t) ERROR in the extracted argument list\n"));
         }
 
       CORBA::Long param = 0;
@@ -172,7 +172,7 @@ Echo_Client_Request_Interceptor::receive_reply (
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR in send_request while checking "
                       "the value of the extracted "
-                      "arguments \n"));
+                      "arguments\n"));
         }
 
       const char *str = 0;
@@ -187,7 +187,7 @@ Echo_Client_Request_Interceptor::receive_reply (
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR in send_request while checking "
                       "the value of the extracted "
-                      "out arguments \n"));
+                      "out arguments\n"));
         }
     }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
index 43ab48e2f2a..695300311be 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
@@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            "Usage:  %s "
                            "-o <IOR> "
                            "-c <CrashPoint> "
-                           "-n <server number> \n",
+                           "-n <server number>\n",
                            argv[0]),
                           -1);
       }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
index 26dcfb71d01..df1b2742754 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
@@ -58,7 +58,7 @@ Request_Interceptor::destroy (void)
                   "(%P) The number of starting interception point "
                   "calls (%u)\n"
                   "(%P) did not equal the number of ending "
-                  "interception \n"
+                  "interception\n"
                   "(%P) point calls (%u).\n\n",
                   this->name_.in (),
                   s_count,
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 750d6167c1e..7ce6cc05e7d 100644
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -16,7 +16,7 @@ void
 LCD_Display_imp::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "The ORB has been shutdown, Close the windows to exit \n"));
+              "The ORB has been shutdown, Close the windows to exit\n"));
   this->orb_->shutdown (0);
   this->orb_->destroy ();
 }
@@ -25,7 +25,7 @@ void
 LCD_Display_imp::send_val (CORBA::Long val)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "The value from server is <%d> \n", val));
+              "The value from server is <%d>\n", val));
   emit set_value (val);
 }
 
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index 326d8534071..0be2aa05dd1 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -72,7 +72,7 @@ Test_i::test_method (CORBA::Boolean client_propagated,
       // Print out the bands.
       int index = -1;
       ACE_DEBUG ((LM_DEBUG,
-                  "\nPriority Bands: \n"));
+                  "\nPriority Bands:\n"));
       for (CORBA::ULong i = 0; i < this->bands_.length (); ++i)
         {
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index d5f325060d2..360f8d9409b 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -43,7 +43,7 @@ void
 Test_i::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Shutting down \n"));
+              "(%P|%t) Shutting down\n"));
   this->orb_->shutdown (0);
 }
 
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index 29ef2c758c6..1d783e35537 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -62,7 +62,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s \n"
+                           "usage:  %s\n"
                            "\t-p <corba priority> [defaults to %d]\n"
                            "\n",
                            argv [0],
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index de9d17f887a..3930ea0dc92 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -74,7 +74,7 @@ parse_args (int argc, ACE_TCHAR **argv)
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s usage: \n"
+                           "%s usage:\n"
                            "\t-b <bands file> (defaults to %s)\n"
                            "\t-i <iterations> (defaults to %d)\n"
                            "\t-k <ior> (defaults to %s)\n"
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index b1aa3141e34..51ad9e23a26 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -119,7 +119,7 @@ parse_args (int argc, ACE_TCHAR **argv)
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s usage: \n"
+                           "%s usage:\n"
                            "\t-b <bands file> (defaults to %s)\n"
                            "\t-b <lanes file> (defaults to %s)\n"
                            "\t-o <ior file base> (defaults to %s)\n"
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index 119c928ae72..623819c300c 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -347,7 +347,7 @@ mutex_test_try_lock_thread (void *args)
   try
     {
       // check that try_lock (0) returns false
-      ACE_DEBUG ((LM_DEBUG,"attempting try_lock (0) - expect failure (but no exceptions) \n"));
+      ACE_DEBUG ((LM_DEBUG,"attempting try_lock (0) - expect failure (but no exceptions)\n"));
       result = mutex->try_lock (0u);
 
       if (result)
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index e00c00e9de1..a0cf28825c7 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -133,7 +133,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
 
           if (!CORBA::is_nil (tcp_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
-                        "     Properties: \n"
+                        "     Properties:\n"
                         "      send_buffer_size = %d\n"
                         "      receive_buffer_size = %d\n"
                         "      keep_alive = %d\n"
@@ -154,7 +154,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
 
           if (!CORBA::is_nil (uiop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
-                        "     Properties: \n"
+                        "     Properties:\n"
                         "      send_buffer_size = %d\n"
                         "      receive_buffer_size = %d\n",
                         uiop_properties->send_buffer_size (),
@@ -167,7 +167,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
 
           if (!CORBA::is_nil (shmem_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
-                        "     Properties: \n"
+                        "     Properties:\n"
                         "      send_buffer_size = %d\n"
                         "      receive_buffer_size = %d\n"
                         "      keep_alive = %d\n"
@@ -192,7 +192,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
 
           if (!CORBA::is_nil (diop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
-                        "     Properties: \n"
+                        "     Properties:\n"
                         "      enable_network_priority = %d\n",
                         diop_properties->enable_network_priority ()));
         }
@@ -203,7 +203,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
 
           if (!CORBA::is_nil (sciop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
-                        "     Properties: \n"
+                        "     Properties:\n"
                         "      send_buffer_size = %d\n"
                         "      receive_buffer_size = %d\n"
                         "      keep_alive = %d\n"
diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp
index 6c44275753c..ca960031eb2 100644
--- a/TAO/tests/Servant_To_Reference_Test/server.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/server.cpp
@@ -56,7 +56,7 @@ MT_Task::svc (void)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("(%P|%t) Caugh exception \n");
+      ex._tao_print_exception ("(%P|%t) Caugh exception\n");
     }
 
   return 0;
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp
index 575b31ef71c..f5ed7ac03b0 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.cpp
+++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp
@@ -18,6 +18,6 @@ void
 test_i::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) About to invoke shudown... \n"));
+              "(%P|%t) About to invoke shudown...\n"));
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp
index 81ae03ac6e0..e5821cede7f 100644
--- a/TAO/tests/Server_Connection_Purging/client.cpp
+++ b/TAO/tests/Server_Connection_Purging/client.cpp
@@ -61,7 +61,7 @@ Purging_Handler::handle_close (ACE_HANDLE h,
 {
   if (purged_handles % 10 == 0)
     ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) purging handle [%d] \n",
+                "(%P|%t) purging handle [%d]\n",
                 h));
 
   ++purged_handles;
@@ -111,7 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                        &ph[i],
                                        ACE_Event_Handler::READ_MASK) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Registration failed \n"),
+                           "Registration failed\n"),
                           -1);
 
       // ACE_Time_Value tv (1);
@@ -140,7 +140,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   if ((iter - purged_handles) > 20)
     ACE_ERROR_RETURN ((LM_ERROR,
-                      "(%P|%t) Purging hasnt worked at all \n"),
+                      "(%P|%t) Purging hasnt worked at all\n"),
                        -1);
 
   return 0;
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index 582ba4179c1..f5ed8b0cf6e 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -27,7 +27,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 void
 Test_i::hello (CORBA::Long howmany)
 {
-  ACE_DEBUG ((LM_DEBUG, "hello called with : %i \n", howmany));
+  ACE_DEBUG ((LM_DEBUG, "hello called with : %i\n", howmany));
 }
 
 void
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index ed1ae30dcea..9174ca73711 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -1451,9 +1451,9 @@ void displayHex (TAO_InputCDR & str)
   ACE_CString theDescr = _find_info (theSetId);
 
   if (theDescr.length () == 0)
-    ACE_DEBUG ((LM_DEBUG," Unknown CodeSet \n "));
+    ACE_DEBUG ((LM_DEBUG," Unknown CodeSet \n"));
   else
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %C \n"), theDescr.c_str ()));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %C\n"), theDescr.c_str ()));
 }
 
 CORBA::Boolean
@@ -1466,7 +1466,7 @@ cat_codeset_info (TAO_InputCDR& cdr)
   TAO_InputCDR stream (cdr, length);
   cdr.skip_bytes(length);
 
-  ACE_DEBUG ((LM_DEBUG, "\tComponent length: %u \n", length));
+  ACE_DEBUG ((LM_DEBUG, "\tComponent length: %u\n", length));
 
   ACE_DEBUG ((LM_DEBUG,
                "\tComponent byte order:\t%s Endian\n",
@@ -1486,10 +1486,10 @@ cat_codeset_info (TAO_InputCDR& cdr)
                        "for char.\n"),
                       false);
 
-  ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for char %u \n", c_ccslen));
+  ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for char %u\n", c_ccslen));
 
   if (c_ccslen)
-    ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for char are: \n"));
+    ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for char are:\n"));
 
   //  Loop through and display them
   CORBA::ULong index = 0;
@@ -1513,10 +1513,10 @@ cat_codeset_info (TAO_InputCDR& cdr)
                        "for wchar.\n"),
                       false);
 
-  ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for wchar %u \n", w_ccslen));
+  ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for wchar %u\n", w_ccslen));
 
   if (w_ccslen)
-    ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for wchar are: \n"));
+    ACE_DEBUG ((LM_DEBUG, "\tConversion Codesets for wchar are:\n"));
 
   //  Loop through and display them
   for (index = 0; index < w_ccslen; ++index)
author	wolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2009-02-23 16:14:17 +0000
committer	wolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2009-02-23 16:14:17 +0000
commit	23002b1e873da67a177e5129814546d1c85d32b1 (patch)
tree	fad79d4afc32e0d351e6c4f38aa1984917164146
parent	b5d25f71734136632f60679ca69fd8333bf1f6d9 (diff)
download	ATCD-23002b1e873da67a177e5129814546d1c85d32b1.tar.gz