Sun Feb 22 07:27:18 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/ComponentServer/CIAO_ComponentServer.cpp
        * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
        * ciao/Containers/Container_Base.cpp
        * ciao/Containers/Servant_Activator.cpp
        * ciao/Containers/Servant_Activator.h
        * ciao/Containers/Session/Session_Container.cpp
        * ciao/Contexts/Context_Impl_T.cpp
        * ciao/Server_init.cpp
        * DAnCE/DomainApplication/Domain_Application_Impl.cpp
        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
        * DAnCE/RepositoryManager/Options.cpp
        * DAnCE/RepositoryManager/RMadmin.cpp
        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp
        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
        * DAnCE/TargetManager/CmpClient.cpp
        * DAnCE/TargetManager/DomainDataManager.cpp
        * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
        * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
        * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
        * examples/BasicSP/BMDevice/BMDevice_exec.cpp
        * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
        * examples/BasicSP/EC/client.cpp
        * examples/BasicSP/EC/controller.cpp
        * examples/Display/RateGen/controller.cpp
        * examples/Hello/Sender/Sender_exec.cpp
        * examples/Hello/Sender/starter.cpp
        * examples/Swapping/Receiver/Receiver_exec.cpp
        * examples/Swapping/Sender/Sender_exec.cpp
        * examples/Swapping/Sender/Sender_exec_1.cpp
        * examples/Swapping/Sender/Sender_exec_2.cpp
        * examples/Swapping/Sender/starter.cpp
        * performance-tests/Benchmark/Multi_Threaded/client.cpp
        * performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp
        * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
        * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
        * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
        * tools/Config_Handlers/DnC_Dump.cpp
        * tools/Config_Handlers/DnC_Dump_T.cpp
        * tools/Config_Handlers/IDD_Handler.cpp
        * tools/Config_Handlers/MDD_Handler.cpp
        * tools/IDL3_to_XMI/be_helper.cpp
          Updated debug statements

44 files changed, 209 insertions, 171 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index ee60a150479..5d7016f6239 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,50 @@
+Sun Feb 22 07:27:18 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/ComponentServer/CIAO_ComponentServer.cpp
+        * ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
+        * ciao/Containers/Container_Base.cpp
+        * ciao/Containers/Servant_Activator.cpp
+        * ciao/Containers/Servant_Activator.h
+        * ciao/Containers/Session/Session_Container.cpp
+        * ciao/Contexts/Context_Impl_T.cpp
+        * ciao/Server_init.cpp
+        * DAnCE/DomainApplication/Domain_Application_Impl.cpp
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
+        * DAnCE/RepositoryManager/Options.cpp
+        * DAnCE/RepositoryManager/RMadmin.cpp
+        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
+        * DAnCE/TargetManager/CmpClient.cpp
+        * DAnCE/TargetManager/DomainDataManager.cpp
+        * docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
+        * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
+        * examples/BasicSP/BMDevice/BMDevice_exec.cpp
+        * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
+        * examples/BasicSP/EC/client.cpp
+        * examples/BasicSP/EC/controller.cpp
+        * examples/Display/RateGen/controller.cpp
+        * examples/Hello/Sender/Sender_exec.cpp
+        * examples/Hello/Sender/starter.cpp
+        * examples/Swapping/Receiver/Receiver_exec.cpp
+        * examples/Swapping/Sender/Sender_exec.cpp
+        * examples/Swapping/Sender/Sender_exec_1.cpp
+        * examples/Swapping/Sender/Sender_exec_2.cpp
+        * examples/Swapping/Sender/starter.cpp
+        * performance-tests/Benchmark/Multi_Threaded/client.cpp
+        * performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp
+        * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
+        * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
+        * tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+        * tools/Config_Handlers/DnC_Dump.cpp
+        * tools/Config_Handlers/DnC_Dump_T.cpp
+        * tools/Config_Handlers/IDD_Handler.cpp
+        * tools/Config_Handlers/MDD_Handler.cpp
+        * tools/IDL3_to_XMI/be_helper.cpp
+          Updated debug statements
+
 Sun Feb 22 07:15:18 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * examples/Hello/descriptors/run_test.pl
diff --git a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
index 47cabb79cba..b9adc2da088 100644
--- a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
@@ -96,7 +96,7 @@ namespace DAnCE
             throw Deployment::StartError();
           }
         DANCE_DEBUG ((LM_TRACE, DLINFO "DomainApplication_Impl::startLaunch - "
-                      "Application startLaunch succeeded, received %u connections \n",
+                      "Application startLaunch succeeded, received %u connections\n",
                       conn->length ()));
 
         this->node_applications_.bind (na, (*iter).ext_id_);
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index b5250b701b0..4353a4f9504 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -74,7 +74,7 @@ namespace
     if (properties.find (name, any) == 0)
       {
         if (any >>= CORBA::Any::to_boolean(val))
-                  {      
+                  {
             return true;
                   }
         else
@@ -671,16 +671,16 @@ void
 NodeApplication_Impl::install_component (Container &cont, Instance &inst)
 {
   DANCE_TRACE( "NodeApplication_Impl::install_component");
-  
+
   const ::Deployment::MonolithicDeploymentDescription &mdd = this->plan_.implementation[inst.mdd_idx];
   const ::Deployment::InstanceDeploymentDescription &idd = this->plan_.instance[inst.idd_idx];
-  
+
   DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::install_home - "
                 "Starting installation of home %C on node %C\n",
                 idd.name.in (), idd.node.in ()));
-  
+
   this->instances_[inst.idd_idx] = &inst;
-  
+
   const char *entrypt = 0;
   get_property_value (DAnCE::COMPONENT_FACTORY, mdd.execParameter, entrypt);
 
@@ -692,12 +692,12 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst)
       throw ::Deployment::InvalidComponentExecParameter (mdd.name.in (),
                                                          "No 'component factory' property present on MDD\n");
     }
-  
+
   // @@TODO: Perhaps need better way to do this.
   Components::ConfigValues config;
   config.length (mdd.execParameter.length () + idd.configProperty.length ());
   CORBA::ULong pos (0);
-  
+
     for (CORBA::ULong i = 0; i < mdd.execParameter.length (); ++i)
     {
       DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_component - "
@@ -713,7 +713,7 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst)
       config[pos++] =  new CIAO::ConfigValue_impl (idd.configProperty[i].name.in (),
                                                    idd.configProperty[i].value);
     }
-  
+
   ::CIAO::Deployment::Container_var ciao_cont = ::CIAO::Deployment::Container::_narrow (cont.ref.in ());
 
   if (CORBA::is_nil (ciao_cont.in ()))
@@ -724,7 +724,7 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst)
       throw ::Deployment::PlanError (idd.name.in (),
                                      "Hosting container does not support unhomed components.\n");
     }
-  
+
   try
     {
       DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplication_Impl::install_component - "
@@ -735,7 +735,7 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst)
       ::Components::CCMObject_var comp = ciao_cont->install_component (idd.name.in (),
                                                                        entrypt,
                                                                        config);
-      
+
       if (CORBA::is_nil (comp))
         {
           DANCE_ERROR ((LM_ERROR, DLINFO "NodeApplication_Impl::install_component - "
@@ -749,9 +749,9 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst)
       DANCE_DEBUG ((LM_INFO, DLINFO  "NodeApplication_Impl::install_component - "
                     "Component '%C' on node '%C' successfully installed\n",
                     idd.name.in (), idd.node.in ()));
-      
+
       inst.ref = CORBA::Object::_narrow (comp);
-      
+
       DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplication_Impl::install_component - "
                     "Populating attributes for home %C\n",
                     idd.name.in ()));
@@ -1733,8 +1733,8 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
       for (unsigned int i = 0; i < providedReference.length(); ++i)
         {
           /*DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - "
-                       "loop on all connections iteration %d for connection %C\n", 
-                       i, 
+                       "loop on all connections iteration %d for connection %C\n",
+                       i,
                        providedReference[i].name.in()));*/
 
           if (name.compare (providedReference[i].name.in()) == 0)
@@ -1746,7 +1746,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
                     case Deployment::Facet:
                       {
                         DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - "
-                                     "set for facet %C \n", name.c_str ()));
+                                     "set for facet %C\n", name.c_str ()));
                         Components::CCMObject_var ext_inst;
                         try
                           {
@@ -1779,7 +1779,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
                             if (CORBA::is_nil (ext_inst.in()))
                               {
                                 DANCE_ERROR((LM_ERROR, DLINFO "NodeApplication_impl::finishLaunch - "
-                                             "facet for %C can't be narrowed \n", name.c_str ()));
+                                             "facet for %C can't be narrowed\n", name.c_str ()));
                                 break;
                               }
                             this->connect_receptacle_ext (ext_inst,
@@ -1801,7 +1801,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
                       }
                     case Deployment::EventConsumer:
                       {
-                        DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for consumer \n"));
+                        DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for consumer\n"));
                         Components::CCMObject_var ext_inst;
                         try
                           {
@@ -1815,7 +1815,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
                             if (CORBA::is_nil (ext_inst.in()))
                               {
                                 DANCE_ERROR((LM_ERROR, DLINFO " NodeApplication_impl::finishLaunch - "
-                                             "reference for %C can't be narrowed \n", name.c_str ()));
+                                             "reference for %C can't be narrowed\n", name.c_str ()));
                                 throw ::Deployment::InvalidConnection(conn.name.in (),
                                                                       "Couldn't narrow reference for external reference");
                                 break;
@@ -1849,7 +1849,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
                     case Deployment::SimplexReceptacle:
                       {
                         // What we should do with Cookie, returned from connect call???
-                        DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for receptacle \n"));
+                        DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for receptacle\n"));
                         this->connect_receptacle (obj.in(),
                                                   conn.internalEndpoint[0].portName.in(),
                                                   providedReference[i].endpoint[0].in());
@@ -1857,7 +1857,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
                       }
                     case Deployment::EventEmitter:
                       {
-                        DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for emitter \n"));
+                        DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for emitter\n"));
                         this->connect_emitter (obj.in(),
                                                conn.internalEndpoint[0].portName.in(),
                                                providedReference[i].endpoint[0].in());
@@ -1865,7 +1865,7 @@ NodeApplication_Impl::finishLaunch (const Deployment::Connections & providedRefe
                       }
                     case Deployment::EventPublisher:
                       {
-                        DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for publisher \n"));
+                        DANCE_DEBUG((LM_DEBUG, DLINFO "NodeApplication_impl::finishLaunch - set for publisher\n"));
                         this->connect_publisher (obj.in(),
                                                  conn.internalEndpoint[0].portName.in(),
                                                  providedReference[i].endpoint[0].in());
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index deb395ceccc..664355b300b 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -11,25 +11,25 @@
 
 using namespace DAnCE;
 
-NodeApplicationManager_Impl::NodeApplicationManager_Impl (CORBA::ORB_ptr orb, 
-                                                          PortableServer::POA_ptr poa, 
-                                                          const Deployment::DeploymentPlan& plan, 
-                                                          RedirectionService & redirection, 
+NodeApplicationManager_Impl::NodeApplicationManager_Impl (CORBA::ORB_ptr orb,
+                                                          PortableServer::POA_ptr poa,
+                                                          const Deployment::DeploymentPlan& plan,
+                                                          RedirectionService & redirection,
                                                           const ACE_CString& node_name,
                                                           const PROPERTY_MAP &properties)
-    : plan_ (plan), 
-      orb_ (CORBA::ORB::_duplicate (orb)), 
-      poa_ (PortableServer::POA::_duplicate (poa)), 
-      application_ (0), 
+    : plan_ (plan),
+      orb_ (CORBA::ORB::_duplicate (orb)),
+      poa_ (PortableServer::POA::_duplicate (poa)),
+      application_ (0),
       redirection_ (redirection),
       node_name_ (node_name),
       properties_ ()
 {
   DANCE_TRACE (DLINFO "NodeApplicationManager_Impl::NodeApplicationManager_Impl");
-  
+
   DANCE_DEBUG((LM_DEBUG, DLINFO " NodeApplicationManager_Impl::NodeApplicationManager_Impl - "
-               "Initializing for node '%s' and plan '%s' starting...\n", 
-               node_name.c_str(), 
+               "Initializing for node '%s' and plan '%s' starting...\n",
+               node_name.c_str(),
                plan_.UUID.in()));
   this->register_plan();
 
@@ -46,7 +46,7 @@ NodeApplicationManager_Impl::NodeApplicationManager_Impl (CORBA::ORB_ptr orb,
 NodeApplicationManager_Impl::~NodeApplicationManager_Impl()
 {
   DANCE_TRACE (DLINFO "NodeApplicationManager_Impl::~NodeApplicationManager_Impl");
-  
+
   try
     {
       if (this->application_ != 0)
@@ -54,7 +54,7 @@ NodeApplicationManager_Impl::~NodeApplicationManager_Impl()
           CORBA::Object_var app = this->poa_->servant_to_reference (this->application_);
           PortableServer::ObjectId_var id = this->poa_->reference_to_id (app);
           this->poa_->deactivate_object (id);
-          
+
           delete this->application_;
           this->application_ = 0;
         }
@@ -71,7 +71,7 @@ NodeApplicationManager_Impl::startLaunch (const Deployment::Properties &,
                                           Deployment::Connections_out providedReference)
 {
   DANCE_TRACE (DLINFO "NodeApplicationManager_Impl::startLaunch");
-  
+
   // Creating NodeApplication object
   DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplicationManager_impl::startLaunch - "
                "Initializing NodeApplication\n"));
@@ -85,7 +85,7 @@ NodeApplicationManager_Impl::startLaunch (const Deployment::Properties &,
                     CORBA::NO_MEMORY ());
 
   DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplicationManager_impl::startLaunch - "
-               "Instructing NodeApplication to initialize components. \n"));
+               "Instructing NodeApplication to initialize components.\n"));
   this->application_->init_components();
 
   DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplicationManager_impl::startLaunch - "
@@ -108,17 +108,17 @@ void
 NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr application)
 {
   DANCE_TRACE (DLINFO "NodeApplicationManager_Impl::destroyApplication");
-  
+
   try
   {
     if (!application->_is_equivalent (this->poa_->servant_to_reference (this->application_)))
       {
         DANCE_ERROR((LM_ERROR, DLINFO "NodeApplicationManager_Impl::destroyApplication - "
-                     "application is equivalent to current application \n"));
+                     "application is equivalent to current application\n"));
         throw ::Deployment::StopError();
       }
     this->redirection_.unregister (this->node_name_, this->plan_.UUID.in());
-    
+
     CORBA::Any val;
 
     if (this->properties_.find (DAnCE::STANDALONE_NM,
@@ -126,21 +126,21 @@ NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr app
       {
         DANCE_DEBUG ((LM_TRACE, DLINFO "NodeApplicationManager_Impl::destroyApplication - "
                       "Found STANDALONE_NM property\n"));
-        
+
         CORBA::Boolean standalone (false);
-        
+
         val >>= CORBA::Any::to_boolean (standalone);
         if (standalone)
           {
             DANCE_DEBUG ((LM_DEBUG, DLINFO "NodeApplicationManager_Impl::destroyApplication - "
                           "Acting as a standalone NM, passivating and removing installed components\n"));
-            
+
             this->application_->passivate_components ();
             this->application_->remove_components ();
           }
       }
-    
-    
+
+
     PortableServer::ObjectId_var id = this->poa_->reference_to_id (application);
     this->poa_->deactivate_object (id);
 
@@ -157,7 +157,7 @@ NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr app
   }
   catch (CORBA::UserException &e)
   {
-    DANCE_ERROR((LM_ERROR, DLINFO "NodeApplicationManager_Impl::destroyApplication failed with UserException %s(%s) \"%s\"\n", 
+    DANCE_ERROR((LM_ERROR, DLINFO "NodeApplicationManager_Impl::destroyApplication failed with UserException %s(%s) \"%s\"\n",
                  e._name(), e._rep_id(), e._info().c_str()));
     throw Deployment::StopError(e._name(), e._info().c_str());
   }
@@ -168,11 +168,11 @@ NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr app
   }
 }
 
-void 
+void
 NodeApplicationManager_Impl::register_plan(void)
 {
   DANCE_TRACE(DLINFO "NodeApplicationManager_Impl::register_plan()");
-  
+
   this->redirection_.registration_start (this->node_name_, this->plan_.UUID.in());
   DANCE_DEBUG((LM_TRACE, DLINFO "NodeApplicationManager_Impl::register_plan - registering objects...\n"));
   for (unsigned int i = 0; i < this->plan_.instance.length(); i++)
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
index d1f6d0ce32b..0e19cfcd786 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
@@ -67,7 +67,7 @@ Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc,
         }
     }
   DANCE_DEBUG ((LM_TRACE, DLINFO "Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - "
-                "Obtained Execution Manager ref \n"));
+                "Obtained Execution Manager ref\n"));
 }
 
 Plan_Launcher_Base_Impl::~Plan_Launcher_Base_Impl()
@@ -77,7 +77,7 @@ Plan_Launcher_Base_Impl::~Plan_Launcher_Base_Impl()
 void Plan_Launcher_Base_Impl::execute()
 {
   DANCE_TRACE ("Plan_Launcher_Base_Impl::execute - ");
-  
+
   if (this->mode_ & MODE_START_PLAN)
     {
       size_t sz = this->cdr_plan_urls_.size();
@@ -114,7 +114,7 @@ const char *
 Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan)
 {
   DANCE_TRACE ("Plan_Launcher_Base_Impl::launch_plan");
-  
+
   try
     {
       DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - Starting...\n"));
@@ -125,7 +125,7 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan)
           return 0;
         }
 
-      DANCE_DEBUG ( (LM_DEBUG, DLINFO 
+      DANCE_DEBUG ( (LM_DEBUG, DLINFO
               ACE_TEXT ("Plan_Launcher_Base_Impl::launch_plan - ")
               ACE_TEXT ("about to call this->em_->preparePlan\n")));
 
@@ -161,7 +161,7 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan)
       this->write_dam_ior (dam.in());
 
       DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::launch_plan - "
-                    "Obtained DAM ref \n"));
+                    "Obtained DAM ref\n"));
 
       ::Deployment::Properties_var properties;
       ACE_NEW_RETURN (properties,
@@ -306,7 +306,7 @@ Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan)
 bool Plan_Launcher_Base_Impl::teardown_plan(const char *uuid)
 {
   DANCE_TRACE ("Plan_Launcher_Base_Impl::teardown_plan");
-  
+
   try
     {
       DANCE_DEBUG ((LM_DEBUG, DLINFO "Plan_Launcher_Base_Impl::teardown_plan - looking for uuid=\"%s\"\n", uuid));
@@ -346,7 +346,7 @@ bool Plan_Launcher_Base_Impl::teardown_plan(const char *uuid)
   return true;
 }
 
-void 
+void
 Plan_Launcher_Base_Impl::teardown_plan(::Deployment::DomainApplicationManager_ptr dam)
 {
   DANCE_DEBUG ((LM_DEBUG, DLINFO
@@ -383,7 +383,7 @@ void Plan_Launcher_Base_Impl::usage(const ACE_TCHAR* program)
       DANCE_ERROR ( (LM_ERROR, ACE_TEXT ("[(%P|%t) Executor] Usage: %s <options>\n"), program));
     }
 
-  DANCE_ERROR ( (LM_ERROR, ACE_TEXT ("Options : \n")
+  DANCE_ERROR ( (LM_ERROR, ACE_TEXT ("Options :\n")
           ACE_TEXT ("-k|--em-ior <EXECUTION_MANAGER_IOR>")
           ACE_TEXT (" : Default file://em.ior\n")
           ACE_TEXT ("-d|--read-cdr-plan <CDR_DEPLOYMENT_PLAN_URL>\n")
@@ -507,7 +507,7 @@ void Plan_Launcher_Base_Impl::write_dam_ior(
     }
 }
 
-void 
+void
 Plan_Launcher_Base_Impl::stop_plan()
 {
   bool stopped = false;
@@ -687,7 +687,7 @@ Deployment::DeploymentPlan*Plan_Launcher_Base_Impl::read_cdr_plan_file(
   return res;
 }
 
-void 
+void
 Plan_Launcher_Base_Impl::write_cdr_plan_file(const char * filename,
     const Deployment::DeploymentPlan & plan)
 {
@@ -803,8 +803,8 @@ Plan_Launcher_Base_Impl::expand_env_vars (const char * s)
             else
               {
                 DANCE_DEBUG ((LM_WARNING, DLINFO "Plan_Launcher_Base_Impl::expand_env_vars - "
-                              "Envvar can not be parsed out at %i in \"%s\"", 
-                              pos_start, 
+                              "Envvar can not be parsed out at %i in \"%s\"",
+                              pos_start,
                               src.c_str()));
               }
           }
diff --git a/CIAO/DAnCE/RepositoryManager/Options.cpp b/CIAO/DAnCE/RepositoryManager/Options.cpp
index a9fd5a67d3d..12af68b7013 100644
--- a/CIAO/DAnCE/RepositoryManager/Options.cpp
+++ b/CIAO/DAnCE/RepositoryManager/Options.cpp
@@ -124,7 +124,7 @@ void Options::usage (void)
   -a <names by type> \n\
   [-t <:type>] \n\
   -N <all names> \n\
-  -T <all types> \n"));
+  -T <all types>\n"));
 }
 
 Options::Options (void)
diff --git a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
index 8f5ed3924d9..7b34082daaf 100644
--- a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
@@ -239,7 +239,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Unknown exception \n");
+      ex._tao_print_exception ("Unknown exception\n");
       return -1;
     }
 
diff --git a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
index 7d8c6f2f256..41a247cb717 100644
--- a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
+++ b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
@@ -73,7 +73,7 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
   if (uf==0)
     {
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("There is some problem in opening"
-                 " %s or %s.zip using unzOpen \n"), zip_name, zip_name));
+                 " %s or %s.zip using unzOpen\n"), zip_name, zip_name));
       return 1;
     }
   unz_global_info gi;
@@ -81,7 +81,7 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
   int err = unzGetGlobalInfo(uf, &gi);
   if (err!=UNZ_OK)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed while trying"
-               " to get global information about zipfile \n"), err));
+               " to get global information about zipfile\n"), err));
   /* gi.number_entry corresponds to the number of directory entries
      in the zip file */
   for (uLong i=0;i<gi.number_entry;i++)
@@ -213,14 +213,14 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
   if (err!=UNZ_OK)
     {
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("unzGetGlobalInfo failed to get global"
-                                    " information about zipfile \n"), err));
+                                    " information about zipfile\n"), err));
       return false;
     }
   err =unzGoToFirstFile(uf);
   if (err!=UNZ_OK)
     {
       ACE_DEBUG((LM_DEBUG,ACE_TEXT("error %d with zipfile in"
-                 " unzGoToFirstFile \n"), err));
+                 " unzGoToFirstFile\n"), err));
       return false;
     }
   /* read each entry of zip file, create directory structure if it is
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
index 4f7a5ef45f8..e0b86df1028 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
@@ -106,7 +106,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "extern \"C\" ::Components::HomeExecutorBase_ptr %s (void);\n",
                            impl_infos[i].impl_infos[j].executor_entrypt.in ());
           ACE_OS::fprintf (fp,
-                           "extern \"C\" ::PortableServer::Servant %s \n",
+                           "extern \"C\" ::PortableServer::Servant %s\n",
                            impl_infos[i].impl_infos[j].servant_entrypt.in ());
           ACE_OS::fprintf (fp,
                            "\t\t(::Components::HomeExecutorBase_ptr p,\n");
@@ -130,7 +130,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_OS::fprintf (fp, "  ::CIAO::ServantFactory servant_fptr_;\n");
   ACE_OS::fprintf (fp, "};\n");
   ACE_OS::fprintf (fp, "/// Homes\n");
-  ACE_OS::fprintf (fp, "HomeAttributes homes_table[]= \n");
+  ACE_OS::fprintf (fp, "HomeAttributes homes_table[]=\n");
   ACE_OS::fprintf (fp, "{\n");
 
   num_containers = impl_infos.length ();
diff --git a/CIAO/DAnCE/TargetManager/CmpClient.cpp b/CIAO/DAnCE/TargetManager/CmpClient.cpp
index 64b1b3f65cb..ce88139a503 100644
--- a/CIAO/DAnCE/TargetManager/CmpClient.cpp
+++ b/CIAO/DAnCE/TargetManager/CmpClient.cpp
@@ -112,7 +112,7 @@ namespace TM_Tester
       }
       catch(CORBA::Exception &)
       {
-        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception \n"));
+        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception\n"));
         ACE_ERROR ((LM_ERROR ,"Error:TargetManager:Exception in TargetManager call\n"));
       }
 
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
index 69ca5d6b9c7..684d8332115 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
@@ -137,7 +137,7 @@ int CIAO::DomainDataManager::call_all_node_managers ()
                   "TargetM (%P|%t) DomainDataManager.cpp -"
                   "CIAO::DomainDataManager::call_all_node_managers -"
                   "ERROR while trying to initialize after reading "
-                  "node details DAT file \n"));
+                  "node details DAT file\n"));
       return 0;
     }
 
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp
index b4b26a71154..40b454e684c 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp
@@ -304,7 +304,7 @@ namespace CIAO
         {
           CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::run - Starting ORB without RT support\n"));
           this->svc ();
-          CIAO_DEBUG ((LM_INFO, CLINFO "ComponentServer_Task::run - ORB has shutdown, terminating ComponentServer \n"));
+          CIAO_DEBUG ((LM_INFO, CLINFO "ComponentServer_Task::run - ORB has shutdown, terminating ComponentServer\n"));
         }
     }
 
@@ -393,7 +393,7 @@ namespace CIAO
       CIAO_TRACE ("ComponentServer_Task::usage");
       // Shouldn't be subject to CIAO's logging policy
       ACE_ERROR ((LM_EMERGENCY, "Usage: CIAO_ComponentServer <options>\n"
-                   "Options: \n"
+                   "Options:\n"
                    "\t-h|--help\t\t\t\tShow help\n"
                    "\t-l|--log-level <level>\t\t\tSets log level (default 5). 1 - most detailed.\n"
                    "\t-u|--uuid <uuid> \t\t\tSets UUID of spawned component server (required)\n"
diff --git a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
index 97f395947d4..ecd2c0003cc 100755
--- a/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
+++ b/CIAO/ciao/ComponentServer/Configurators/Basic_Config_Manager.cpp
@@ -208,7 +208,7 @@ namespace CIAO
 
             if (! CORBA::is_nil (retv.in ()))
               CIAO_DEBUG ((LM_DEBUG,
-                          "NAConfigManager::Create NetworkPriority policy \n"));
+                          "NAConfigManager::Create NetworkPriority policy\n"));
           }
           break;
 
diff --git a/CIAO/ciao/Containers/Container_Base.cpp b/CIAO/ciao/Containers/Container_Base.cpp
index f34dfe6986a..84d6abfb3af 100644
--- a/CIAO/ciao/Containers/Container_Base.cpp
+++ b/CIAO/ciao/Containers/Container_Base.cpp
@@ -41,7 +41,7 @@ namespace CIAO
       {
         CIAO_ERROR ((LM_DEBUG, CLINFO
                     "Container_i::get_receptacle_policy - No policies found "
-                    "for the receptacle %s\n",
+                    "for the receptacle %C\n",
                     name));
       }
 
diff --git a/CIAO/ciao/Containers/Servant_Activator.cpp b/CIAO/ciao/Containers/Servant_Activator.cpp
index 8f2355a6bbd..d984b9c0ce3 100644
--- a/CIAO/ciao/Containers/Servant_Activator.cpp
+++ b/CIAO/ciao/Containers/Servant_Activator.cpp
@@ -78,7 +78,7 @@ namespace CIAO
 
     CIAO_DEBUG ((LM_INFO, CLINFO
                 "Servant_Activator_i::incarnate, "
-                "Attempting to activate port name [%C] \n",
+                "Attempting to activate port name [%C]\n",
                 str.in ()));
 
     {
@@ -101,7 +101,7 @@ namespace CIAO
             {
                 CIAO_ERROR ((LM_ERROR, CLINFO
                             "Servant_Activator_i::incarnate (),"
-                            " value from the array is null \n"));
+                            " value from the array is null\n"));
               continue;
             }
 
@@ -187,7 +187,7 @@ namespace CIAO
                     "Servant_Activator_i::"
                     "register_port_activator"
         " with port name [%C],"
-                    " the slot_index_ is [%d] \n",
+                    " the slot_index_ is [%d]\n",
                     pa->name (),
                     this->slot_index_));
 
diff --git a/CIAO/ciao/Containers/Servant_Activator.h b/CIAO/ciao/Containers/Servant_Activator.h
index 19eca30ae49..92be5f95749 100644
--- a/CIAO/ciao/Containers/Servant_Activator.h
+++ b/CIAO/ciao/Containers/Servant_Activator.h
@@ -26,11 +26,6 @@
 #include "tao/LocalObject.h"
 #include "ciao/Containers/CIAO_Servant_ActivatorC.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 namespace CIAO
 {
   class Port_Activator;
@@ -99,10 +94,6 @@ namespace CIAO
   };
 }
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 
 #endif /*CIAO_SERVANT_ACTIVATOR_H*/
diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp
index 94d2fa899b5..f0ddfa8e583 100644
--- a/CIAO/ciao/Containers/Session/Session_Container.cpp
+++ b/CIAO/ciao/Containers/Session/Session_Container.cpp
@@ -226,7 +226,7 @@ namespace CIAO
     HomeFactory hcreator = 0;
     HomeServantFactory screator = 0;
 
-    if (this->static_config_flag_ == false)
+    if (!this->static_config_flag_)
       {
         CIAO_DEBUG ((LM_DEBUG, CLINFO
                     "Session_Container::install_home - "
@@ -241,9 +241,6 @@ namespace CIAO
                     "Servant library [%C] with entrypoint [%C]\n",
                     servant_artifact, servant_entrypoint));
 
-        ACE_DLL executor_dll;
-        ACE_DLL servant_dll;
-
         if (primary_artifact == 0 || servant_artifact == 0)
           {
             ACE_CString exception;
@@ -266,6 +263,9 @@ namespace CIAO
             throw Components::Deployment::UnknownImplId ();
           }
 
+        ACE_DLL executor_dll;
+        ACE_DLL servant_dll;
+
         if (executor_dll.open (primary_artifact,
                                ACE_DEFAULT_SHLIB_MODE,
                                0) != 0)
@@ -275,7 +275,7 @@ namespace CIAO
 
             CIAO_ERROR ((LM_ERROR, CLINFO
                         "Session_Container::install_home -"
-                        "ERROR in opening the executor DLL [%C] \n",
+                        "ERROR in opening the executor DLL [%C]\n",
                         primary_artifact));
 
             throw Components::Deployment::UnknownImplId ();
@@ -294,7 +294,7 @@ namespace CIAO
 
             CIAO_ERROR ((LM_ERROR, CLINFO
                         "Session_Container::install_home -"
-                        "ERROR in opening the servant DLL [%C] \n",
+                        "ERROR in opening the servant DLL [%C]\n",
                         servant_artifact));
 
             throw Components::Deployment::UnknownImplId ();
@@ -313,7 +313,7 @@ namespace CIAO
                 CIAO_ERROR ((LM_ERROR, CLINFO
                             "Session_Container::install_home -"
                             "ERROR in opening the executor entry point "
-                            "for executor DLL [%C] \n",
+                            "for executor DLL [%C]\n",
                             primary_artifact));
                 error += primary_artifact;
               }
@@ -322,7 +322,7 @@ namespace CIAO
                 CIAO_ERROR ((LM_ERROR, CLINFO
                             "Session_Container::install_home -"
                             "ERROR in opening the servant entry point "
-                            "for servant DLL [%C] \n",
+                            "for servant DLL [%C]\n",
                             servant_artifact));
                 error += servant_artifact;
               }
@@ -399,7 +399,7 @@ namespace CIAO
       {
         CIAO_ERROR ((LM_ERROR, CLINFO
                     "Session_Container::install_hoe - "
-                    "Home executor factory failed. \n"));
+                    "Home executor factory failed.\n"));
         throw Components::Deployment::InstallationFailure ();
       }
 
@@ -448,7 +448,7 @@ namespace CIAO
     ComponentFactory ccreator = 0;
     ComponentServantFactory screator = 0;
 
-    if (this->static_config_flag_ == false)
+    if (!this->static_config_flag_)
       {
         CIAO_DEBUG ((LM_DEBUG, CLINFO
                     "Session_Container::install_component - "
@@ -496,7 +496,7 @@ namespace CIAO
 
             CIAO_ERROR ((LM_ERROR, CLINFO
                         "Session_Container::install_component -"
-                        "ERROR in opening the executor DLL [%C] \n",
+                        "ERROR in opening the executor DLL [%C]\n",
                         primary_artifact));
 
             throw Components::Deployment::UnknownImplId ();
@@ -514,7 +514,7 @@ namespace CIAO
 
             CIAO_ERROR ((LM_ERROR, CLINFO
                         "Session_Container::install_component -"
-                        "ERROR in opening the servant DLL [%C] \n",
+                        "ERROR in opening the servant DLL [%C]\n",
                         servant_artifact));
 
             throw Components::Deployment::UnknownImplId ();
@@ -532,7 +532,7 @@ namespace CIAO
                 CIAO_ERROR ((LM_ERROR, CLINFO
                             "Session_Container::install_component -"
                             "ERROR in opening the executor entry point "
-                            "for executor DLL [%C] \n",
+                            "for executor DLL [%C]\n",
                             primary_artifact));
                 error += primary_artifact;
               }
@@ -541,7 +541,7 @@ namespace CIAO
                 CIAO_ERROR ((LM_ERROR, CLINFO
                             "Session_Container::install_component -"
                             "ERROR in opening the servant entry point "
-                            "for servant DLL [%C] \n",
+                            "for servant DLL [%C]\n",
                             servant_artifact));
                 error += servant_artifact;
               }
@@ -621,7 +621,7 @@ namespace CIAO
       {
         CIAO_ERROR ((LM_ERROR, CLINFO
                     "Session_Container::install_component - "
-                    "Component executor factory failed. \n"));
+                    "Component executor factory failed.\n"));
         throw Components::Deployment::InstallationFailure ();
       }
 
diff --git a/CIAO/ciao/Contexts/Context_Impl_T.cpp b/CIAO/ciao/Contexts/Context_Impl_T.cpp
index 630b0a0234f..f3afa79af0e 100644
--- a/CIAO/ciao/Contexts/Context_Impl_T.cpp
+++ b/CIAO/ciao/Contexts/Context_Impl_T.cpp
@@ -44,7 +44,7 @@ namespace CIAO
           }
         catch (const CORBA::Exception& ex)
           {
-            ex._tao_print_exception ("Caught Exception \n");
+            ex._tao_print_exception ("Caught Exception\n");
             return CORBA::Object::_nil ();
           }
 
diff --git a/CIAO/ciao/Server_init.cpp b/CIAO/ciao/Server_init.cpp
index 3294c9ff9f8..591dd2bd8a0 100644
--- a/CIAO/ciao/Server_init.cpp
+++ b/CIAO/ciao/Server_init.cpp
@@ -49,7 +49,7 @@ namespace CIAO
         {
           CIAO_ERROR ((LM_WARNING, CLINFO
                       "NameUtility::bind_name - "
-                      "called with null name, aborting registration. \n"));
+                      "called with null name, aborting registration.\n"));
           return false;
         }
 
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
index 652c01e45eb..1160135006d 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBrokerDriver.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                           "usage:  %s\n"
-                          "-k <Broker IOR> (default is file:\\broker.ior) \n"
+                          "-k <Broker IOR> (default is file:\\broker.ior)\n"
                           "-s <stock name you wish to subscribe>\n"
                           "-u <stock name you wish to unsubscribe>\n"
                           "\n",
@@ -100,7 +100,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception ("Who is the culprit \n");
+    ex._tao_print_exception ("Who is the culprit\n");
     ACE_ERROR_RETURN ((LM_ERROR,
                         "Uncaught CORBA exception\n"),
                       1);
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
index 5f456333d6f..8b0e0d34446 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributorDriver.cpp
@@ -46,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            "usage:  %s\n"
                            "-o (Start the distribution service)\n"
                            "-f (Stop the distribution service)\n"
-                           "-k <Distributor IOR> (default is file:\\distributor.ior) \n"
+                           "-k <Distributor IOR> (default is file:\\distributor.ior)\n"
                            "-r <broadcast frequency in Hertz> (default is 2)\n"
                            "\n",
                            argv [0]),
@@ -105,7 +105,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception ("Who is the culprit \n");
+    ex._tao_print_exception ("Who is the culprit\n");
     ACE_ERROR_RETURN ((LM_ERROR,
                         "Uncaught CORBA exception\n"),
                       1);
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
index e30388511ce..e5bd00016df 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -32,10 +32,10 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *)
 {
 
   ACE_DEBUG ((LM_EMERGENCY,
-              "BMClosedED - Doing computations \n"));
-  
+              "BMClosedED - Doing computations\n"));
+
   ACE_DEBUG ((LM_EMERGENCY,
-              "BMClosedED - Doing data fetch \n"));
+              "BMClosedED - Doing data fetch\n"));
 
   // Refresh position
   BasicSP::ReadData_var dat
@@ -44,7 +44,7 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *)
   if (CORBA::is_nil (dat.in ()))
     {
       ACE_DEBUG ((LM_EMERGENCY,
-                  "BMClosedED - got nil from get_connection \n"));
+                  "BMClosedED - got nil from get_connection\n"));
 
       throw CORBA::BAD_INV_ORDER ();
     }
@@ -53,7 +53,7 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *)
     dat->get_data ();
 
   ACE_DEBUG ((LM_EMERGENCY,
-              "BMClosedED - Display data is [%s] \n",
+              "BMClosedED - Display data is [%s]\n",
               str.in ()));
 
   if (ACE_OS::strcmp (str.in (), "BM DEVICE DATA") == 0)
@@ -120,7 +120,7 @@ create_BasicSP_BMClosedED_Impl (void)
 {
   ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
-  
+
   ACE_NEW_RETURN (retval,
                   MyImpl::BMClosedED_exec_i,
                   ::Components::EnterpriseComponent::_nil ());
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
index dcd7c95a59d..d6fa358f107 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -31,7 +31,7 @@ MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *)
   BasicSP::DataAvailable_var event = new OBV_BasicSP::DataAvailable;
 
   ACE_DEBUG ((LM_EMERGENCY,
-              "BMDevice, received a timeout from EC \n"));
+              "BMDevice, received a timeout from EC\n"));
 
   this->context_->push_data_available (event);
 }
@@ -84,11 +84,11 @@ create_BasicSP_BMDevice_Impl (void)
 {
   ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
-  
+
   ACE_NEW_RETURN (retval,
                   MyImpl::BMDevice_exec_i,
                   ::Components::EnterpriseComponent::_nil ());
-  
+
   return retval;
 }
 
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
index b8e9e543408..93bd5b536cd 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
@@ -23,10 +23,10 @@ MyImpl::BMDisplay_exec_i::push_data_ready (
   ACE_UNUSED_ARG (ev);
 
   ACE_DEBUG ((LM_EMERGENCY,
-              "BMDisplay - Doing computations \n"));
-  
+              "BMDisplay - Doing computations\n"));
+
   ACE_DEBUG ((LM_EMERGENCY,
-              "BMDisplay - Doing data fetch \n"));
+              "BMDisplay - Doing data fetch\n"));
   // Refresh position
   BasicSP::ReadData_var dat
     = this->context_->get_connection_comp_data ();
@@ -38,7 +38,7 @@ MyImpl::BMDisplay_exec_i::push_data_ready (
     dat->get_data ();
 
   ACE_DEBUG ((LM_EMERGENCY,
-              "BMDisplay - Display data is [%s] \n",
+              "BMDisplay - Display data is [%s]\n",
               str.in ()));
 
 }
@@ -92,11 +92,11 @@ create_BasicSP_BMDisplay_Impl (void)
 {
   ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
-  
+
   ACE_NEW_RETURN (retval,
                   MyImpl::BMDisplay_exec_i,
                   ::Components::EnterpriseComponent::_nil ());
-  
+
   return retval;
 }
 
diff --git a/CIAO/examples/BasicSP/EC/client.cpp b/CIAO/examples/BasicSP/EC/client.cpp
index 80165cd827d..ace0a8c1209 100644
--- a/CIAO/examples/BasicSP/EC/client.cpp
+++ b/CIAO/examples/BasicSP/EC/client.cpp
@@ -52,7 +52,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Who is the culprit \n");
+      ex._tao_print_exception ("Who is the culprit\n");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Uncaught CORBA exception\n"),
                         1);
diff --git a/CIAO/examples/BasicSP/EC/controller.cpp b/CIAO/examples/BasicSP/EC/controller.cpp
index 40a27d1e58e..a12658e11f9 100644
--- a/CIAO/examples/BasicSP/EC/controller.cpp
+++ b/CIAO/examples/BasicSP/EC/controller.cpp
@@ -116,7 +116,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Who is the culprit \n");
+      ex._tao_print_exception ("Who is the culprit\n");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Uncaught CORBA exception\n"),
                         1);
diff --git a/CIAO/examples/Display/RateGen/controller.cpp b/CIAO/examples/Display/RateGen/controller.cpp
index 311ce0a1419..0eb9394eaee 100644
--- a/CIAO/examples/Display/RateGen/controller.cpp
+++ b/CIAO/examples/Display/RateGen/controller.cpp
@@ -112,7 +112,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Who is the culprit \n");
+      ex._tao_print_exception ("Who is the culprit\n");
       cerr << "Uncaught CORBA exception" << endl;
       return 1;
     }
diff --git a/CIAO/examples/Hello/Sender/Sender_exec.cpp b/CIAO/examples/Hello/Sender/Sender_exec.cpp
index 21cf29d8ece..70190fc0dfe 100644
--- a/CIAO/examples/Hello/Sender/Sender_exec.cpp
+++ b/CIAO/examples/Hello/Sender/Sender_exec.cpp
@@ -165,7 +165,7 @@ namespace CIDL_Sender_Impl
   ::Components::EnterpriseComponent_ptr
   SenderHome_exec_i::create ()
   {
-    ACE_DEBUG ((LM_EMERGENCY, "(%P|%t) creating SenderHome \n"));
+    ACE_DEBUG ((LM_EMERGENCY, "(%P|%t) creating SenderHome\n"));
 
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp
index 3900c541fc1..aa86af6b0ec 100644
--- a/CIAO/examples/Hello/Sender/starter.cpp
+++ b/CIAO/examples/Hello/Sender/starter.cpp
@@ -81,7 +81,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Unknown exception \n");
+      ex._tao_print_exception ("Unknown exception\n");
       return -1;
     }
 
diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp b/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
index 89de7e57c11..6a8e0405bfa 100644
--- a/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
+++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
@@ -43,7 +43,7 @@ namespace CIDL_Receiver_Impl
   {
     //Get the message from the Sender first.
     ACE_DEBUG ((LM_DEBUG,
-                "Receiver - Informed by the Sender \n"));
+                "Receiver - Informed by the Sender\n"));
 
     Hello::ReadMessage_var rev
       = this->context_->get_connection_read_message
@@ -58,7 +58,7 @@ namespace CIDL_Receiver_Impl
       rev->get_message ();
 
     ACE_DEBUG ((LM_DEBUG,
-                "Receiver - Got message from the server [%s] \n",
+                "Receiver - Got message from the server [%s]\n",
                 str.in () ));
   }
 
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.cpp b/CIAO/examples/Swapping/Sender/Sender_exec.cpp
index dc7463e2a1b..33869f3d770 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec.cpp
+++ b/CIAO/examples/Swapping/Sender/Sender_exec.cpp
@@ -12,7 +12,7 @@ namespace CIDL_Sender_Impl
   char*
   Message_Impl::get_message ()
   {
-    ACE_DEBUG ((LM_DEBUG, "Sender sending out message. \n"));
+    ACE_DEBUG ((LM_DEBUG, "Sender sending out message.\n"));
     return CORBA::string_dup (component_.message_.in ());
   }
 
@@ -176,7 +176,7 @@ namespace CIDL_Sender_Impl
   ::Components::EnterpriseComponent_ptr
   SenderHome_exec_i::create ()
   {
-    ACE_DEBUG ((LM_DEBUG, "%P|%t) creating SenderHome \n"));
+    ACE_DEBUG ((LM_DEBUG, "%P|%t) creating SenderHome\n"));
     return new SenderSwap_exec_i;
   }
 
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp b/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
index 22ea7888685..44983d856f7 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
@@ -9,7 +9,7 @@ namespace CIDL_Sender_Impl
   char*
   Message_Impl_1::get_message ()
   {
-    ACE_DEBUG ((LM_DEBUG, "Sender 1 sending out message. \n"));
+    ACE_DEBUG ((LM_DEBUG, "Sender 1 sending out message.\n"));
     return CORBA::string_dup (component_.message_.in ());
   }
 
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp b/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
index 75c237d2925..89332c825b2 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
@@ -8,7 +8,7 @@ namespace CIDL_Sender_Impl
   char*
   Message_Impl_2::get_message ()
   {
-    ACE_DEBUG ((LM_DEBUG, "Sender 2 sending out message. \n"));
+    ACE_DEBUG ((LM_DEBUG, "Sender 2 sending out message.\n"));
     return CORBA::string_dup (component_.message_.in ());
   }
 
diff --git a/CIAO/examples/Swapping/Sender/starter.cpp b/CIAO/examples/Swapping/Sender/starter.cpp
index bd1e533a6b5..097fd46ec4e 100644
--- a/CIAO/examples/Swapping/Sender/starter.cpp
+++ b/CIAO/examples/Swapping/Sender/starter.cpp
@@ -88,7 +88,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Unknown exception \n");
+      ex._tao_print_exception ("Unknown exception\n");
       return -1;
     }
 
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp b/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp
index a6d8d9d8202..d3c971aac80 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp
@@ -18,7 +18,7 @@ Client_Task::svc (void)
   //check if controller is non nil
   if (CORBA::is_nil (controller.in ()))
       ACE_ERROR_RETURN ((LM_DEBUG,
-                         "Nil Benchmark::Controller reference \n"),
+                         "Nil Benchmark::Controller reference\n"),
                         1);
 
   ACE_DEBUG ((LM_DEBUG, "Sending Trigger\n"));
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
index c684bcc1ebe..9cfc951f332 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
@@ -51,7 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           CORBA::is_nil (obj4.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Benchmark::RoundtripClient reference \n"),
+                             "Nil Benchmark::RoundtripClient reference\n"),
                             1);
         }
 
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
index df5339685a6..95a37181c98 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
@@ -153,6 +153,6 @@ MyImpl::RoundTripClientHome_exec_i::create ()
 extern "C" ROUNDTRIPCLIENT_EXEC_Export ::Components::HomeExecutorBase_ptr
 createRoundTripClientHome_Impl (void)
 {
-  CIAO_DEBUG ((LM_INFO, CLINFO "Creating RoundTrip_client impl \n"));
+  CIAO_DEBUG ((LM_INFO, CLINFO "Creating RoundTrip_client impl\n"));
   return new MyImpl::RoundTripClientHome_exec_i ();
 }
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
index 000d83a92ae..148ee21df79 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
@@ -13,7 +13,7 @@ LatencyTest_Impl::LatencyTest_Impl (CORBA::ORB_ptr orb)
 CORBA::Long
 LatencyTest_Impl::makeCall (CORBA::Long send_time)
 {
-  CIAO_DEBUG ((LM_DEBUG, CLINFO"Sending Time back \n"));
+  CIAO_DEBUG ((LM_DEBUG, CLINFO"Sending Time back\n"));
 
   return send_time;
 }
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
index 44ceea6235f..61e0a8c598d 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
@@ -186,7 +186,7 @@ ACE_TMAIN
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception ("Who is the culprit \n");
+    ex._tao_print_exception ("Who is the culprit\n");
     cerr << "Uncaught CORBA exception" << endl;
 
     return 1;
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index f9efb5a95a8..3bee947afd3 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -21,9 +21,9 @@ namespace Deployment
 
         for (CORBA::ULong i = 0; i < size; ++i)
           {
-            ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n",
+            ACE_DEBUG ((LM_DEBUG, "%s%s %d:\n",
                         Dump_Obj::indent(), caption, i));
-            ACE_DEBUG ((LM_DEBUG, "%s  %s: \n",
+            ACE_DEBUG ((LM_DEBUG, "%s  %s:\n",
                         Dump_Obj::indent(), str_seq[i].in ()));
           }
       }
@@ -555,7 +555,7 @@ namespace Deployment
 
     a >>= v;
 
-    ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (),
+    ACE_DEBUG ((LM_DEBUG, "%sinstance: %s\n", Dump_Obj::indent (),
                 v->instance[value].name.in ()));
   }
 
@@ -588,7 +588,7 @@ namespace Deployment
 
     a >>= v;
 
-    ACE_DEBUG ((LM_DEBUG, "%sinstance: %s \n", Dump_Obj::indent (),
+    ACE_DEBUG ((LM_DEBUG, "%sinstance: %s\n", Dump_Obj::indent (),
                 v->instance[value].name.in ()));
   }
 
@@ -706,7 +706,7 @@ namespace Deployment
 
     dump ("Name", pci.name);
     ACE_DEBUG ((LM_DEBUG,
-                "%sreferencedImplementation: \n", Dump_Obj::indent()));
+                "%sreferencedImplementation:\n", Dump_Obj::indent()));
     DnC_Dump::dump (pci.referencedImplementation);
   }
 
@@ -719,7 +719,7 @@ namespace Deployment
 
     dump ("label", comppkgdesc.label);
     dump ("UUID", comppkgdesc.UUID);
-    ACE_DEBUG ((LM_DEBUG, "%srealizes: \n", Dump_Obj::indent ()));
+    ACE_DEBUG ((LM_DEBUG, "%srealizes:\n", Dump_Obj::indent ()));
     DnC_Dump::dump (comppkgdesc.realizes); // ComponentInterfaceDescription
     dump_sequence ("configProperty", comppkgdesc.configProperty);
     dump_sequence ("implementation", comppkgdesc.implementation);
@@ -766,7 +766,7 @@ namespace Deployment
 encoded different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -777,7 +777,7 @@ encoded different type"));
         break;
 
       case CORBA::tk_void:
-        ACE_DEBUG ((LM_DEBUG, "Any value: void type encoded \n"));
+        ACE_DEBUG ((LM_DEBUG, "Any value: void type encoded\n"));
         break;
       case CORBA::tk_long:
         {
@@ -788,7 +788,7 @@ encoded different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -802,7 +802,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %u\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -816,7 +816,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %u\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -830,7 +830,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %f\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -843,7 +843,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %f\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -858,9 +858,9 @@ encoded with different type"));
             }
 
           if (temp)
-            ACE_DEBUG ((LM_DEBUG, "Any value: True \n"));
+            ACE_DEBUG ((LM_DEBUG, "Any value: True\n"));
           else
-            ACE_DEBUG ((LM_DEBUG, "Any value: False \n"));
+            ACE_DEBUG ((LM_DEBUG, "Any value: False\n"));
         }
         break;
 
@@ -873,7 +873,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %c\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -887,7 +887,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -901,7 +901,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %s\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -914,7 +914,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %l \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %l\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -928,7 +928,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %d\n", Dump_Obj::indent (),
                       temp));
         }
 
@@ -942,7 +942,7 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %c\n", Dump_Obj::indent (),
                       temp));
         }
         break;
@@ -956,11 +956,11 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-          ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
+          ACE_DEBUG ((LM_DEBUG, "%sAny value: %s\n", Dump_Obj::indent (),
                       temp));
         }
         break;
-        
+
         case CORBA::tk_enum:
         {
 /*          CORBA::Enum temp;
@@ -970,10 +970,10 @@ encoded with different type"));
 encoded with different type"));
               throw CORBA::INTERNAL ();
             }
-*/          ACE_DEBUG ((LM_DEBUG, "%sAny value: some enum \n", Dump_Obj::indent ()));
+*/          ACE_DEBUG ((LM_DEBUG, "%sAny value: some enum\n", Dump_Obj::indent ()));
         }
         break;
-        
+
       default:
         ACE_DEBUG ((LM_DEBUG, "Unknown type encoded in Any\n"));
         throw CORBA::INTERNAL ();
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp b/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp
index 6dd83b18989..0f95945fb0f 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp
+++ b/CIAO/tools/Config_Handlers/DnC_Dump_T.cpp
@@ -79,7 +79,7 @@ ACE_RCSID (Config_Handlers,
 
             for (CORBA::ULong i = 0; i < size; ++i)
               {
-                ACE_DEBUG ((LM_DEBUG, "%s%s %d: \n", Dump_Obj::indent(),
+                ACE_DEBUG ((LM_DEBUG, "%s%s %d:\n", Dump_Obj::indent(),
                             caption, i));
                 DnC_Dump::dump (seq[i]);
               }
diff --git a/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/CIAO/tools/Config_Handlers/IDD_Handler.cpp
index 6beded8c2a7..5ea8f82952e 100644
--- a/CIAO/tools/Config_Handlers/IDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/IDD_Handler.cpp
@@ -57,7 +57,7 @@ namespace CIAO
           else
             {
               ACE_DEBUG((LM_ERROR,
-                         "(%P|%t) Warning:  IDD %s has no idref \n",
+                         "(%P|%t) Warning:  IDD %s has no idref\n",
                          src.name ().c_str ()));
             }
 
@@ -71,12 +71,12 @@ namespace CIAO
             (ACE_CString (src.implementation ().idref ().id ().c_str ()), tmp);
 
           dest.implementationRef = tmp;
-          
+
           dest.configProperty.length (src.count_configProperty ());
           std::for_each (src.begin_configProperty (),
                          src.end_configProperty (),
                          Property_Functor (dest.configProperty));
-          
+
           dest.deployedResource.length (src.count_deployedResource ());
           std::for_each (src.begin_deployedResource (),
                          src.end_deployedResource (),
@@ -101,7 +101,7 @@ namespace CIAO
                       src.name ().c_str ()));
           throw Config_Error (src.name (), "Unknown exception");
         }
-            
+
       // Done!
     }
 
diff --git a/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index 7e44a95b62c..36ce5d55e69 100644
--- a/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -104,7 +104,7 @@ namespace CIAO
       else
         {
           ACE_DEBUG((LM_ERROR,
-                     "(%P|%t) Warning:  MDD %s has no idref \n",
+                     "(%P|%t) Warning:  MDD %s has no idref\n",
                      desc.name ().c_str ()));
         }
     }
diff --git a/CIAO/tools/IDL3_to_XMI/be_helper.cpp b/CIAO/tools/IDL3_to_XMI/be_helper.cpp
index bc344868064..4a7b28096c6 100644
--- a/CIAO/tools/IDL3_to_XMI/be_helper.cpp
+++ b/CIAO/tools/IDL3_to_XMI/be_helper.cpp
@@ -30,7 +30,7 @@ ACE_RCSID (be,
            "$Id$")
 
 static const char copyright[] =
-" <-- \n"
+" <--\n"
 " -*- XML -*-\n"
 "\n"
 " $I" "d$\n\n"