ChangeLogTag:Fri Nov 14 00:07:00 2003 Nanbor Wang <nanbor@cse.wustl.edu>

21 files changed, 247 insertions, 117 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 750d00fa2c3..f7efaa635bc 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,34 @@
+Fri Nov 14 00:07:00 2003  Nanbor Wang  <nanbor@cse.wustl.edu>
+
+	* ciao/CIAO_common.h:  Added guideline for checking
+	  CIAO::debug_level().
+
+	  > 0 : For component users.  Component developers are encouraged
+                to develop their own
+	  > 10 : For CIAO tools
+	  > 20 : For CIAO core.
+
+	* ciao/ServerActivator_Impl.cpp:
+	* tools/Assembly_Deployer/Assembly_Deployer.cpp:
+	* tools/Assembly_Deployer/Assembly_Impl.cpp:
+	* tools/Assembly_Deployer/Assembly_Impl.h:
+	* tools/Assembly_Deployer/Assembly_Impl.inl:
+	* tools/Assembly_Deployer/Assembly_Visitors.cpp:
+	* tools/ComponentServer/ComponentServer.cpp:
+	* tools/RTComponentServer/ComponentServer_Task.cpp:
+	* tools/RTComponentServer/RTConfig_Manager.cpp:
+	* tools/RTComponentServer/RTServer_Impl.cpp:
+	* tools/XML_Helpers/Assembly_Handlers.cpp:
+	* tools/XML_Helpers/RTConfig_Handlers.cpp:
+	* tools/XML_Helpers/Svcconf_Handler.cpp:
+	* tools/XML_Helpers/XMLHelpers.mpc:
+	* examples/OEP/Display/GPS/GPS_exec.cpp:
+	* examples/OEP/Display/GPS/GPS_tracing_exec.cpp:
+	* examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp:
+	* examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp:
+	* examples/OEP/Display/RateGen/RateGen_exec.cpp:  Adopted the use
+	  of CIAO::debug_level according to the guidelines.
+
 Thu Nov 13 00:39:17 2003  Nanbor Wang  <nanbor@cse.wustl.edu>
 
 	* ciao/CIAO_common.h:
diff --git a/TAO/CIAO/ciao/CIAO_common.h b/TAO/CIAO/ciao/CIAO_common.h
index d5dbc78f584..e933c75fe32 100644
--- a/TAO/CIAO/ciao/CIAO_common.h
+++ b/TAO/CIAO/ciao/CIAO_common.h
@@ -31,12 +31,21 @@
 
 namespace CIAO
 {
-  /// Return the debug level.  The debug level of CIAO is control by
-  /// an environment variable "CIAO_DEBUG_LEVEL".  It should be an int
-  /// value.  If it is not defined, the default debug level is 0.  The
-  /// value of debug value is evaluated on its first use and the value
-  /// is then cached.  The actual implementation of this function is in
-  /// Client_init.cpp.
+  /**
+   * Return the debug level.  The debug level of CIAO is control by
+   * an environment variable "CIAO_DEBUG_LEVEL".  It should be an int
+   * value.  If it is not defined, the default debug level is 0.  The
+   * value of debug value is evaluated on its first use and the value
+   * is then cached.  The actual implementation of this function is in
+   * Client_init.cpp.
+   *
+   * Some recommendation for using the debug_level
+   *
+   *    > 0 : For component users.  Component developers are encouraged
+   *          to develop their own
+   *   > 10 : For CIAO tools
+   *   > 20 : For CIAO core.
+   */
   CIAO_CLIENT_Export int debug_level (void);
 }
 
diff --git a/TAO/CIAO/ciao/ServerActivator_Impl.cpp b/TAO/CIAO/ciao/ServerActivator_Impl.cpp
index 73e52c28d24..24b74bbe755 100644
--- a/TAO/CIAO/ciao/ServerActivator_Impl.cpp
+++ b/TAO/CIAO/ciao/ServerActivator_Impl.cpp
@@ -164,14 +164,14 @@ CIAO::ServerActivator_Impl::init_svcconf_map (const char *filename)
             case 0:
               // All is fine.
               // Debug info:
-              if (CIAO::debug_level () > 0)
+              if (CIAO::debug_level () > 10)
                 ACE_DEBUG ((LM_DEBUG,
                             "Bound svc.conf hint \"%s\" successfully\n",
                             hint.c_str ()));
               break;
 
             case 1:
-              if (CIAO::debug_level () > 0)
+              if (CIAO::debug_level () > 10)
                 ACE_DEBUG ((LM_DEBUG,
                             "Duplication svc.conf hint \"%s\" found - ignore\n",
                             hint.c_str ()));
@@ -265,7 +265,7 @@ CIAO::ServerActivator_Impl::create_component_server (const Components::ConfigVal
                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  if (CIAO::debug_level () > 0)
+  if (CIAO::debug_level () > 10)
     ACE_DEBUG ((LM_DEBUG, "CIAO::ServerActivator_Impl::create_component_server\n"));
 
   Components::Deployment::ComponentServer_var retval;
@@ -318,7 +318,7 @@ CIAO::ServerActivator_Impl::create_component_server (const Components::ConfigVal
 
       if (svcconf_path != 0)
         {
-          if (CIAO::debug_level () > 0)
+          if (CIAO::debug_level () > 10)
             ACE_DEBUG((LM_DEBUG, "Using svcconf file: %s\n",
                        svcconf_path));
           additional_options += ACE_CString (" -ORBSvcConf ");
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp b/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp
index da25ff45580..984a2763c44 100644
--- a/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "GPS_exec.h"
+#include "CIAO_common.h"
 
 #define DISPLACEMENT 256
 
@@ -65,7 +66,8 @@ MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::set_session_context\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::set_session_context\n"));
 
   this->context_ =
     HUDisplay::CCM_GPS_Context::_narrow (ctx
@@ -82,7 +84,8 @@ MyImpl::GPS_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::ccm_activate\n"));
 }
 
 void
@@ -90,7 +93,8 @@ MyImpl::GPS_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::ccm_passivate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::ccm_passivate\n"));
 }
 
 void
@@ -98,7 +102,8 @@ MyImpl::GPS_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::ccm_remove\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::ccm_remove\n"));
 }
 
 /// Default ctor.
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.cpp b/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.cpp
index e0e2a642999..be5e0a0ab2f 100644
--- a/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS_tracing_exec.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "GPS_tracing_exec.h"
+#include "CIAO_common.h"
 
 #define DISPLACEMENT 256
 
@@ -71,7 +72,8 @@ MyImpl::GPS_tracing_exec_i::set_session_context (Components::SessionContext_ptr
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::set_session_context\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::set_session_context\n"));
 
   this->context_ =
     HUDisplay::CCM_GPS_Context::_narrow (ctx
@@ -88,7 +90,8 @@ MyImpl::GPS_tracing_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::ccm_activate\n"));
 }
 
 void
@@ -96,7 +99,8 @@ MyImpl::GPS_tracing_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::ccm_passivate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::ccm_passivate\n"));
 }
 
 void
@@ -104,7 +108,8 @@ MyImpl::GPS_tracing_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::ccm_remove\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_tracing_exec_i::ccm_remove\n"));
 }
 
 /// Default ctor.
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp
index 9ef2eee7fb8..3a48166690f 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay_exec.cpp
@@ -47,7 +47,8 @@ MyImpl::NavDisplay_exec_impl::set_session_context (Components::SessionContext_pt
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplay_exec_impl::set_session_context\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplay_exec_impl::set_session_context\n"));
 
   this->context_ =
     HUDisplay::CCM_NavDisplay_Context::_narrow (ctx
@@ -64,7 +65,8 @@ MyImpl::NavDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplay_exec_impl::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplay_exec_impl::ccm_activate\n"));
 
   // @@ This hack work around a missing feature in CIAO's assembly
   // mechanism where a Softpkg descriptor can specify it's dependency
@@ -87,7 +89,8 @@ MyImpl::NavDisplay_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplay_exec_impl::ccm_passivate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplay_exec_impl::ccm_passivate\n"));
 }
 
 void
@@ -95,7 +98,8 @@ MyImpl::NavDisplay_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplay_exec_impl::ccm_remove\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplay_exec_impl::ccm_remove\n"));
 }
 
 /// Default ctor.
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
index b422260940a..843596d130c 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "NavDisplayGUI_exec.h"
-#include "ciao/CIAO_common.h"
+#include "CIAO_common.h"
 #include <qapplication.h>
 #include <qevent.h>
 
@@ -19,13 +19,15 @@ static char *argv[] =
 MyImpl::NavDisplayGUI_exec_impl::NavDisplayGUI_exec_impl ()
 : unit_(1, "Model T3+"), loc_(50, 20, 0)
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::NavDisplayGUI_exec_impl ()\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::NavDisplayGUI_exec_impl ()\n"));
 }
 
 /// Default destructor.
 MyImpl::NavDisplayGUI_exec_impl::~NavDisplayGUI_exec_impl ()
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::~NavDisplayGUI_exec_impl ()\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::~NavDisplayGUI_exec_impl ()\n"));
 }
 
 // Operations from HUDisplay::NavDisplay
@@ -78,7 +80,8 @@ MyImpl::NavDisplayGUI_exec_impl::set_session_context (Components::SessionContext
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::set_session_context\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::set_session_context\n"));
 
   this->context_ =
     HUDisplay::CCM_NavDisplay_Context::_narrow (ctx
@@ -95,7 +98,8 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "ENTER: MyImpl::NavDisplayGUI_exec_impl::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "ENTER: MyImpl::NavDisplayGUI_exec_impl::ccm_activate\n"));
 
   int argc = sizeof(argv)/sizeof(argv[0]);
   CORBA::ORB_var orb = CORBA::ORB_init(argc, argv ACE_ENV_ARG_PARAMETER);
@@ -120,7 +124,8 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   QApplication::postEvent(worker_->getMainWindow(), evt);
 
 
-  ACE_DEBUG ((LM_DEBUG, "LEAVE: MyImpl::NavDisplayGUI_exec_impl::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "LEAVE: MyImpl::NavDisplayGUI_exec_impl::ccm_activate\n"));
 }
 
 void
@@ -128,7 +133,8 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::ccm_passivate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::ccm_passivate\n"));
 
   RootPanel *target = worker_->getMainWindow();
   if(target)
@@ -147,19 +153,24 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::ccm_remove\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::ccm_remove\n"));
 }
 
 /// Default ctor.
 MyImpl::NavDisplayGUIHome_exec_impl::NavDisplayGUIHome_exec_impl ()
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::NavDisplayGUIHome_exec_impl ()\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "MyImpl::NavDisplayGUI_exec_impl::NavDisplayGUIHome_exec_impl ()\n"));
 }
 
 /// Default dtor.
 MyImpl::NavDisplayGUIHome_exec_impl::~NavDisplayGUIHome_exec_impl ()
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::~NavDisplayGUIHome_exec_impl ()\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "MyImpl::NavDisplayGUI_exec_impl::~NavDisplayGUIHome_exec_impl ()\n"));
 }
 
 // Explicit home operations.
@@ -171,7 +182,9 @@ MyImpl::NavDisplayGUIHome_exec_impl::create (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUIHome_exec_impl::create()\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "MyImpl::NavDisplayGUIHome_exec_impl::create()\n"));
   return new MyImpl::NavDisplayGUI_exec_impl;
 }
 
@@ -179,6 +192,7 @@ MyImpl::NavDisplayGUIHome_exec_impl::create (ACE_ENV_SINGLE_ARG_DECL)
 extern "C" NAVDISPLAY_EXEC_Export ::Components::HomeExecutorBase_ptr
 createNavDisplayHome_Impl (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "createNavDisplayHome_Impl()\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "createNavDisplayHome_Impl()\n"));
   return new MyImpl::NavDisplayGUIHome_exec_impl;
 }
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp
index 1b4ed858b11..2c5ca9f7942 100644
--- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "RateGen_exec.h"
+#include "CIAO_common.h"
 #include "ace/Timer_Queue.h"
 #include "ace/Reactor.h"
 
@@ -34,7 +35,8 @@ MyImpl::Pulse_Handler::close ()
   this->done_ = 1;
   this->reactor ()->notify ();
 
-  ACE_DEBUG ((LM_DEBUG, "Waiting\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "Waiting\n"));
   return this->wait ();
 }
 
@@ -77,11 +79,12 @@ int
 MyImpl::Pulse_Handler::handle_close (ACE_HANDLE handle,
                                      ACE_Reactor_Mask close_mask)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("[%x] handle = %d, close_mask = %d\n"),
-              this,
-              handle,
-              close_mask));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT ("[%x] handle = %d, close_mask = %d\n"),
+                this,
+                handle,
+                close_mask));
 
   return 0;
 }
@@ -185,7 +188,8 @@ MyImpl::RateGen_exec_i::set_session_context (Components::SessionContext_ptr ctx
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::RateGen_exec_i::set_session_context\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::RateGen_exec_i::set_session_context\n"));
 
   this->context_ =
     HUDisplay::CCM_RateGen_Context::_narrow (ctx
@@ -203,7 +207,8 @@ MyImpl::RateGen_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::RateGen_exec_i::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::RateGen_exec_i::ccm_activate\n"));
 
   this->pulser_.open ();
 }
@@ -213,7 +218,8 @@ MyImpl::RateGen_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::RateGen_exec_i::ccm_passivate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::RateGen_exec_i::ccm_passivate\n"));
   this->pulser_.close ();
 }
 
@@ -222,7 +228,8 @@ MyImpl::RateGen_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::RateGen_exec_i::ccm_remove\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::RateGen_exec_i::ccm_remove\n"));
 }
 
 void
@@ -230,8 +237,9 @@ MyImpl::RateGen_exec_i::pulse (void)
 {
   ACE_TRY_NEW_ENV
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Pushing HUDisplay::tick event!\n")));
+      if (CIAO::debug_level () > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("Pushing HUDisplay::tick event!\n")));
 
       HUDisplay::tick_var ev = new OBV_HUDisplay::tick ();
 
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.cpp
index 661c95c585a..4bc1d4c60b2 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Deployer.cpp
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
         }
 
 
-      ACE_DEBUG ((LM_DEBUG, "Try creating an Assembly with %s\n", cad));
+      ACE_DEBUG ((LM_DEBUG, "Creating an Assembly with %s\n", cad));
 
       Components::Cookie_var ck =
         factory->create_assembly (cad
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
index 08f452d843f..fc20b071142 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.cpp
@@ -150,9 +150,10 @@ CIAO::Assembly_Impl::~Assembly_Impl ()
 {
   // @@ tearing down everything?
 
-  ACE_DEBUG ((LM_DEBUG,
-              "CIAO::Assembly_Impl::~Assembly_Impl %d\n",
-              this->serial_number_));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG,
+                "CIAO::Assembly_Impl::~Assembly_Impl %d\n",
+                this->serial_number_));
 
   delete this->assembly_spec_;
 }
@@ -181,13 +182,15 @@ CIAO::Assembly_Impl::build (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CreateFailure))
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "CIAO::Assembly_Impl::build %d\n",
-              this->serial_number_));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG,
+                "CIAO::Assembly_Impl::build %d\n",
+                this->serial_number_));
   if (this->state_ == Components::Deployment::INSERVICE)
     return;                     // We are running already.
 
-  ACE_DEBUG ((LM_DEBUG, "------------------------------------\n"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "------------------------------------\n"));
 
   // Installing homes and instantiating components
 
@@ -199,7 +202,8 @@ CIAO::Assembly_Impl::build (ACE_ENV_SINGLE_ARG_DECL)
                                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  ACE_DEBUG ((LM_DEBUG, "------------------------------------\n"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "------------------------------------\n"));
 
   if (build_result != 0)
     {
@@ -269,9 +273,10 @@ CIAO::Assembly_Impl::tear_down (ACE_ENV_SINGLE_ARG_DECL)
       }
   }
 
-  ACE_DEBUG ((LM_DEBUG,
-              "CIAO::Assembly_Impl::tear_down %d\n",
-              this->serial_number_));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG,
+                "CIAO::Assembly_Impl::tear_down %d\n",
+                this->serial_number_));
   this->state_ = ::Components::Deployment::INACTIVE;
 }
 
@@ -279,9 +284,10 @@ CIAO::Assembly_Impl::tear_down (ACE_ENV_SINGLE_ARG_DECL)
 CIAO::Assembly_Impl::get_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "CIAO::Assembly_Impl::get_state %d\n",
-              this->serial_number_));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG,
+                "CIAO::Assembly_Impl::get_state %d\n",
+                this->serial_number_));
   return this->state_;
 }
 
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h
index bcb48e687cb..38b0d3ffa7a 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.h
@@ -30,6 +30,7 @@
 #include "../XML_Helpers/Assembly_Spec.h"
 #include "Deployment_Configuration.h"
 #include "Assembly_Visitors.h"
+#include "CIAO_common.h"
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.inl b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.inl
index b6abaa37513..6c58ee5369f 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.inl
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Impl.inl
@@ -22,7 +22,8 @@ CIAO::Assembly_Impl::Assembly_Impl (CORBA::ORB_ptr o,
     deployment_config_ (config),
     assembly_spec_ (spec)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "CIAO::Assembly_Impl::Assembly_Impl %d\n",
-              this->serial_number_));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG,
+                "CIAO::Assembly_Impl::Assembly_Impl %d\n",
+                this->serial_number_));
 }
diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.cpp
index 291d555df59..032633181b3 100644
--- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.cpp
+++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Visitors.cpp
@@ -2,6 +2,7 @@
 
 #include "Assembly_Visitors.h"
 #include "../XML_Helpers/XML_Utils.h"
+#include "CIAO_common.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Assembly_Visitors.inl"
@@ -16,7 +17,8 @@ CIAO::Assembly_Builder_Visitor::visit_Container
 (CIAO::Assembly_Placement::Container *c
  ACE_ENV_ARG_DECL)
 {
-  ACE_DEBUG ((LM_DEBUG, "partitioning %s\n", c->id ()));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "partitioning %s\n", c->id ()));
 
   // This can only happen when we hit a partitioning (root) node.
   CIAO::Assembly_Placement::Container::ITERATOR iter (*c);
@@ -40,7 +42,8 @@ CIAO::Assembly_Builder_Visitor::visit_hostcollocation
 (CIAO::Assembly_Placement::hostcollocation *hc
  ACE_ENV_ARG_DECL)
 {
-  ACE_DEBUG ((LM_DEBUG, "hostcollocation %s\n", hc->id ()));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "hostcollocation %s\n", hc->id ()));
 
   CIAO::Assembly_Placement::Container::ITERATOR iter (*hc);
   CIAO::Assembly_Placement::Node *node = 0;
@@ -63,7 +66,8 @@ CIAO::Assembly_Builder_Visitor::visit_processcollocation
 (CIAO::Assembly_Placement::processcollocation *pc
  ACE_ENV_ARG_DECL)
 {
-  ACE_DEBUG ((LM_DEBUG, "processcollocation %s\n", pc->id ()));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "processcollocation %s\n", pc->id ()));
   Components::ConfigValues server_config;
 
   // Destination logical host id.
@@ -96,9 +100,10 @@ CIAO::Assembly_Builder_Visitor::visit_processcollocation
 
   if (rtcad != 0)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Using RTCAD file: %s\n",
-                  rtcad));
+      if (CIAO::debug_level () > 10)
+        ACE_DEBUG ((LM_DEBUG,
+                    "Using RTCAD file: %s\n",
+                    rtcad));
       CORBA::ULong len = server_config.length ();
       server_config.length (len+1);
 
@@ -122,7 +127,9 @@ CIAO::Assembly_Builder_Visitor::visit_processcollocation
     activator->create_component_server (server_config
                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  ACE_DEBUG ((LM_DEBUG, "Done creating component server\n"));
+
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "Done creating component server\n"));
 
   this->context_.component_servers_.enqueue_tail (this->compserv_);
 
@@ -153,7 +160,8 @@ CIAO::Assembly_Builder_Visitor::visit_homeplacement
 (CIAO::Assembly_Placement::homeplacement *hp
  ACE_ENV_ARG_DECL)
 {
-  ACE_DEBUG ((LM_DEBUG, "homeplacement %s\n", hp->id ()));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "homeplacement %s\n", hp->id ()));
 
   // @@ Create and register home before creating components.
   ACE_CString csd_file;
@@ -260,7 +268,8 @@ CIAO::Assembly_Builder_Visitor::visit_componentinstantiation
  ACE_ENV_ARG_DECL)
 {
   // @@ instantiation and register component.
-  ACE_DEBUG ((LM_DEBUG, "ComponentInstantiation %s\n", ci->id ()));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "ComponentInstantiation %s\n", ci->id ()));
 
   Components::CCMObject_var comp
     = this->home_->create_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -292,7 +301,8 @@ CIAO::Assembly_Builder_Visitor::get_current_componentserver (ACE_ENV_SINGLE_ARG_
 {
   if (CORBA::is_nil (this->compserv_.in ()))
     {
-      ACE_DEBUG ((LM_DEBUG, "Creating new ComponenetServer\n"));
+      if (CIAO::debug_level () > 10)
+        ACE_DEBUG ((LM_DEBUG, "Creating new ComponenetServer\n"));
 
       Components::Deployment::ServerActivator_var activator =
         this->deployment_config_.get_default_activator ();
@@ -351,13 +361,16 @@ CIAO::Assembly_Builder_Visitor::get_container (const char *rtpolicy
 
       this->rtpolicy_name_ = rtpolicy;
 
-      if (rtpolicy != 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "Creating container with RTPolicySet %s\n",
-                    rtpolicy));
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "Creating container with empty policy set\n"));
+      if (CIAO::debug_level () > 10)
+        {
+          if (rtpolicy != 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "Creating container with RTPolicySet %s\n",
+                        rtpolicy));
+          else
+            ACE_DEBUG ((LM_DEBUG,
+                        "Creating container with empty policy set\n"));
+        }
     }
 
   return Components::Deployment::Container::_duplicate
diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
index 3d25373f1bf..6d174c548d5 100644
--- a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
+++ b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp
@@ -10,6 +10,7 @@
 #include "ComponentServer_Impl.h"
 #include "CIAO_ServersC.h"
 #include "Server_init.h"
+#include "CIAO_common.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 
@@ -163,12 +164,15 @@ main (int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
 
       CIAO::Utility::write_IOR (ior_file_name_, str.in ());
-      ACE_DEBUG ((LM_INFO, "ComponentServer IOR: %s\n", str.in ()));
 
       // End Deployment part
+      if (CIAO::debug_level () > 10)
+        {
+          ACE_DEBUG ((LM_INFO, "ComponentServer IOR: %s\n", str.in ()));
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "Running ComponentServer...\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      "Running ComponentServer...\n"));
+        }
 
       // Run the main event loop for the ORB.
       orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp b/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp
index 035c5ea1672..c0bcd8c4096 100644
--- a/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp
@@ -5,6 +5,7 @@
 #include "RTServer_Impl.h"
 #include "ace/Null_Mutex.h"
 #include "Server_init.h"
+#include "CIAO_common.h"
 #include "CIAO_ServersC.h"
 #include "../XML_Helpers/XML_Utils.h"
 #include "RTPortableServer/RTPortableServer.h"
@@ -44,7 +45,8 @@ add_rtcad_configs (const char *rtcadfile,
       configs[len] = newconfig;
     }
 
-  ACE_DEBUG ((LM_DEBUG, "Done adding RTCAD config\n"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "Done adding RTCAD config\n"));
 }
 
 int
@@ -165,13 +167,15 @@ CIAO::ComponentServer_Task::svc ()
       if (this->options_.ior_output_filename_.length () != 0)
         CIAO::Utility::write_IOR (this->options_.ior_output_filename_.c_str (),
                                   str.in ());
-      ACE_DEBUG ((LM_INFO, "RTComponentServer IOR: %s\n", str.in ()));
 
       // End Deployment part
+      if (CIAO::debug_level () > 10)
+        {
+          ACE_DEBUG ((LM_INFO, "RTComponentServer IOR: %s\n", str.in ()));
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "Running RTComponentServer...\n"));
-
+          ACE_DEBUG ((LM_DEBUG,
+                      "Running RTComponentServer...\n"));
+        }
 
       this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
index 60892392d38..4194fc31747 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/RTConfig_Manager.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "RTConfig_Manager.h"
+#include "CIAO_common.h"
 #include "ace/SString.h"
 
 #if !defined (__ACE_INLINE__)
@@ -151,7 +152,8 @@ CIAO::RTPolicy_Set_Manager::init (const CIAO::RTConfiguration::Policy_Sets &sets
                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG, "RTPolicy_Set_Manager::init\n"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "RTPolicy_Set_Manager::init\n"));
 
   for (CORBA::ULong i = 0; i < sets.length (); ++i)
     {
@@ -226,7 +228,8 @@ CIAO::RTPolicy_Set_Manager::create_single_policy
  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG, "RTPolicy_Set_Manager::create_single_policy\n"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "RTPolicy_Set_Manager::create_single_policy\n"));
 
   CORBA::Policy_var retv;
 
diff --git a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp
index 229f7dd95ae..6613c0ff3b2 100644
--- a/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp
+++ b/TAO/CIAO/tools/RTComponentServer/RTServer_Impl.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "RTServer_Impl.h"
+#include "CIAO_common.h"
 
 #if !defined (__ACE_INLINE__)
 # include "RTServer_Impl.inl"
@@ -44,7 +45,8 @@ CIAO::RTServer::RTComponentServer_Impl::create_container
                    Components::CreateFailure,
                    Components::InvalidConfiguration))
 {
-  ACE_DEBUG ((LM_DEBUG, "RTComponentServer_Impl::create_container\n"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "RTComponentServer_Impl::create_container\n"));
 
   CIAO::RTServer::RTContainer_Impl *container_servant = 0;
 
@@ -97,11 +99,14 @@ parse_server_config_values (const Components::ConfigValues &options
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidConfiguration))
 {
-  ACE_DEBUG ((LM_DEBUG, "RTComponentServer_Impl::parse_server_config_values\n"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "RTComponentServer_Impl::parse_server_config_values\n"));
 
   for (CORBA::ULong i = 0; i < options.length (); ++i)
     {
-      ACE_DEBUG ((LM_DEBUG, "parse_server_options: %s\n", options[i]->name ()));
+      if (CIAO::debug_level () > 10)
+        ACE_DEBUG ((LM_DEBUG, "parse_server_options: %s\n",
+                    options[i]->name ()));
 
       if (ACE_OS::strcmp (options[i]->name (), "CIAO-RTResources") == 0)
         {
@@ -148,7 +153,8 @@ CIAO::RTServer::RTContainer_Impl::init (const Components::ConfigValues &options,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidConfiguration))
 {
-  ACE_DEBUG ((LM_DEBUG, "RTContainer_Impl::init\n"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "RTContainer_Impl::init\n"));
 
   this->config_ = options;
   this->parse_container_config_values (options
@@ -184,20 +190,23 @@ parse_container_config_values (const Components::ConfigValues &options
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidConfiguration))
 {
-  ACE_DEBUG ((LM_DEBUG, "parse_container_config_values"));
+  if (CIAO::debug_level () > 10)
+    ACE_DEBUG ((LM_DEBUG, "parse_container_config_values"));
 
   for (CORBA::ULong i = 0; i < options.length (); ++i)
     {
-      ACE_DEBUG ((LM_DEBUG, "options.name= %s\n", options[i]->name ()));
+      if (CIAO::debug_level () > 10)
+        ACE_DEBUG ((LM_DEBUG, "options.name= %s\n", options[i]->name ()));
 
       if (ACE_OS::strcmp (options[i]->name (), "CIAO-RTPolicySet") == 0)
         {
           const char *ps_name;
           if (options[i]->value () >>= ps_name)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          "-Using RTPolicySet named: %s\n",
-                          ps_name));
+              if (CIAO::debug_level () > 10)
+                ACE_DEBUG ((LM_DEBUG,
+                            "-Using RTPolicySet named: %s\n",
+                            ps_name));
               CORBA::PolicyList_var policies =
               // initialize the policyset manager with policy set defintions.
                 this->policyset_manager_.find_policies_by_name (ps_name
@@ -205,9 +214,10 @@ parse_container_config_values (const Components::ConfigValues &options
               ACE_CHECK;
 
               this->Policies_ = policies;
-              ACE_DEBUG ((LM_DEBUG,
-                          "Found RTPolicySet named: %s\n",
-                          ps_name));
+              if (CIAO::debug_level () > 10)
+                ACE_DEBUG ((LM_DEBUG,
+                            "Found RTPolicySet named: %s\n",
+                            ps_name));
             }
         }
       else
diff --git a/TAO/CIAO/tools/XML_Helpers/Assembly_Handlers.cpp b/TAO/CIAO/tools/XML_Helpers/Assembly_Handlers.cpp
index 9714e9dc4ac..49dbb0a0b91 100644
--- a/TAO/CIAO/tools/XML_Helpers/Assembly_Handlers.cpp
+++ b/TAO/CIAO/tools/XML_Helpers/Assembly_Handlers.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "Assembly_Handlers.h"
+#include "CIAO_common.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Assembly_Handlers.inl"
@@ -28,7 +29,8 @@ CIAO::Assembly_Handler::startElement (const ACEXML_Char *namespaceURI,
     case START:
       if (ACE_OS::strcmp (qName, "componentfiles") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "Start componentfiles\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "Start componentfiles\n"));
           CIAO::XMLHelpers::Cascadable_DocHandler *new_handler;
 
           ACE_NEW (new_handler,
@@ -52,7 +54,8 @@ CIAO::Assembly_Handler::startElement (const ACEXML_Char *namespaceURI,
     case COMPONENTFILES_DONE:
       if (ACE_OS::strcmp (qName, "partitioning") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "Start partitioning\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "Start partitioning\n"));
           CIAO::XMLHelpers::Cascadable_DocHandler *new_handler;
 
           ACE_NEW (new_handler,
@@ -77,7 +80,8 @@ CIAO::Assembly_Handler::startElement (const ACEXML_Char *namespaceURI,
     case PLACEMENT_DONE:
       if (ACE_OS::strcmp (qName, "connections") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "Start connections\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "Start connections\n"));
           CIAO::XMLHelpers::Cascadable_DocHandler *new_handler;
 
           ACE_NEW (new_handler,
@@ -101,7 +105,8 @@ CIAO::Assembly_Handler::startElement (const ACEXML_Char *namespaceURI,
     case CONNECTION_DONE:
       if (ACE_OS::strcmp (qName, "extension") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "Start skipping extension\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "Start skipping extension\n"));
           CIAO::XMLHelpers::Cascadable_DocHandler *new_handler;
 
           ACE_NEW (new_handler,
@@ -143,7 +148,8 @@ CIAO::Assembly_Handler::endElement (const ACEXML_Char *,
     case START:
       if (ACE_OS::strcmp (qName, "componentfiles") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "End componentfiles\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "End componentfiles\n"));
           this->state_ = COMPONENTFILES_DONE;
         }
       return;
@@ -151,7 +157,8 @@ CIAO::Assembly_Handler::endElement (const ACEXML_Char *,
     case COMPONENTFILES_DONE:
       if (ACE_OS::strcmp (qName, "partitioning") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "End partitioning\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "End partitioning\n"));
           this->state_ = PLACEMENT_DONE;
         }
       return;
@@ -159,7 +166,8 @@ CIAO::Assembly_Handler::endElement (const ACEXML_Char *,
     case PLACEMENT_DONE:
       if (ACE_OS::strcmp (qName, "connections") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "End connections\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "End connections\n"));
           this->state_ = CONNECTION_DONE;
         }
       return;
@@ -167,7 +175,8 @@ CIAO::Assembly_Handler::endElement (const ACEXML_Char *,
     case CONNECTION_DONE:
       if (ACE_OS::strcmp (qName, "extension") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "End skipping extension\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "End skipping extension\n"));
           this->state_ = DONE;
         }
       return;
diff --git a/TAO/CIAO/tools/XML_Helpers/RTConfig_Handlers.cpp b/TAO/CIAO/tools/XML_Helpers/RTConfig_Handlers.cpp
index af47ae6744a..216a7a17c89 100644
--- a/TAO/CIAO/tools/XML_Helpers/RTConfig_Handlers.cpp
+++ b/TAO/CIAO/tools/XML_Helpers/RTConfig_Handlers.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "RTConfig_Handlers.h"
+#include "CIAO_common.h"
 
 #if !defined (__ACE_INLINE__)
 # include "RTConfig_Handlers.inl"
@@ -29,7 +30,8 @@ CIAO::RTConfig_Handler::startElement (const ACEXML_Char *,
         }
       else if (ACE_OS::strcmp (qName, "rtcad_ext") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "Start parsing RT cad file extension\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "Start parsing RT cad file extension\n"));
         }
       else
         ACEXML_THROW (ACEXML_SAXException
@@ -163,7 +165,8 @@ CIAO::RTConfig_Handler::endElement (const ACEXML_Char *,
     case START:
       if (ACE_OS::strcmp (qName, "rtcad_ext") == 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "End parsing RT cad file extension\n"));
+          if (CIAO::debug_level () > 10)
+            ACE_DEBUG ((LM_DEBUG, "End parsing RT cad file extension\n"));
         }
       return;
 
diff --git a/TAO/CIAO/tools/XML_Helpers/Svcconf_Handler.cpp b/TAO/CIAO/tools/XML_Helpers/Svcconf_Handler.cpp
index 782420d135b..d8ea5055eb8 100644
--- a/TAO/CIAO/tools/XML_Helpers/Svcconf_Handler.cpp
+++ b/TAO/CIAO/tools/XML_Helpers/Svcconf_Handler.cpp
@@ -53,9 +53,9 @@ Svcconf_Handler::endDocument (ACEXML_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Svcconf_Handler::endElement (const ACEXML_Char *,
-                                    const ACEXML_Char *,
-                                    const ACEXML_Char *qName
-                                    ACEXML_ENV_ARG_DECL)
+                             const ACEXML_Char *,
+                             const ACEXML_Char *qName
+                             ACEXML_ENV_ARG_DECL)
       ACE_THROW_SPEC ((ACEXML_SAXException))
 {
 
diff --git a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
index c93c547a760..afb605e4082 100644
--- a/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
+++ b/TAO/CIAO/tools/XML_Helpers/XMLHelpers.mpc
@@ -1,4 +1,4 @@
-project(XML_Helpers): acelib, acexml, rtcorba {
+project(XML_Helpers): acelib, acexml, rtcorba, ciao_client {
   sharedname=CIAO_XML_Helpers
   idlflags  += -Sc -Wb,export_include=XML_Helpers_Export.h
   idlflags  += -Wb,export_macro=CIAO_XML_HELPERS_Export