Fri Aug 10 10:59:29 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
          Fixed incorrect debug statements

        * dance/LocalityManager/Scheduler/Events/Install.cpp:
          Layout changes

3 files changed, 23 insertions, 16 deletions

diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 2d826b49b63..b178e22bddb 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug 10 10:59:29 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
+          Fixed incorrect debug statements
+
+        * dance/LocalityManager/Scheduler/Events/Install.cpp:
+          Layout changes
+
 Mon Jul 30 08:03:48 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tools/Logger_Backend/ndds/Log_Backend.cpp:
diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp
index 0ef843479c3..434e0130ce6 100644
--- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp
+++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp
@@ -88,7 +88,7 @@ namespace DAnCE
           {
             DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
                          (LM_DEBUG, DLINFO
-                          ACE_TEXT ("LocalityManager_i::configure - ")
+                          ACE_TEXT ("LocalityManager_i::init - ")
                           ACE_TEXT ("Using provided spawn delay %u\n"),
                           this->spawn_delay_));
           }
@@ -125,6 +125,7 @@ namespace DAnCE
       {
         DANCE_ERROR (DANCE_LOG_MAJOR_DEBUG_INFO,
                      (LM_WARNING, DLINFO
+                      ACE_TEXT ("LocalityManager_i::init - ")
                       ACE_TEXT ("Warning: No configuration properties\n")));
       }
   }
@@ -203,7 +204,7 @@ namespace DAnCE
       {
         DANCE_DEBUG (DANCE_LOG_EVENT_TRACE,
                      (LM_TRACE, DLINFO
-                      ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                      ACE_TEXT ("LocalityManager_i::install_instances - ")
                       ACE_TEXT ("Starting installation of %C type instances\n"),
                       i->c_str ()));
 
@@ -215,7 +216,7 @@ namespace DAnCE
           {
             DANCE_DEBUG (DANCE_LOG_EVENT_TRACE,
                          (LM_TRACE, DLINFO
-                          ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                          ACE_TEXT ("LocalityManager_i::install_instances - ")
                           ACE_TEXT ("Starting installation of instance %C\n"),
                           this->plan_.instance[*j].name.in ()));
 
@@ -241,7 +242,7 @@ namespace DAnCE
       {
         DANCE_ERROR (DANCE_LOG_ERROR,
                      (LM_ERROR, DLINFO
-                      ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                      ACE_TEXT ("LocalityManager_i::install_instances - ")
                       ACE_TEXT ("Timed out while waiting on completion of scheduler\n")));
       }
 
@@ -254,7 +255,7 @@ namespace DAnCE
       {
         DANCE_ERROR (DANCE_LOG_ERROR,
                      (LM_WARNING, DLINFO
-                      ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                      ACE_TEXT ("LocalityManager_i::install_instances - ")
                       ACE_TEXT ("Received only %u completed events, expected %u\n"),
                       dispatched,
                       completed_events.size ()));
@@ -269,7 +270,7 @@ namespace DAnCE
           {
             DANCE_ERROR (DANCE_LOG_ERROR,
                          (LM_ERROR, DLINFO
-                          ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                          ACE_TEXT ("LocalityManager_i::install_instances - ")
                           ACE_TEXT ("Failed to get future value for current instance\n")));
             continue;
           }
@@ -287,7 +288,7 @@ namespace DAnCE
           {
             DANCE_ERROR (DANCE_LOG_TERMINAL_ERROR,
                          (LM_ERROR, DLINFO
-                          ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                          ACE_TEXT ("LocalityManager_i::install_instances - ")
                           ACE_TEXT ("Error: Unknown exception propagated\n")));
             throw ::Deployment::StartError (event.id_.c_str (),
                                             "Unknown exception");
@@ -295,7 +296,7 @@ namespace DAnCE
 
         DANCE_DEBUG (DANCE_LOG_MAJOR_EVENT,
                      (LM_INFO, DLINFO
-                      ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                      ACE_TEXT ("LocalityManager_i::install_instances - ")
                       ACE_TEXT ("Instance <%C> successfully deployed\n"),
                       event.id_.c_str ()));
 
@@ -375,7 +376,7 @@ namespace DAnCE
       {
         DANCE_ERROR (DANCE_LOG_ERROR,
                      (LM_ERROR, DLINFO
-                      ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                      ACE_TEXT ("LocalityManager_i::collect_references - ")
                       ACE_TEXT ("Timed out while waiting on completion of scheduler\n")));
       }
 
@@ -388,7 +389,7 @@ namespace DAnCE
       {
         DANCE_ERROR (DANCE_LOG_ERROR,
                      (LM_WARNING, DLINFO
-                      ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                      ACE_TEXT ("LocalityManager_i::collect_references - ")
                       ACE_TEXT ("Received only %u completed events, expected %u\n"),
                       dispatched,
                       completed_events.size ()));
@@ -403,7 +404,7 @@ namespace DAnCE
           {
             DANCE_ERROR (DANCE_LOG_ERROR,
                          (LM_ERROR, DLINFO
-                          ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                          ACE_TEXT ("LocalityManager_i::collect_references - ")
                           ACE_TEXT ("Failed to get future value for current instance\n")));
             continue;
           }
@@ -416,7 +417,7 @@ namespace DAnCE
           {
             DANCE_ERROR (DANCE_LOG_ERROR,
                          (LM_ERROR, DLINFO
-                          ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                          ACE_TEXT ("LocalityManager_i::collect_references - ")
                           ACE_TEXT ("Error: Unknown exception propagated\n")));
             throw ::Deployment::StartError (event.id_.c_str (),
                                             "Unknown exception");
@@ -430,7 +431,7 @@ namespace DAnCE
           {
             DANCE_DEBUG (DANCE_LOG_MAJOR_DEBUG_INFO,
                          (LM_DEBUG, DLINFO
-                          ACE_TEXT ("LocalityManager_i::startLaunch - ")
+                          ACE_TEXT ("LocalityManager_i::collect_references - ")
                           ACE_TEXT ("No reference returned for connection <%C>\n"),
                           event.id_.c_str ()));
           }
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp
index b93cd2c23b5..6ab0a40d0af 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp
@@ -42,8 +42,7 @@ namespace DAnCE
   {
     DANCE_TRACE ("Install_Instance::invoke_pre_interceptor");
 
-    (*i)->pre_install (this->plan_,
-                                this->instanceRef_);
+    (*i)->pre_install (this->plan_, this->instanceRef_);
   }
 
 
@@ -93,7 +92,6 @@ namespace DAnCE
       DAnCE::Utility::create_any_from_exception (ex_tmp);
   }
 
-
   void
   Install_Instance::create_valid_result (Event_Result &result)
   {