Tue Jan 16 21:18:57 UTC 2007 Nilabja R <nilabjar@dre.vanderbilt.edu>

8 files changed, 79 insertions, 218 deletions

diff --git a/ChangeLog b/ChangeLog
index bc31d341d01..8240475ba48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Tue Jan 16 21:18:57 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/CmpClient.cpp:
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+        * DAnCE/TargetManager/TargetManagerExt.idl:
+        * DAnCE/TargetManager/TargetManagerImpl.idl:
+        * DAnCE/TargetManager/TargetManager_exec.h:
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+
+          Added some comments to decrease doxygen warnings;Changed
+          ACE_DEBUG in many places to ACE_ERROR;Removed a lot of unwanted
+          debug messages
+
 Fri Jan 12 22:04:14 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
         * DAnCE/TargetManager/CmpClient.cpp:
diff --git a/DAnCE/TargetManager/CmpClient.cpp b/DAnCE/TargetManager/CmpClient.cpp
index e788bca57ce..bfa9cbe228f 100644
--- a/DAnCE/TargetManager/CmpClient.cpp
+++ b/DAnCE/TargetManager/CmpClient.cpp
@@ -18,19 +18,31 @@
 #include "ace/Get_Opt.h"
 #include "Config_Handlers/DnC_Dump.h"
 
+/**
+ * TM_Tester contains the code to test the TM Component
+ */
 namespace TM_Tester
 {
+  /**
+   * writes the extracted data to file
+   */
   void write_to_file (::Deployment::Domain domain);
 
+  /// variable contains IOR of the TM 
   const char * stringified_TM_IOR;
+
+  /// if add or delete from domain
   bool add_to_domain = true;
+
+  /// whether to test update domain or not
   bool call_update = false;
+
+  /// contains the host name 
   const char * host_name;
   
-    
+    /// parses the arguments and extracts the params
   bool parse_args (int argc, char *argv[])
   {
-    ACE_DEBUG ((LM_DEBUG, "The Parse Agr is called\n"));
     ACE_Get_Opt get_opts (argc, argv, "t:u:d");
     int c;
     while ((c = get_opts ()) != -1)
@@ -38,7 +50,6 @@ namespace TM_Tester
       {
         case 't':
           stringified_TM_IOR = get_opts.opt_arg ();
-          ACE_DEBUG ((LM_DEBUG, "The stringified IOR is [%s]\n",stringified_TM_IOR));
           break;
         case 'u':
           host_name = get_opts.opt_arg ();
@@ -63,6 +74,7 @@ namespace TM_Tester
   }
 }
 
+  /// The main function
   int main (int argc, char* argv[])
   {
     try {
@@ -85,7 +97,6 @@ namespace TM_Tester
         CIAO::TargetManagerImpl::_narrow (factory_object.in ());
 
       // Now get the facet reference from the target Manager Component
-      ACE_DEBUG((LM_DEBUG, "Making a Call to provide_targetMgr ()\n"));
       Deployment::TargetManager_ptr targetI = targetCmp->provide_targetMgr ();
 
       // Now make calls on the Target Manager facet
@@ -93,17 +104,16 @@ namespace TM_Tester
       try
       {
         Deployment::Domain_var domainV = targetI->getAllResources ();
-        ACE_DEBUG ((LM_DEBUG , "\n\nGetAllResources Returned \n"));
         ::Deployment::DnC_Dump::dump (domainV);
       }
       catch(CORBA::NO_IMPLEMENT &)
       {
-        ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
       catch(CORBA::Exception &)
       {
-        ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:CORBA Generic Exception \n"));
-        ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:Exception in TargetManager call\n"));
+        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception \n"));
+        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:Exception in TargetManager call\n"));
       }
 
 
@@ -134,18 +144,17 @@ namespace TM_Tester
 
         manager->commitResources (resource_seq);
 
-        ACE_DEBUG ((LM_DEBUG , "\n\ncommitResources Returned \n"));
       }
       catch(CORBA::NO_IMPLEMENT &)
       {
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
       catch (::Deployment::ResourceCommitmentFailure& e)
       {
         resource_available = 0;
-        ACE_DEBUG ((LM_DEBUG, "TargetManager commitResources ResourceCommitmentFailure Exception\n"));
+        ACE_ERROR ((LM_ERROR, "TargetManager commitResources ResourceCommitmentFailure Exception\n"));
 
-        ACE_DEBUG ((LM_DEBUG ,
+        ACE_ERROR ((LM_ERROR ,
               "ResourceCommitmentFailure\n reason=[%s]\n elementName=[%s]\n resourceName=[%s]\n propertyName=[%s]\n",
               e.reason.in (),
               resource_seq[e.index].elementName.in (),
@@ -154,9 +163,9 @@ namespace TM_Tester
       }
       catch(CORBA::Exception & ex)
       {
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:commitResources Exception\n"));
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:CORBA Generic Exception\n"));
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:Exception in TargetManager call"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:commitResources Exception\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in TargetManager call"));
       }
 
 
@@ -168,23 +177,21 @@ namespace TM_Tester
           d = 10;
           resource_seq[0].property[0].value <<= d;
           manager->releaseResources (resource_seq);
-          //            targetI->destroyResourceCommitment (manager);
-          ACE_DEBUG ((LM_DEBUG , "\n\nreleaseResources Returned \n"));
         }
       }
       catch(CORBA::NO_IMPLEMENT &)
       {
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
       catch (Deployment::ResourceNotAvailable &)
       {
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager releaseResources ResourceNotAvailable Exception\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager releaseResources ResourceNotAvailable Exception\n"));
       }
       catch(CORBA::Exception & ex)
       {
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:releaseResources Exception\n"));
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:CORBA Generic Exception\n"));
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:Exception in TargetManager call"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:releaseResources Exception\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in TargetManager call"));
       }
 
       // Here make a call on the TM with update domain and node deletion
@@ -207,12 +214,12 @@ namespace TM_Tester
           }
           catch(CORBA::NO_IMPLEMENT &)
           {
-            ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
           }
           catch(CORBA::Exception & ex)
           {
-            ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:CORBA Generic Exception\n"));
-            ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:Exception in UpdateDomain call"));
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
           }
         }
         else
@@ -223,12 +230,12 @@ namespace TM_Tester
           }
           catch(CORBA::NO_IMPLEMENT &)
           {
-            ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
           }
           catch(CORBA::Exception & ex)
           {
-            ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:CORBA Generic Exception\n"));
-            ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:Exception in UpdateDomain call"));
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+            ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
           }
         }
       }
@@ -241,17 +248,16 @@ namespace TM_Tester
         // here write things to file ...
         TM_Tester::write_to_file (domainV.in());
 
-        ACE_DEBUG ((LM_DEBUG , "\n\nGetAvailableResources Returned \n"));
         ::Deployment::DnC_Dump::dump (domainV);
       }
       catch(CORBA::NO_IMPLEMENT &)
       {
-        ACE_DEBUG ((LM_DEBUG, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
       catch(CORBA::Exception & ex)
       {
-        ACE_DEBUG ((LM_DEBUG ,"Error:TargetManager:CORBA Generic Exception\n"));
-        ACE_DEBUG ((LM_DEBUG,  "Error:TargetManager:Exception in TargetManager call\n"));
+        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception\n"));
+        ACE_ERROR ((LM_ERROR,  "Error:TargetManager:Exception in TargetManager call\n"));
       }
 
       // Finally destroy the ORB
@@ -259,7 +265,7 @@ namespace TM_Tester
     }
     catch (CORBA::Exception & ex) 
     {
-      ACE_DEBUG ((LM_DEBUG,  "Error:TargetManager:CORBA exception raised!\n"));
+      ACE_ERROR ((LM_ERROR,  "Error:TargetManager:CORBA exception raised!\n"));
     }
     return 0;
   }
@@ -289,15 +295,12 @@ namespace TM_Tester
           file_name += domain.node[i].name.in ();
           ACE_FILE_IO file_io;
           ACE_FILE_Connector (file_io, ACE_FILE_Addr (file_name.c_str ()));
- //         std::ofstream na_out (file_name.c_str ());
           CORBA::Double na_node_cpu;
           domain.node[i].resource[j].property[0].value >>= na_node_cpu;
           char buf[BUFSIZ];
           memset (buf , 0 , BUFSIZ);
           ACE_OS::sprintf (buf , "%f", na_node_cpu);
           file_io.send (buf, ACE_OS::strlen (buf));
-//          na_out << na_node_cpu << std::endl;
-//          na_out.close ();
         }
       }
 
diff --git a/DAnCE/TargetManager/DomainDataManager.cpp b/DAnCE/TargetManager/DomainDataManager.cpp
index 233b50e1dff..10e24d4eb0b 100644
--- a/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/DAnCE/TargetManager/DomainDataManager.cpp
@@ -1,16 +1,4 @@
 // $Id$
-//===============================================================
-/**
- * @file DomainDataManager.cpp
- *
- * @brief Maintains the Domain Information
- *
- * It contains the entire Domain information.Both the
- * initial domain as well as the current available domain.
- *
- * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
- */
-//===============================================================
 #include "DomainDataManager.h"
 
 #include "Config_Handlers/DD_Handler.h"
@@ -32,7 +20,7 @@ CIAO::DomainDataManager * CIAO::DomainDataManager::create (CORBA::ORB_ptr orb,
   return global_data_manager_;
 }
 
-
+// Returns the pointer to the static variable
 CIAO::DomainDataManager*
 CIAO::DomainDataManager::get_data_manager ()
 {
@@ -85,10 +73,6 @@ int CIAO::DomainDataManager::update_domain (
           // for now overwrite the entire Node info ...
           // but later , this has to be changed to overwrite
           // only the specific part ...
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG , "TM::Changed the cpu Value\n"));
-            }
           current_domain_.node[i] = domainSubset.node[0];
           break; // finished job ...break
         }
@@ -101,11 +85,6 @@ int CIAO::DomainDataManager::update_domain (
       current_domain_.node.length (size+1);
       current_domain_.node[size]=domainSubset.node[0];
     }
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG ,
-          "TM::Inside The update Domain of Manager\n"));
-    }
   return 0;
 }
 
@@ -116,11 +95,8 @@ DomainDataManager (CORBA::ORB_ptr orb,
     deployment_config_ (orb_.in()),
     target_mgr_ (::Deployment::TargetManager::_duplicate(target))
 {
-  //  ACE_DEBUG((LM_DEBUG , "Calling DD_HANDLER\n"));
   CIAO::Config_Handlers::DD_Handler dd (domain_file_name);
-  //  ACE_DEBUG((LM_DEBUG , "After DD_HANDLER Constructor\n"));
   ::Deployment::Domain* dmn = dd.domain_idl ();
-  //  ACE_DEBUG((LM_DEBUG , "After DD_HANDLER domain_idl\n"));
 
   if (CIAO::debug_level () > 9)
     ::Deployment::DnC_Dump::dump (*dmn);
@@ -166,10 +142,6 @@ int CIAO::DomainDataManager::call_all_node_managers ()
     }
 
   CORBA::ULong const length = initial_domain_.node.length ();
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Number of nodes in domain.cdd is : %d\n", length));
-    }
 
   for (CORBA::ULong i=0;i < length;i++)
     {
@@ -193,11 +165,6 @@ int CIAO::DomainDataManager::call_all_node_managers ()
 
       if (!CORBA::is_nil (node_manager.in ()))
         {
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG, "Trying to contact nodemanager on %s\n",
-                          initial_domain_.node[i].name.in ()));
-            }
           Deployment::Logger_ptr log =
             Deployment::Logger::_nil ();
           ::Deployment::Domain sub_domain;
@@ -217,7 +184,7 @@ int CIAO::DomainDataManager::call_all_node_managers ()
             }
           catch (CORBA::Exception& ex)
             {
-              ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Join Domain==\n"));
+              ACE_ERROR ((LM_ERROR , "TM::Error in calling Join Domain==\n"));
               ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in "
                                    "DomainDataManager::joinDomain");
             }
@@ -251,16 +218,10 @@ CIAO::Host_Infos*  CIAO::DomainDataManager::get_cpu_info ()
   CIAO::Host_Infos* host_info_seq = new CIAO::Host_Infos ();
   host_info_seq->length (current_domain_.node.length ());
 
-  if (CIAO::debug_level () > 9)
-    ACE_DEBUG ((LM_DEBUG , "TM:: The node length is [%d]",
-                current_domain_.node.length ()));
-
   for (CORBA::ULong i=0;i < current_domain_.node.length ();i++)
     {
       (*host_info_seq)[i].hostname =
         CORBA::string_dup (current_domain_.node[i].name);
-      //      ACE_DEBUG ((LM_DEBUG , "The resource length is [%d]",
-      //          current_domain_.node[i].resource.length ()));
 
       for (CORBA::ULong j = 0;j < current_domain_.node[i].resource.length ();j++)
         {
@@ -273,14 +234,10 @@ CIAO::Host_Infos*  CIAO::DomainDataManager::get_cpu_info ()
               CORBA::Double d;
               current_domain_.node[i].resource[j].property[0].value
                 >>= d;
-              //      ACE_DEBUG ((LM_DEBUG, "TM::The current cpu util is [%f]\n", d));
             }
         }
     }
 
-  if (CIAO::debug_level () > 9)
-    ACE_DEBUG ((LM_DEBUG , "TM::Returning from get_cpu_info"));
-
   return host_info_seq;
 }
 
@@ -294,10 +251,6 @@ CORBA::Long CIAO::DomainDataManager::get_pid (const ACE_CString& cmp)
 
   for (CORBA::ULong i=0;i < current_domain_.node.length ();i++)
     {
-      if (CIAO::debug_level () > 9)
-        ACE_DEBUG ((LM_DEBUG , "TM::The resource length is [%d]",
-                    current_domain_.node[i].resource.length ()));
-
       for (CORBA::ULong j = 0;j < current_domain_.node[i].resource.length ();j++)
         {
           // The resource
@@ -309,10 +262,6 @@ CORBA::Long CIAO::DomainDataManager::get_pid (const ACE_CString& cmp)
             {
               current_domain_.node[i].resource[j].property[0].value
                 >>= pid;
-              if (CIAO::debug_level () > 9)
-                ACE_DEBUG ((LM_DEBUG,
-                            "TM::getpid::The current pid is [%d]\n", pid));
-
             }
         } // resources
     }// nodes
@@ -341,9 +290,6 @@ void CIAO::DomainDataManager
           if (!ACE_OS::strcmp (plan.instance[i].node.in () ,
                        temp_provisioned_data.node[j].name.in ()))
           {
-            if (CIAO::debug_level () > 9)
-              ACE_DEBUG ((LM_DEBUG ,
-                  "TM::commitResource::Host name matched\n"));
             try {
               match_requirement_resource (
                                 plan.instance[i].deployedResource,
@@ -383,12 +329,6 @@ releaseResources (
           if (!ACE_OS::strcmp (plan.instance[i].node.in () ,
                                provisioned_data_.node[j].name.in ()))
           {
-            if (CIAO::debug_level () > 9)
-              {
-                ACE_DEBUG ((LM_DEBUG ,
-                    "TM::commitResource::Host name matched\n"));
-              }
-
             match_requirement_resource (
                                         plan.instance[i].deployedResource,
                                         provisioned_data_.node[j].resource);
@@ -417,18 +357,12 @@ match_requirement_resource (
           if (!ACE_OS::strcmp (deployed[i].requirementName, available[j].name))
             {
               if (CIAO::debug_level () > 9)
-                ACE_DEBUG ((LM_DEBUG ,
-                    "TM::commitResource::Requirement name matched\n"));
               // search for the resourcename in the resourceType
               for (CORBA::ULong k = 0;k < available[j].resourceType.length ();k++)
                 {
                   if (!ACE_OS::strcmp (deployed[i].resourceName,
                                available[j].resourceType[k]))
                     {
-                      if (CIAO::debug_level () > 9)
-                        ACE_DEBUG ((LM_DEBUG ,
-                           "TM::commitResource::Resource name matched\n"));
-
                       try {
                         match_properties (deployed[i].property,
                                           available[j].property);
@@ -470,9 +404,6 @@ match_properties (
             // some specialised algo
             // for now assuming Capacity ....
             // and tk_double ....
-            if (CIAO::debug_level () > 9)
-              ACE_DEBUG ((LM_DEBUG ,
-                          "TM::commitResource::Property name matched\n"));
 
               commit_release_resource (deployed[i] , available[j]);
               property_found = true;
@@ -514,16 +445,11 @@ void CIAO::DomainDataManager::commit_release_resource (
       if (available_d >= required_d)
         {
           available_d = available_d - required_d;
-          if (CIAO::debug_level () > 9)
-            ACE_DEBUG ((LM_DEBUG, "TM::The available is [%f]",
-                        available_d));
 
           available.value <<= available_d;
         }
       else
         {
-          ACE_DEBUG ((LM_DEBUG, "Insufficient resources! Available: %d, Required %d\n",
-                      available_d, required_d));
           ::Deployment::ResourceCommitmentFailure failure;
 
           failure.reason = CORBA::string_dup ("Insufficient resources!");
@@ -547,10 +473,6 @@ void CIAO::DomainDataManager::commit_release_resource (
 
       // Should we check for bin > 100 ??????
 
-      if (CIAO::debug_level () > 9)
-        ACE_DEBUG ((LM_DEBUG, "TM::The available is [%f]",
-                    available_d));
-
       available.value <<= available_d;
     }
 }
@@ -559,10 +481,6 @@ void CIAO::DomainDataManager::stop_monitors ()
 {
 
   CORBA::ULong length = initial_domain_.node.length ();
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Number of nodes in domain.cdd is : %d\n", length));
-    }
 
   for (CORBA::ULong i=0;i < length;i++)
     {
@@ -585,18 +503,13 @@ void CIAO::DomainDataManager::stop_monitors ()
 
       if (!CORBA::is_nil (node_manager.in ()))
         {
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG, "Trying to contact nodemanager on %s\n",
-                          initial_domain_.node[i].name.in ()));
-            }
           try
             {
               node_manager->leaveDomain ();
             }
           catch (CORBA::Exception& ex)
             {
-              ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Leave Domain\n"));
+              ACE_ERROR ((LM_ERROR , "TM::Error in calling Leave Domain\n"));
               ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in "
                                    "DomainDataManager::leaveDomain");
             }
@@ -640,10 +553,6 @@ int CIAO::DomainDataManager::add_to_domain (
         }
   }
 
-//  ::Deployment::DnC_Dump::dump (this->provisioned_data_);
-
-  ACE_DEBUG ((LM_DEBUG, "TM::Node Up Message Processed\n"));
-
   return 0;
 }
 
@@ -795,7 +704,7 @@ commit_release_RA (const ::Deployment::ResourceAllocations& resources)
     catch (::Deployment::ResourceCommitmentFailure& ex)
     {
       // catch the exception and add parameters
-      ACE_DEBUG ((LM_DEBUG, "Caught the Exception in releaseResourceAllocation\n"));
+      ACE_ERROR ((LM_ERROR, "Caught the Exception in releaseResourceAllocation\n"));
       ex.index = i;
       throw ex;
     }
@@ -819,9 +728,6 @@ CIAO::DomainDataManager::find_resource (
       if (!ACE_OS::strcmp (resource.elementName.in () ,
             this->temp_provisioned_data_.node[j].name.in ()))
       {
-        if (CIAO::debug_level () > 9)
-          ACE_DEBUG ((LM_DEBUG ,
-                "TM::commitResource::Element name matched\n"));
         for (CORBA::ULong k =0;
               k < this->temp_provisioned_data_.node[j].resource.length ();
               k++)
diff --git a/DAnCE/TargetManager/DomainDataManager.h b/DAnCE/TargetManager/DomainDataManager.h
index d1234a0beb3..f318cf22aec 100644
--- a/DAnCE/TargetManager/DomainDataManager.h
+++ b/DAnCE/TargetManager/DomainDataManager.h
@@ -51,7 +51,7 @@ namespace CIAO
                            ::Deployment::DomainUpdateKind updateKind
                            );
       /**
-       * @brief        This function is called the Executor code
+       * @brief        This function is called from the Executor code
        *               to get the Original Domain data.
        * @return       Domain* The Initial Domain
        *
@@ -59,7 +59,7 @@ namespace CIAO
       ::Deployment::Domain* get_initial_domain ();
 
       /**
-       * @brief       This function is called the Executor code
+       * @brief       This function is called from the Executor code
        *              to get the Current Domain data.
        * @return      Domain* The Current Domain
        */
@@ -70,7 +70,7 @@ namespace CIAO
        * @param orb The orb pointer
        * @param target The Target Manager Object Reference
        *
-       * @description This function calls the constructor of the
+       * This function calls the constructor of the
        *              class Domain Data Manager
        */
       static DomainDataManager * create (CORBA::ORB_ptr orb,
@@ -81,7 +81,7 @@ namespace CIAO
        * @brief Returns the static pointer to the
        *        data manager.
        * @return DomainDataManager*
-       * @description The staic get_data_manger function returning
+       * The staic get_data_manger function returning
        *              the data_manager pointer
        */
       static DomainDataManager* get_data_manager ();
@@ -139,30 +139,26 @@ namespace CIAO
         * @brief The function makes a call on the leaveDomain on the
         *        NodeManager
         *
-        * @description The node manager in turn stops the monitor
+        * The node manager in turn stops the monitor
         *
         */
        void stop_monitors ();
 
        /**
-        * @function commitResourceAllocation
-        *
         * @brief The function allocates resources specified in the
         * parameter
         *
-        * @description This function is for the ResourceCommitmentManager
+        * This function is for the ResourceCommitmentManager
         *
         */
        void commitResourceAllocation (
            const ::Deployment::ResourceAllocations & resources);
 
        /**
-        * @function releaseResourceAllocation
-        *
         * @brief The function releases resources specified in the
         * parameter
         *
-        * @description This function is for the ResourceCommitmentManager
+        * This function is for the ResourceCommitmentManager
         *
         */
        void releaseResourceAllocation (
@@ -170,11 +166,10 @@ namespace CIAO
 
       private:
 
-
       /**
        * @param orb The orb pointer
        * @param target The Target Manager Object Reference
-       * @description The constructor made proteccted so that no one can create
+       * The constructor made proteccted so that no one can create
        *              it.
        */
       DomainDataManager (CORBA::ORB_ptr orb,
@@ -320,7 +315,6 @@ namespace CIAO
       /// The current action
       Action current_action_;
     };
-
 } // CIAO
 
 
diff --git a/DAnCE/TargetManager/TargetManagerExt.idl b/DAnCE/TargetManager/TargetManagerExt.idl
index 025d8188e39..26d0c336b62 100644
--- a/DAnCE/TargetManager/TargetManagerExt.idl
+++ b/DAnCE/TargetManager/TargetManagerExt.idl
@@ -12,12 +12,6 @@
  * a facet by the TargetManager component
  */
 
-/**
- * @module CIAO
- *
- * @brief The CIAO module
- */
-
 #include "DAnCE/Interfaces/NodeManagerDaemon.idl"
 
 module CIAO
@@ -55,7 +49,10 @@ module CIAO
    */
   struct Host_NodeManager
   {
+    /// host name
     string host_;
+
+    /// the node manager IOR
     ::CIAO::NodeManagerDaemon node_mgr_;
   };
 
@@ -71,9 +68,17 @@ module CIAO
    */
   interface TargetManagerExt
   {
+    ///Returns the pid in which a component runs
     long get_pid (in string component_uuid);
+    
+    /// returns the cpu usage for each host in the 
+    /// last cycle
     Host_Infos get_host_cpu ();
+    
+    /// Return the detail of the components
     Component_Infos get_component_cpu ();
+
+    /// Returns the OR of the Node managers
     Host_NodeManager_seq get_all_node_managers ();
   };
 };
diff --git a/DAnCE/TargetManager/TargetManagerImpl.idl b/DAnCE/TargetManager/TargetManagerImpl.idl
index e37b2e8d8e1..343567e15b4 100644
--- a/DAnCE/TargetManager/TargetManagerImpl.idl
+++ b/DAnCE/TargetManager/TargetManagerImpl.idl
@@ -15,12 +15,6 @@
 #include "TargetManagerExt.idl"
 #include "DomainEvents.idl"
 
-/**
- * @module CIAO
- *
- * @brief TargetManager interface defintion
- *
- */
 module CIAO
 {
   component TargetManagerImpl
diff --git a/DAnCE/TargetManager/TargetManager_exec.cpp b/DAnCE/TargetManager/TargetManager_exec.cpp
index c3378aae403..f59e8153808 100644
--- a/DAnCE/TargetManager/TargetManager_exec.cpp
+++ b/DAnCE/TargetManager/TargetManager_exec.cpp
@@ -1,13 +1,4 @@
 // $Id$
-//===============================================================
-/**
- * @file TargetManager_exec.cpp
- *
- * @brief TargetManager Executor code
- *
- * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
- */
-//===============================================================
 #include "TargetManager_exec.h"
 #include "ciao/CIAO_common.h"
 #include <orbsvcs/CosNamingC.h>
@@ -37,22 +28,16 @@ namespace CIDL_TargetManager_i
 
     // get its own obj ref , then call
 
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: getting ccm object\n"));
     CORBA::Object_var object = context_->get_CCM_object ();
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: narrowing target_impl\n"));
     CIAO::TargetManagerImpl_var target_impl =
             CIAO::TargetManagerImpl::_narrow (object.in ());
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: provide target manager\n"));
     ::Deployment::TargetManager_var target =
             target_impl->provide_targetMgr ();
-    //    dataManager_.reset (new CIAO::DomainDataManager (orb, target.in ()));
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: creating domain data manager\n"));
     
     // Create Domain Data here 
   
     CIAO::DomainDataManager::create (orb_, target.in ());
 //    CIAO::Domain_Singleton::instance ();
-    ACE_DEBUG ((LM_DEBUG, "TM_Exec: DDD created!\n"));
   }
 
   TargetManager_exec_i::~TargetManager_exec_i (void)
@@ -111,11 +96,6 @@ namespace CIDL_TargetManager_i
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , ".. Update Domain called ...\n"));
-      }
-
     CIAO::DomainDataManager::
       get_data_manager ()->update_domain (
                     elements,
@@ -131,10 +111,6 @@ namespace CIDL_TargetManager_i
     if (updateKind == ::Deployment::Delete ||
         updateKind == ::Deployment::Add)
       {
-        if (CIAO::debug_level () > 9)
-          {
-            ACE_DEBUG ((LM_DEBUG , "TM::Creating the changed event\n"));
-          }
 
         CIAO::Domain_Changed_Event_var changed_event =
           new OBV_CIAO::Domain_Changed_Event ();
@@ -142,25 +118,10 @@ namespace CIDL_TargetManager_i
         ::Deployment::Domain_var temp_domain =
           new ::Deployment::Domain (domainSubset);
 
-        if (CIAO::debug_level () > 9)
-          {
-            ACE_DEBUG ((LM_DEBUG , "TM::After getting the current domain\n"));
-          }
-
         changed_event->changes (temp_domain);
         changed_event->change_kind (updateKind);
 
-        if (CIAO::debug_level () > 9)
-          {
-            ACE_DEBUG ((LM_DEBUG , "TM::Sending the event to the Planner_Manager\n"));
-          }
-
         context_->push_changes (changed_event);
-
-        if (CIAO::debug_level () > 9)
-          {
-            ACE_DEBUG ((LM_DEBUG , "TM::After   Sending the event to the Planner_Manager\n"));
-          }
       }
 
   }
@@ -172,7 +133,6 @@ namespace CIDL_TargetManager_i
   ACE_THROW_SPEC ((::CORBA::SystemException,
                    ::Deployment::ResourceCommitmentFailure))
   {
-    ACE_DEBUG ((LM_DEBUG, "Create Resource Commitment called \n\n"));
     
     CIAO::ResourceCommitmentManager_i *commit_servant =
       new CIAO::ResourceCommitmentManager_i ();
@@ -186,7 +146,6 @@ namespace CIDL_TargetManager_i
     Deployment::ResourceCommitmentManager_var mgrv =
       commit_servant->_this ();
 
-    ACE_DEBUG ((LM_DEBUG, "Returning from Create Resource Commitment \n\n"));
     return mgrv._retn ();
   }
 
@@ -223,7 +182,6 @@ namespace CIDL_TargetManager_i
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get PID :: Skeleton Impl"));
     return CIAO::DomainDataManager::
       get_data_manager ()->get_pid (component_uuid);
   }
@@ -234,7 +192,6 @@ namespace CIDL_TargetManager_i
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get host cpu :: Skeleton Impl entering\n"));
     return CIAO::DomainDataManager::
       get_data_manager ()->get_cpu_info ();
   }
@@ -244,11 +201,6 @@ namespace CIDL_TargetManager_i
                                               ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get component cpu :: Skeleton Impl"));
-
-    // todo
-
     return 0;
   }
 
@@ -286,10 +238,6 @@ namespace CIDL_TargetManager_i
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
-    if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Calling TM constructor"));
-    }
 
     if (CORBA::is_nil (this->exec_object_.in ()))
       {
@@ -366,10 +314,6 @@ namespace CIDL_TargetManager_i
   ::Components::CCMException))
   {
     // Your code here.
-    if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Inside CCM_ACTIVATE\n"));
-    }
     this->get_targetMgr ();
   }
 
@@ -391,11 +335,9 @@ namespace CIDL_TargetManager_i
   ::Components::CCMException))
   {
     // Your code here.
-    ACE_DEBUG ((LM_DEBUG , "TM::ccm_remove , calling LeaveDomain\n"));
 
     //CIAO::DomainDataManager::get_data_manager ()->stop_monitors ();
 
-    ACE_DEBUG ((LM_DEBUG , "TM::ccm_remove , After calling LeaveDomain\n"));
     return;
   }
 
diff --git a/DAnCE/TargetManager/TargetManager_exec.h b/DAnCE/TargetManager/TargetManager_exec.h
index 9a2bbe96983..125d2265556 100644
--- a/DAnCE/TargetManager/TargetManager_exec.h
+++ b/DAnCE/TargetManager/TargetManager_exec.h
@@ -24,6 +24,9 @@
 #include "tao/LocalObject.h"
 #include "DomainDataManager.h"
 
+/**
+ * TargetManager Executor namespace
+ */
 namespace CIDL_TargetManager_i
 {
   class TargetManager_exec_i;