Mon Nov 22 10:18:24 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * dance/DAnCE_Utility.h:
        * dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp:
        * dance/LocalityManager/Scheduler/Events/Connect.cpp:
        * dance/LocalityManager/Scheduler/Events/Install.cpp:
        * dance/NodeApplication/NodeApplication_Impl.h:
        * dance/NodeApplication/NodeApplication_Impl.cpp:
        * dance/NodeManager/Node_Manager_Module.cpp:
        * tests/Config_Handlers/Package_Handlers/test.cpp:
        * tests/Config_Handlers/test.cpp:
        * tools/System_Health/Interceptors/SHS_Interceptor.cpp:
          Various layout, logging improvements

11 files changed, 34 insertions, 34 deletions

diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 90906d7814d..6e3e5fbd5d3 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,17 @@
+Mon Nov 22 10:18:24 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * dance/DAnCE_Utility.h:
+        * dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp:
+        * dance/LocalityManager/Scheduler/Events/Connect.cpp:
+        * dance/LocalityManager/Scheduler/Events/Install.cpp:
+        * dance/NodeApplication/NodeApplication_Impl.h:
+        * dance/NodeApplication/NodeApplication_Impl.cpp:
+        * dance/NodeManager/Node_Manager_Module.cpp:
+        * tests/Config_Handlers/Package_Handlers/test.cpp:
+        * tests/Config_Handlers/test.cpp:
+        * tools/System_Health/Interceptors/SHS_Interceptor.cpp:
+          Various layout, logging improvements
+
 Tue Nov  2 11:30:24 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
         * NEWS:
@@ -20,13 +34,13 @@ Sat Oct 30 12:22:01 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
 Fri Oct 29 13:12:01 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
-        * dance/DomainApplicationManager/Node_Locator.cpp
-        * dance/DomainApplicationManager/Node_Locator.h
-        * dance/DAnCE_Properties.idl
+        * dance/DomainApplicationManager/Node_Locator.cpp:
+        * dance/DomainApplicationManager/Node_Locator.h:
+        * dance/DAnCE_Properties.idl:
         Add check on property name and resourceType for Node address in cdd file.
 
-        * dance/DAnCE_Utility.h
-        * dance/DAnCE_Utility.cpp
+        * dance/DAnCE_Utility.h:
+        * dance/DAnCE_Utility.cpp:
         Add get_satisfierproperty_value
 
 Fri Oct 29 11:08:01 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
diff --git a/DAnCE/dance/DAnCE_Utility.h b/DAnCE/dance/DAnCE_Utility.h
index cf7c0ed46b7..e4d34ee2e18 100644
--- a/DAnCE/dance/DAnCE_Utility.h
+++ b/DAnCE/dance/DAnCE_Utility.h
@@ -69,7 +69,6 @@ namespace DAnCE
     void test_and_set_exception (bool &flag, EXCEPTION &exception,
                                  const char *name, const char *reason);
 
-
     DANCE_STUB_Export const char *
     get_instance_type (const ::Deployment::Properties& prop);
 
@@ -146,7 +145,6 @@ namespace DAnCE
   }
 }
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "dance/DAnCE_Utility.tpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp b/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp
index 16266cc5fc1..44e82dd7a99 100644
--- a/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp
+++ b/DAnCE/dance/LocalityManager/Handler/Locality_Manager_Handler_Impl.cpp
@@ -182,8 +182,7 @@ namespace DAnCE
   {
     ::DAnCE::Utility::PROPERTY_MAP pmap (prop.length ());
 
-    ::DAnCE::Utility::build_property_map (pmap,
-                                          prop);
+    ::DAnCE::Utility::build_property_map (pmap, prop);
 
     CORBA::ULong spawn = 0;
     const char *cs_path = 0;
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp
index ae23645cebf..d771c0cfc39 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp
@@ -70,8 +70,8 @@ namespace DAnCE
     DANCE_TRACE ("Connect_Instance::invoke_post_interceptor");
 
     (*i)->post_connect (this->plan_,
-                                 this->connectionRef_,
-                                 this->instance_excep_.in ());
+                        this->connectionRef_,
+                        this->instance_excep_.in ());
   }
 
 
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp
index a4444c8eb75..d994e81a28b 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Install.cpp
@@ -73,9 +73,9 @@ namespace DAnCE
     DANCE_TRACE ("Install_Instance::invoke_post_interceptor");
 
     (*i)->post_install (this->plan_,
-                                 this->instanceRef_,
-                                 this->instance_.in (),
-                                 this->instance_excep_.in ());
+                        this->instanceRef_,
+                        this->instance_.in (),
+                        this->instance_excep_.in ());
   }
 
 
diff --git a/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp b/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp
index 88c6fa142b6..57195aaccd3 100644
--- a/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp
+++ b/DAnCE/dance/NodeApplication/NodeApplication_Impl.cpp
@@ -100,7 +100,6 @@ NodeApplication_Impl::prepare_instances (const LocalitySplitter::TSubPlans& plan
       const ::Deployment::InstanceDeploymentDescription &lm_idd
         = sub_plan.instance[loc_manager_instance];
 
-
       DANCE_DEBUG (4, (LM_DEBUG, DLINFO
                        ACE_TEXT ("NodeApplication_Impl::prepare_instances - ")
                        ACE_TEXT ("Found Locality Manager instance %u:%C, deploying\n"),
@@ -206,8 +205,7 @@ NodeApplication_Impl::prepare_instance (const char *name,
 
   try
     {
-      app = this->localities_[name]->preparePlan (plan,
-                                                  0);
+      app = this->localities_[name]->preparePlan (plan, 0);
       DANCE_DEBUG (6, (LM_DEBUG, DLINFO
                        ACE_TEXT ("NodeApplication_Impl::prepare_instance - ")
                        ACE_TEXT ("Locality <%C> successfully prepared.\n"),
diff --git a/DAnCE/dance/NodeApplication/NodeApplication_Impl.h b/DAnCE/dance/NodeApplication/NodeApplication_Impl.h
index 24f494060ff..c9d9aa2b4ec 100644
--- a/DAnCE/dance/NodeApplication/NodeApplication_Impl.h
+++ b/DAnCE/dance/NodeApplication/NodeApplication_Impl.h
@@ -70,7 +70,6 @@ namespace DAnCE
     typedef std::map <std::string, ::DAnCE::LocalityManager_var>
       LOCALITY_MAP;
 
-
     typedef std::pair <CORBA::ULong, ::Deployment::DeploymentPlan> SUB_PLAN;
     typedef std::map <std::string, SUB_PLAN> PLAN_MAP;
 
diff --git a/DAnCE/dance/NodeManager/Node_Manager_Module.cpp b/DAnCE/dance/NodeManager/Node_Manager_Module.cpp
index 61cb36005f1..2d3412cf61d 100644
--- a/DAnCE/dance/NodeManager/Node_Manager_Module.cpp
+++ b/DAnCE/dance/NodeManager/Node_Manager_Module.cpp
@@ -79,7 +79,6 @@ DAnCE_NodeManager_Module::usage (void)
   return "Node Manager Options:\n"
     "\t-e|--exec-mgr\t\t [execution manager ior file name]\n"
     "\t-n|--node-mgr\t\t <node name> [=node manager ior file name]\n"
-    //    "\t-p|--process-ns\t\t\t [file name] create process name service and store its ior to file name\n"
     "\t-c|--create-plan-ns [NC] create plan objects (components and ports) representation in name context with ior NC\n"
     "\t-r|--rebind-plan-ns [NC] bind plan representation name context to NC\n"
     "\t-i|--port-indirection\t enable plan objects indirection via servant locator\n"
@@ -118,8 +117,6 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
   get_opts.long_option (ACE_TEXT("help"), 'h', ACE_Get_Opt::NO_ARG);
   get_opts.long_option (ACE_TEXT("instance-nc"), ACE_Get_Opt::ARG_REQUIRED);
 
-  //get_opts.long_option ("help", '?');
-
   int c;
   while ( (c = get_opts ()) != -1)
     {
@@ -180,12 +177,8 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
           break;
 
         case 'h':
-          //case '?': // Display help for use of the server.
-          //default:
           ACE_ERROR_RETURN ((LM_ERROR,
-                                this->usage (),
-                                argv [0], c),
-                               false);
+                                this->usage (), argv [0], c), false);
           break;
 
         case 0:
@@ -246,7 +239,7 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
           break;
 
         default:
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ignoring unknown option %i\n"),
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Node_Manager_Module::parse_args - ignoring unknown option %c\n"),
                         c));
         }
     }
@@ -255,8 +248,8 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
 
 CORBA::Object_ptr
 DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
-                                         int argc,
-                                         ACE_TCHAR *argv[])
+                                int argc,
+                                ACE_TCHAR *argv[])
 {
   try
     {
@@ -283,6 +276,8 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
 
       if (!this->parse_args (argc, argv))
         {
+          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::init - ")
+                       ACE_TEXT("Unable to parse the commandline arguments.\n")));
           return CORBA::Object::_nil ();
         }
 
diff --git a/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp b/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp
index 90fdee24c68..a9a2ffc636b 100644
--- a/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp
+++ b/DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp
@@ -13,7 +13,6 @@
 
 static const char *input_file = "BasicSP.cdp";
 
-
 static int
 parse_args (int argc, char *argv[])
 {
@@ -50,7 +49,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-
       if (parse_args (argc, argv) != 0)
         return 1;
 
diff --git a/DAnCE/tests/Config_Handlers/test.cpp b/DAnCE/tests/Config_Handlers/test.cpp
index e1e78cf580d..4cf54852e96 100644
--- a/DAnCE/tests/Config_Handlers/test.cpp
+++ b/DAnCE/tests/Config_Handlers/test.cpp
@@ -8,8 +8,8 @@
 #include "ace/Get_Opt.h"
 #include "Utils/XML_Typedefs.h"
 #include "tao/ORB.h"
-static const char *input_file = "BasicSP.cdp";
 
+static const char *input_file = "BasicSP.cdp";
 
 static int
 parse_args (int argc, char *argv[])
diff --git a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
index 714baeae1f0..ba6c804983b 100644
--- a/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
+++ b/DAnCE/tools/System_Health/Interceptors/SHS_Interceptor.cpp
@@ -87,8 +87,7 @@ namespace DAnCE
     if (exception.type() != ::CORBA::_tc_null)
       {
         std::string result;
-        DAnCE::Utility::stringify_exception_from_any (exception,
-                                                      result);
+        DAnCE::Utility::stringify_exception_from_any (exception, result);
 
         update.new_status = DAnCE::SHS::INST_ERROR;
         update.instance_info.length (info_idx + 1);