Tue Sep 8 08:38:10 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 45 insertions, 42 deletions

diff --git a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
index b7178e54009..da3c31654a1 100644
--- a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Domain_Application_Impl.h"
-#include "ace/Log_Msg.h"
+
 #include "ace/streams.h"
 #include "DAnCE/Logger/Log_Macros.h"
 
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index f9797b8a1e4..89ac4586b29 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -122,7 +122,7 @@ DomainApplicationManager_Impl::destroyApplication (Deployment::Application_ptr a
     }
   catch (const Deployment::StopError &e)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO
+      DANCE_ERROR ((LM_ERROR, DLINFO
                   ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
                   ACE_TEXT("Propagating a received StopError exception\n")));
       throw e;
@@ -135,7 +135,7 @@ DomainApplicationManager_Impl::destroyApplication (Deployment::Application_ptr a
       throw Deployment::StopError();
     }
 
-  ACE_ERROR ((LM_ERROR, DLINFO
+  DANCE_ERROR ((LM_ERROR, DLINFO
               ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
               ACE_TEXT("Provided application reference unknown\n")));
   throw Deployment::StopError();
diff --git a/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp b/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
index 5f0a0e58d18..ccf38df6931 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
@@ -161,6 +161,9 @@ namespace DAnCE
       }
     catch (...)
       {
+        DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Node_Locator::ns_lookup - ")
+                      ACE_TEXT("Caught unexpected exception while looking up name %s\n"),
+                      nodename));
       }
 
     return ::Deployment::NodeManager::_nil ();
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
index 7e40eabf0fb..17605c48882 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
@@ -2,7 +2,7 @@
 // $Id$
 
 #include "ExecutionManager_Impl.h"
-#include "ace/Log_Msg.h"
+
 #include "tools/Config_Handlers/DnC_Dump.h"
 #include "DAnCE/Logger/Log_Macros.h"
 
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 60d698a398f..47fe5984294 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -2,7 +2,7 @@
 
 #include "NodeManager_Impl.h"
 
-#include "ace/Log_Msg.h"
+
 #include "ace/streams.h"
 
 #include "DAnCE/Logger/Log_Macros.h"
@@ -77,7 +77,7 @@ namespace DAnCE
                                 ::CORBA::Long /*updateInterval*/)
   {
     DANCE_TRACE ( "NodeManager_Impl::joinDomain");
-    ACE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_Impl::joinDomain - ")
+    DANCE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_Impl::joinDomain - ")
                 ACE_TEXT("joinDomain not implemented\n")));
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -86,7 +86,7 @@ namespace DAnCE
   NodeManager_Impl::leaveDomain ()
   {
     DANCE_TRACE ( "NodeManager_Impl::leaveDomain");
-    ACE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_Impl::leaveDomain - ")
+    DANCE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_Impl::leaveDomain - ")
                 ACE_TEXT("leave not implemented\n")));
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -121,7 +121,7 @@ namespace DAnCE
                       plan.UUID.in ()));
         throw ::Deployment::PlanError();
       }
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** size of properties_:%u\n"), properties_.current_size ()));
+    DANCE_DEBUG ((LM_DEBUG, ACE_TEXT("*** size of properties_:%u\n"), properties_.current_size ()));
     DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("NodeManager_impl::preparePlan - creating NodeApplicationManager...\n")));
     NodeApplicationManager_Impl* manager = 0;
     ACE_NEW_THROW_EX (manager,
@@ -175,7 +175,7 @@ namespace DAnCE
   NodeManager_Impl::getDynamicResources ()
   {
     DANCE_TRACE ( "NodeManager_Impl::getDynamicResources ()");
-    ACE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_Impl::getDynamicResources - ")
+    DANCE_DEBUG ((LM_ERROR, DLINFO ACE_TEXT("NodeManager_Impl::getDynamicResources - ")
                 ACE_TEXT("getDynamicResources not implemented\n")));
       throw CORBA::NO_IMPLEMENT ();
     return 0;
diff --git a/CIAO/DAnCE/TargetManager/CmpClient.cpp b/CIAO/DAnCE/TargetManager/CmpClient.cpp
index b35912393cb..8317cd05e97 100644
--- a/CIAO/DAnCE/TargetManager/CmpClient.cpp
+++ b/CIAO/DAnCE/TargetManager/CmpClient.cpp
@@ -61,7 +61,7 @@ namespace TM_Tester
           break;
         case '?':  // display help for use of the server.
         default:
-          ACE_ERROR_RETURN ((LM_ERROR,
+          DANCE_ERROR_RETURN ((LM_ERROR,
                 "usage:  %s\n"
                 "-t <TM_IOR>\n"
                 "-u <host_name in update>\n"
@@ -108,12 +108,12 @@ namespace TM_Tester
       }
       catch(CORBA::NO_IMPLEMENT &)
       {
-        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+        DANCE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
       catch(CORBA::Exception &)
       {
-        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception\n"));
-        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:Exception in TargetManager call\n"));
+        DANCE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception\n"));
+        DANCE_ERROR ((LM_ERROR ,"Error:TargetManager:Exception in TargetManager call\n"));
       }
 
 
@@ -145,14 +145,14 @@ namespace TM_Tester
       }
       catch(const CORBA::NO_IMPLEMENT &)
       {
-        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
       catch (const ::Deployment::ResourceCommitmentFailure& e)
       {
         resource_available = 0;
-        ACE_ERROR ((LM_ERROR, "TargetManager commitResources ResourceCommitmentFailure Exception\n"));
+        DANCE_ERROR ((LM_ERROR, "TargetManager commitResources ResourceCommitmentFailure Exception\n"));
 
-        ACE_ERROR ((LM_ERROR ,
+        DANCE_ERROR ((LM_ERROR ,
               "ResourceCommitmentFailure\n reason=[%C]\n elementName=[%C]\n resourceName=[%C]\n propertyName=[%C]\n",
               e.reason.in (),
               resource_seq[e.index].elementName.in (),
@@ -161,9 +161,9 @@ namespace TM_Tester
       }
       catch(const CORBA::Exception &)
       {
-        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"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager:commitResources Exception\n"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in TargetManager call"));
       }
 
       // Make a call to release resources , if resource < 0
@@ -177,17 +177,17 @@ namespace TM_Tester
       }
       catch(const CORBA::NO_IMPLEMENT &)
       {
-        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
       catch (const Deployment::ResourceCommitmentFailure&)
       {
-        ACE_ERROR ((LM_ERROR, "Error:TargetManager releaseResources ResourceNotAvailable Exception\n"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager releaseResources ResourceNotAvailable Exception\n"));
       }
       catch(const CORBA::Exception &)
       {
-        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"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager:releaseResources Exception\n"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in TargetManager call"));
       }
 
       // Here make a call on the TM with update domain and node deletion
@@ -210,12 +210,12 @@ namespace TM_Tester
           }
           catch(CORBA::NO_IMPLEMENT &)
           {
-            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+            DANCE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
           }
           catch(CORBA::Exception &)
           {
-            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
-            ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
+            DANCE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+            DANCE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
           }
         }
         else
@@ -226,12 +226,12 @@ namespace TM_Tester
           }
           catch(CORBA::NO_IMPLEMENT &)
           {
-            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+            DANCE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
           }
           catch(CORBA::Exception &)
           {
-            ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
-            ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
+            DANCE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
+            DANCE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
           }
         }
       }
@@ -248,12 +248,12 @@ namespace TM_Tester
       }
       catch(CORBA::NO_IMPLEMENT &)
       {
-        ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
+        DANCE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
       catch(CORBA::Exception &)
       {
-        ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception\n"));
-        ACE_ERROR ((LM_ERROR,  "Error:TargetManager:Exception in TargetManager call\n"));
+        DANCE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception\n"));
+        DANCE_ERROR ((LM_ERROR,  "Error:TargetManager:Exception in TargetManager call\n"));
       }
 
       // Finally destroy the ORB
@@ -261,7 +261,7 @@ namespace TM_Tester
     }
     catch (CORBA::Exception &)
     {
-      ACE_ERROR ((LM_ERROR,  "Error:TargetManager:CORBA exception raised!\n"));
+      DANCE_ERROR ((LM_ERROR,  "Error:TargetManager:CORBA exception raised!\n"));
     }
     return 0;
   }
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
index 0e12253df65..ebb5cdd8a44 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
@@ -133,7 +133,7 @@ int DAnCE::DomainDataManager::call_all_node_managers ()
   
 /*  if ( this->deployment_config_.init ("NodeDetails.dat") == -1 )
     {
-      ACE_ERROR ((LM_ERROR,
+      DANCE_ERROR ((LM_ERROR,
                   "TargetM (%P|%t) DomainDataManager.cpp -"
                   "DAnCE::DomainDataManager::call_all_node_managers -"
                   "ERROR while trying to initialize after reading "
@@ -156,7 +156,7 @@ int DAnCE::DomainDataManager::call_all_node_managers ()
         }
       catch (CORBA::Exception&)
         {
-          ACE_ERROR ((LM_ERROR, "DANCE::TM (%P|%t) DomainDataManager.cpp: "
+          DANCE_ERROR ((LM_ERROR, "DANCE::TM (%P|%t) DomainDataManager.cpp: "
                       "Error trying to contact NodeManager %s\n",
                       initial_domain_.node[i].name.in ()));
           continue;
@@ -184,7 +184,7 @@ int DAnCE::DomainDataManager::call_all_node_managers ()
             }
           catch (CORBA::Exception& ex)
             {
-              ACE_ERROR ((LM_ERROR , "TM::Error in calling Join Domain==\n"));
+              DANCE_ERROR ((LM_ERROR , "TM::Error in calling Join Domain==\n"));
               ex._tao_print_exception (
                 "Exception caught in ""DomainDataManager::joinDomain");
             }
@@ -362,12 +362,12 @@ void DAnCE::DomainDataManager::commit_release_resource (
       CORBA::Long required_d;
 
       if ((deployed.value >>= required_d) == false)
-        ACE_ERROR ((LM_ERROR, "Failed to extract required amount\n"));
+        DANCE_ERROR ((LM_ERROR, "Failed to extract required amount\n"));
 
       CORBA::Long available_d;
 
       if ((available.value >>= available_d) == false)
-        ACE_ERROR ((LM_ERROR, "failed to extract available amount\n"));
+        DANCE_ERROR ((LM_ERROR, "failed to extract available amount\n"));
 
       if (available_d >= required_d)
         {
@@ -422,7 +422,7 @@ void DAnCE::DomainDataManager::stop_monitors ()
         }
       catch (const CORBA::Exception&)
         {
-          ACE_ERROR ((LM_ERROR, "DANCE::TM (%P|%t) DomainDataManager.cpp: "
+          DANCE_ERROR ((LM_ERROR, "DANCE::TM (%P|%t) DomainDataManager.cpp: "
                       "Error in get Node Manager from Deployment Config %s\n",
                       initial_domain_.node[i].name.in ()));
           continue;
@@ -436,7 +436,7 @@ void DAnCE::DomainDataManager::stop_monitors ()
             }
           catch (CORBA::Exception& ex)
             {
-              ACE_ERROR ((LM_ERROR , "TM::Error in calling Leave Domain\n"));
+              DANCE_ERROR ((LM_ERROR , "TM::Error in calling Leave Domain\n"));
               ex._tao_print_exception (
                 "Exception caught in ""DomainDataManager::leaveDomain");
             }
@@ -646,7 +646,7 @@ int DAnCE::DomainDataManager::commit_release_RA (const ::Deployment::ResourceAll
     catch (::Deployment::ResourceCommitmentFailure& ex)
     {
       // catch the exception and add parameters
-      ACE_ERROR ((LM_ERROR, "Caught the Exception in releaseResourceAllocation\n"));
+      DANCE_ERROR ((LM_ERROR, "Caught the Exception in releaseResourceAllocation\n"));
       ex.index = i;
       throw ex;
     }