Mon May 17 16:16:37 2004 Venkita Subramonian <venkita@cs.wustl.edu>

11 files changed, 141 insertions, 76 deletions

diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
index daede09ad1f..026b8dade18 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -30,11 +30,14 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  ACE_DEBUG ((LM_DEBUG,
-              "BMClosedED - Doing computations \n"));
+  if (CIAO::debug_level () > 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "BMClosedED - Doing computations \n"));
 
-  ACE_DEBUG ((LM_DEBUG,
-              "BMClosedED - Doing data fetch \n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "BMClosedED - Doing data fetch \n"));
+    }
 
   // Refresh position
   BasicSP::ReadData_var dat
@@ -53,9 +56,10 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
     dat->get_data (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "BMClosedED - Display data is [%s] \n",
-               str.in ()));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "BMClosedED - Display data is [%s] \n",
+                str));
 
   if (ACE_OS::strcmp (str, "BM DEVICE DATA") == 0)
     {
@@ -87,7 +91,8 @@ MyImpl::BMClosedED_exec_i::set_session_context (Components::SessionContext_ptr c
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMClosedED_exec_i::set_session_context\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMClosedED_exec_i::set_session_context\n"));
 
   this->context_ =
     BasicSP::CCM_BMClosedED_Context::_narrow (ctx
@@ -112,7 +117,8 @@ MyImpl::BMClosedED_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMClosedED_exec_i::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMClosedED_exec_i::ccm_activate\n"));
 
   char *argv[1] = { "BMClosedED_exec"};
 
@@ -140,7 +146,8 @@ MyImpl::BMClosedED_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMClosedED_exec_i::ccm_passivate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMClosedED_exec_i::ccm_passivate\n"));
 }
 
 void
@@ -148,7 +155,8 @@ MyImpl::BMClosedED_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMClosedED_exec_i::ccm_remove\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMClosedED_exec_i::ccm_remove\n"));
 }
 
 /// Default ctor.
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp
index 851c9d002f6..c0004bd073d 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -32,8 +32,9 @@ MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *
   // Nitify others
   BasicSP::DataAvailable_var event = new OBV_BasicSP::DataAvailable;
 
-  ACE_DEBUG ((LM_DEBUG,
-              "BMDevice, received a timeout from EC \n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "BMDevice, received a timeout from EC \n"));
 
   this->context_->push_data_available (event
                                        ACE_ENV_ARG_PARAMETER);
@@ -60,8 +61,8 @@ MyImpl::BMDevice_exec_i::set_session_context (Components::SessionContext_ptr ctx
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "MyImpl::BMDevice_exec_i::set_session_context\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::set_session_context\n"));
 
   this->context_ =
     BasicSP::CCM_BMDevice_Context::_narrow (ctx
@@ -85,7 +86,8 @@ MyImpl::BMDevice_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::ccm_activate\n"));
   char *argv[1] = { "BMDevice_exec"};
 
   int argc = sizeof(argv)/sizeof(argv[0]);
@@ -111,7 +113,8 @@ MyImpl::BMDevice_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::ccm_passivate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::ccm_passivate\n"));
 }
 
 void
@@ -119,7 +122,8 @@ MyImpl::BMDevice_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::ccm_remove\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDevice_exec_i::ccm_remove\n"));
 }
 
 /// Default ctor.
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp
index f9b3d9394e3..bc736e7add6 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay_exec.cpp
@@ -23,11 +23,14 @@ MyImpl::BMDisplay_exec_impl::push_data_ready (
 {
   ACE_UNUSED_ARG (ev);
 
-  ACE_DEBUG ((LM_DEBUG,
-              "BMDisplay - Doing computations \n"));
+  if (CIAO::debug_level () > 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "BMDisplay - Doing computations \n"));
 
-  ACE_DEBUG ((LM_DEBUG,
-              "BMDisplay - Doing data fetch \n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "BMDisplay - Doing data fetch \n"));
+    }
 
   // Refresh position
   BasicSP::ReadData_var dat
@@ -54,7 +57,8 @@ MyImpl::BMDisplay_exec_impl::set_session_context (Components::SessionContext_ptr
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::set_session_context\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::set_session_context\n"));
 
   this->context_ =
     BasicSP::CCM_BMDisplay_Context::_narrow (ctx
@@ -78,7 +82,8 @@ MyImpl::BMDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_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
@@ -113,7 +118,8 @@ MyImpl::BMDisplay_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::ccm_passivate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::ccm_passivate\n"));
 }
 
 void
@@ -121,7 +127,8 @@ MyImpl::BMDisplay_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::ccm_remove\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::BMDisplay_exec_impl::ccm_remove\n"));
 }
 
 /// Default ctor.
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp
index 6ccd5208316..0a7d012fc7e 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC_exec.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "EC_exec.h"
+#include "CIAO_common.h"
 #include "ace/Timer_Queue.h"
 #include "ace/Reactor.h"
 
@@ -34,7 +35,8 @@ MyImpl::timeout_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::timeout_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::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::set_session_context\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::set_session_context\n"));
 
   this->context_ =
     BasicSP::CCM_EC_Context::_narrow (ctx
@@ -210,7 +214,8 @@ MyImpl::EC_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_activate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_activate\n"));
 
   this->pulser_.open ();
 }
@@ -227,7 +232,8 @@ MyImpl::EC_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_passivate\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_passivate\n"));
   this->pulser_.close ();
 }
 
@@ -236,7 +242,8 @@ MyImpl::EC_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
-  ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_remove\n"));
+  if (CIAO::debug_level () > 0)
+    ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_remove\n"));
 }
 
 void
@@ -244,8 +251,9 @@ MyImpl::EC_exec_i::pulse (void)
 {
   ACE_TRY_NEW_ENV
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Pushing BasicSP::TimeOut event!\n")));
+      if (CIAO::debug_level () > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("Pushing BasicSP::TimeOut event!\n")));
 
       BasicSP::TimeOut_var ev = new OBV_BasicSP::TimeOut ();
 
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp b/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp
index 1ecfeb54974..1667903696a 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/client.cpp
@@ -12,6 +12,7 @@
 //==============================================================
 
 #include "ECC.h"
+#include "ace/streams.h"
 
 int
 main (int argc, char *argv[])
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp
index 7d10c93e930..a2b0f873ef9 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/controller.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 /**
  * @file controller.cpp
  *
@@ -6,10 +7,9 @@
  * EC.
  */
 
-
 #include "ECC.h"
 #include "ace/Get_Opt.h"
-
+#include "ace/streams.h"
 
 char *rategen_ior_ = 0;
 int rate = 2;
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp b/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp
index 20a0010bae5..363067549bc 100644
--- a/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS_exec.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
+
 #include "GPS_exec.h"
+#include "CIAO_common.h"
 
 #include "ace/OS_NS_time.h"
 
@@ -67,7 +69,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
@@ -91,7 +94,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
@@ -106,7 +110,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
@@ -114,7 +119,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 a80f998bef4..9f477f38146 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"
 
 #include "ace/OS_NS_time.h"
 
@@ -73,7 +74,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
@@ -97,7 +99,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
@@ -112,7 +115,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
@@ -120,7 +124,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 c407e921a6f..67e546dc11a 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
@@ -71,7 +72,8 @@ MyImpl::NavDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
   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
@@ -106,7 +108,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
@@ -114,7 +117,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 5fc68e31eab..6a8fb311e73 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
@@ -102,7 +105,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);
@@ -127,7 +131,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
@@ -142,7 +147,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)
@@ -161,19 +167,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.
@@ -185,7 +196,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;
 }
 
@@ -193,6 +206,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 8c01108e205..b10d3a8dc77 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
@@ -210,7 +214,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 ();
 }
@@ -227,7 +232,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 ();
 }
 
@@ -236,7 +242,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
@@ -244,8 +251,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 ();