Mon Nov 17 16:08:23 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

15 files changed, 110 insertions, 94 deletions

diff --git a/flat/CIAO/CCF/CCF/IDL2/Parser.hpp b/flat/CIAO/CCF/CCF/IDL2/Parser.hpp
index 2a6e6b92b01..6cd00814754 100644
--- a/flat/CIAO/CCF/CCF/IDL2/Parser.hpp
+++ b/flat/CIAO/CCF/CCF/IDL2/Parser.hpp
@@ -20,11 +20,19 @@
 //
 #ifdef CONST
 #undef CONST
+#endif
+#ifdef FACTORY
 #undef FACTORY
+#endif
+#ifdef IN
 #undef IN
+#endif
+#ifdef OUT
 #undef OUT
 #endif
-
+#ifdef interface
+#undef interface
+#endif
 
 namespace CCF
 {
diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index 76f4589ea73..6365651bf60 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Mon Nov 17 16:08:23 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * CCF/CCF/IDL2/Parser.hpp:
+          Undef interface when it is defined
+
+        * DAnCE/DomainApplication/Domain_Application_Impl.cpp
+        * DAnCE/DomainApplication/Domain_Application_Impl.h
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+        * DAnCE/DomainApplicationManager/Node_Locator.cpp
+        * DAnCE/DomainApplicationManager/Node_Locator.h
+        * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
+        * DAnCE/ExecutionManager/ExecutionManager_Module.h
+        * DAnCE/NodeApplication/ServerActivator_Impl.cpp
+        * DAnCE/NodeApplication/ServerActivator_Impl.h
+        * DAnCE/NodeManager/Node_Manager_Exec.cpp
+        * DAnCE/NodeManager/Node_Manager_Module.cpp
+        * DAnCE/NodeManager/Node_Manager_Module.h
+          Various cleanup/layout changes
+
 Mon Nov 17 15:03:23 UTC 2008  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * ciao/ComponentServer/CIAO_ComponentServer.cpp
diff --git a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
index c0071734191..47cabb79cba 100644
--- a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
+++ b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
@@ -42,7 +42,7 @@ namespace DAnCE
       }
     catch(...)
       {
-	DANCE_ERROR((LM_ERROR, DLINFO "DomainApplication_Impl::~DomainApplication_Impl - "
+        DANCE_ERROR((LM_ERROR, DLINFO "DomainApplication_Impl::~DomainApplication_Impl - "
                      "caught an unknown exception.\n"));
       }
   }
diff --git a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h
index 651c41838ad..a81c8426a21 100644
--- a/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h
+++ b/flat/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h
@@ -19,7 +19,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Deployment/Deployment_DomainApplicationS.h"
-#include "ace/Vector_T.h"
 #include "ace/Map_Manager.h"
 #include "Deployment/Deployment_NodeApplicationC.h"
 #include "Deployment/Deployment_NodeApplicationManagerC.h"
@@ -39,7 +38,6 @@ namespace DAnCE
         : public virtual POA_Deployment::DomainApplication
     {
     public:
-//    typedef ACE_Vector<Deployment::NodeApplication_var> TApplications;
       typedef ACE_Map_Manager < Deployment::NodeApplicationManager_var,
         Deployment::NodeManager_var,
         ACE_Null_Mutex > TNam2Nm;
diff --git a/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 34cd5ccf553..3f0ab7cdb52 100644
--- a/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -63,7 +63,7 @@ DomainApplicationManager_Impl::startLaunch (const Deployment::Properties & confi
   ACE_NEW_THROW_EX (connections,
                     Deployment::Connections (),
                     CORBA::NO_MEMORY ());
-  DomainApplication_Impl* app;
+  DomainApplication_Impl* app = 0;
   ACE_NEW_THROW_EX (app,
                     DomainApplication_Impl (this->sub_app_mgr_,
                                             configProperty,
@@ -75,14 +75,14 @@ DomainApplicationManager_Impl::startLaunch (const Deployment::Properties & confi
   PortableServer::ObjectId_var id = this->poa_->activate_object (app);
   this->running_app_.push_back(app);
 
-  CORBA::Object_var ref = this->poa_->id_to_reference (id);
-  return Deployment::DomainApplication::_narrow (ref.in ());
-
   DANCE_DEBUG ((LM_TRACE, "DomainApplicationManager_Impl::startLaunch - "
                 "Successfully created DomainApplication\n"));
   DANCE_DEBUG ((LM_TRACE, "DomainApplicationManager_Impl::startLaunch - "
                 "Created %u provided references\n",
                 providedReference->length ()));
+
+  CORBA::Object_var ref = this->poa_->id_to_reference (id);
+  return Deployment::DomainApplication::_narrow (ref.in ());
 }
 
 void
@@ -115,7 +115,7 @@ DomainApplicationManager_Impl::destroyApplication (Deployment::Application_ptr a
             }
         }
     }
-  catch (Deployment::StopError &e)
+  catch (const Deployment::StopError &e)
     {
       ACE_ERROR ((LM_ERROR, DLINFO "DomainApplicationManager_impl::destroyApplication - "
                   "Propagating a received StopError exception\n"));
@@ -138,7 +138,7 @@ DomainApplicationManager_Impl::getApplications ()
 {
   DANCE_TRACE ( "DomainApplicationManager_Impl::getApplications ()");
 
-  Deployment::Applications* running_app;
+  Deployment::Applications* running_app = 0;
   ACE_NEW_THROW_EX (running_app,
                     Deployment::Applications(),
                     CORBA::NO_MEMORY());
@@ -162,7 +162,7 @@ DomainApplicationManager_Impl::getPlan ()
 {
   DANCE_TRACE ( DLINFO "DomainApplicationManager_Impl::getPlan ()");
 
-  Deployment::DeploymentPlan* plan;
+  Deployment::DeploymentPlan* plan = 0;
 
   ACE_NEW_THROW_EX (plan,
                     Deployment::DeploymentPlan (this->plan_),
diff --git a/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index f133326d4c4..9433693573f 100644
--- a/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/flat/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -47,11 +47,9 @@ namespace DAnCE
 
       virtual void destroyApplication (Deployment::Application_ptr);
 
-      virtual ::Deployment::Applications * getApplications (
-      );
+      virtual ::Deployment::Applications * getApplications (void);
 
-      virtual ::Deployment::DeploymentPlan * getPlan (
-      );
+      virtual ::Deployment::DeploymentPlan * getPlan (void);
 
       void dump_connections (const ::Deployment::Connections & connections) const;
 
diff --git a/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp b/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
index 7c7043f89fa..1d423c42508 100644
--- a/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
+++ b/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
@@ -19,10 +19,14 @@ namespace DAnCE
   {
     ACE_CString ior;
 
-    if (this->nodes_.find (name,
-                           ior) == 0)
-      return this->resolve_ior (name, ior.c_str ());
-    else return this->ns_lookup (name);
+    if (this->nodes_.find (name, ior) == 0)
+      {
+        return this->resolve_ior (name, ior.c_str ());
+      }
+    else
+      {
+        return this->ns_lookup (name);
+      }
   }
 
   bool
@@ -37,7 +41,7 @@ namespace DAnCE
         return false;
       }
 
-    FILE *inf = ACE_OS::fopen (filename, "r");
+    FILE *inf = ACE_OS::fopen (filename, ACE_TEXT("r"));
 
     if (inf == 0)
       {
@@ -149,7 +153,7 @@ namespace DAnCE
 
         return nm._retn ();
       }
-    catch (CORBA::Exception &e)
+    catch (const CORBA::Exception &e)
       {
         DANCE_ERROR ((LM_ERROR, DLINFO "Node_Locator::ns_lookup - "
                       "Caught CORBA exception while looking up name %s:%C\n",
@@ -157,7 +161,6 @@ namespace DAnCE
       }
     catch (...)
       {
-
       }
 
     return ::Deployment::NodeManager::_nil ();
diff --git a/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h b/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h
index b6b151abfc6..cce7edc96be 100644
--- a/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h
+++ b/flat/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h
@@ -28,28 +28,28 @@ namespace DAnCE
   public:
     Node_Locator (CORBA::ORB_ptr orb,
                   CosNaming::NamingContext_var nc);
-    
+
     ::Deployment::NodeManager_ptr locate_node (const ACE_TCHAR *name);
-    
+
     bool process_node_map (const ACE_TCHAR *file);
-    
+
     void store_ior (const ACE_TCHAR *name, const ACE_TCHAR *ior);
-    
+
   private:
-    ::Deployment::NodeManager_ptr resolve_ior (const ACE_TCHAR *name, 
+    ::Deployment::NodeManager_ptr resolve_ior (const ACE_TCHAR *name,
                                                const ACE_TCHAR *ior);
-    
+
     ::Deployment::NodeManager_ptr ns_lookup (const ACE_TCHAR *name);
-    
-    typedef ACE_Map_Manager<ACE_CString, 
-                            ACE_CString,
+
+    typedef ACE_Map_Manager<ACE_TString,
+                            ACE_TString,
                             ACE_Null_Mutex> NODEMAP;
-    
+
     NODEMAP nodes_;
     CORBA::ORB_var orb_;
     CosNaming::NamingContext_var nc_;
   };
-    
+
 }
 
 #endif /* NODE_LOCATOR_H_ */
diff --git a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
index 5b1bb72f370..7dd4ba032cb 100644
--- a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
+++ b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
@@ -12,9 +12,9 @@ using namespace DAnCE;
 ExecutionManager_Impl::ExecutionManager_Impl (CORBA::ORB_ptr orb,
                                               PortableServer::POA_ptr poa,
                                               CosNaming::NamingContext_ptr nc)
-    : orb_ (CORBA::ORB::_duplicate (orb)),
-      poa_ (PortableServer::POA::_duplicate (poa)),
-      locator_ (orb, nc)
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    poa_ (PortableServer::POA::_duplicate (poa)),
+    locator_ (orb, nc)
 {
   DANCE_TRACE ( "ExecutionManager_Impl::ExecutionManager_Impl");
 }
@@ -58,8 +58,7 @@ ExecutionManager_Impl::preparePlan (const ::Deployment::DeploymentPlan & plan,
       return Deployment::DomainApplicationManager::_narrow (ref.in ());
     }
 
-
-  DomainApplicationManager_Impl* dam_servant;
+  DomainApplicationManager_Impl* dam_servant = 0;
   ACE_NEW_THROW_EX (dam_servant,
                     DAnCE::DomainApplicationManager_Impl (this->orb_.in (),
                                                           this->poa_.in (),
@@ -83,7 +82,7 @@ ExecutionManager_Impl::getManagers ()
 {
   DANCE_TRACE ( "ExecutionManager_Impl::getManagers ()");
 
-  ::Deployment::DomainApplicationManagers * managers;
+  ::Deployment::DomainApplicationManagers * managers = 0;
   ACE_NEW_THROW_EX (managers,
                     ::Deployment::DomainApplicationManagers(),
                     CORBA::NO_MEMORY());
@@ -97,7 +96,7 @@ ExecutionManager_Impl::getManagers ()
       CORBA::Object_var ref = this->poa_->servant_to_reference ( (*iter).int_id_);
       (*managers) [index]
       = Deployment::DomainApplicationManager::_narrow (ref.in ());
-      index++;
+      ++index;
     }
 
   return managers;
diff --git a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
index 638be446a65..61bd4173a04 100644
--- a/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
+++ b/flat/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
@@ -28,7 +28,7 @@
 #include "tao/Object_Loader.h"
 
 namespace DAnCE
-  {
+{
   class ExecutionManager_Impl;
 }
 
@@ -57,7 +57,7 @@ class DAnCE_ExecutionManager_Module_Export DAnCE_ExecutionManager_Module
         ACE_Vector<ACE_CString> node_managers_;
         bool ignore_failure_;
         const char *node_map_;
-        
+
         SOptions()
             : exec_mgr_file_ (0),
               process_ns_ (false),
@@ -83,10 +83,9 @@ class DAnCE_ExecutionManager_Module_Export DAnCE_ExecutionManager_Module
     virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                              int argc,
                                              ACE_TCHAR *argv []);
-    
-    virtual bool parse_args (int argc,
-                             ACE_TCHAR *argv []);
-    
+
+    virtual bool parse_args (int argc, ACE_TCHAR *argv []);
+
     SOptions options_;
   private:
     /// Storage for ExecutionManager servant.
diff --git a/flat/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.cpp b/flat/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.cpp
index 54010704b52..c9bccf4cfe9 100644
--- a/flat/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.cpp
+++ b/flat/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.cpp
@@ -9,7 +9,6 @@ const char* COMPONENT_SERVER_NAME = "ComponentServer";
 bool read_config_value (const ACE_CString & name,
                         const Components::ConfigValues & config,
                         CORBA::Any_out value)
-throw()
 {
   bool found = false;
   CORBA::ULong len = config.length();
@@ -37,8 +36,8 @@ ServerActivator_Impl::ServerActivator_Impl (CORBA::ORB_ptr orb,
 {
   DANCE_DEBUG ( (LM_DEBUG, "[%M] ServerActivator_Impl::ServerActivator_Impl - started\n"));
 
-  CORBA::Object_var obj;
-  obj = this->orb_->resolve_initial_references ("ProcessDestinationNC");
+  CORBA::Object_var obj =
+    this->orb_->resolve_initial_references ("ProcessDestinationNC");
   if (CORBA::is_nil(obj))
     {
       DANCE_ERROR((LM_ERROR, "[%M] ServerActivator_Impl::ServerActivator_Impl - Failed to retrieve the \"ProcessDestinationNC\" object.\n"));
@@ -86,7 +85,7 @@ ServerActivator_Impl::create_component_server (const ::Components::ConfigValues
 
     if (read_config_value (Components::PROCESS_DESTINATION, config, processDestAny))
       {
-        const char* szProcessDest;
+        const char* szProcessDest = 0;
         processDestAny.in() >>= szProcessDest;
         processDest = szProcessDest;
       }
@@ -113,31 +112,31 @@ ServerActivator_Impl::create_component_server (const ::Components::ConfigValues
     {
       obj = this->naming_->resolve (name);
     }
-  catch (CosNaming::NamingContext::NotFound& )
+  catch (const CosNaming::NamingContext::NotFound& )
     {
       DANCE_ERROR ( (LM_ERROR, "[%M] ServerActivator_Impl::create_component_server - NotFound exception rised."
-                   "(Name : CDMW/SERVICES/ASSEMBLYANDDEPLOYMENT/%s)\n"
+                   "(Name : CDMW/SERVICES/ASSEMBLYANDDEPLOYMENT/%C)\n"
                    , processDest.c_str()));
       throw ::Components::CreateFailure();
     }
-  catch (CosNaming::NamingContext::CannotProceed& )
+  catch (const CosNaming::NamingContext::CannotProceed& )
     {
       DANCE_ERROR ( (LM_ERROR, "[%M] ServerActivator_Impl::create_component_server - NotFound exception rised."
-                   "(Name : CDMW/SERVICES/ASSEMBLYANDDEPLOYMENT/%s)\n"
+                   "(Name : CDMW/SERVICES/ASSEMBLYANDDEPLOYMENT/%C)\n"
                    , processDest.c_str()));
       throw ::Components::CreateFailure();
     }
-  catch (CosNaming::NamingContext::InvalidName& )
+  catch (const CosNaming::NamingContext::InvalidName& )
     {
       DANCE_ERROR ( (LM_ERROR, "[%M] ServerActivator_Impl::create_component_server - NotFound exception rised."
-                   "(Name : CDMW/SERVICES/ASSEMBLYANDDEPLOYMENT/%s)\n"
+                   "(Name : CDMW/SERVICES/ASSEMBLYANDDEPLOYMENT/%C)\n"
                    , processDest.c_str()));
       throw ::Components::CreateFailure();
     }
   DANCE_DEBUG ( (LM_DEBUG, "[%M] ServerActivator_Impl::create_component_server - ComponentServer object resolved\n"));
   //Casting founded object
-  ::Components::Deployment::ComponentServer_var server;
-  server = ::Components::Deployment::ComponentServer::_narrow (obj);
+  ::Components::Deployment::ComponentServer_var server
+    = ::Components::Deployment::ComponentServer::_narrow (obj);
   DANCE_DEBUG ( (LM_DEBUG, "[%M] ServerActivator_Impl::create_component_server - ComponentServer object narrowed\n"));
   if (CORBA::is_nil (server))
     {
@@ -171,6 +170,7 @@ ServerActivator_Impl::remove_component_server (::Components::Deployment::Compone
       DANCE_ERROR ( (LM_ERROR, "[%M] ServerActivator_Impl::remove_component_server - Wrong input parameter\n"));
       throw CORBA::BAD_PARAM();
     }
+
   // find equivalent server in servers list
   bool bFound = false;
   for (TCompServers::iterator iter = this->servers_.begin();
@@ -201,7 +201,7 @@ ServerActivator_Impl::get_component_servers ()
 {
   DANCE_DEBUG ( (LM_DEBUG, "[%M] ServerActivator_Impl::get_component_servers - started\n"));
 
-  ::Components::Deployment::ComponentServers* pServers;
+  ::Components::Deployment::ComponentServers* pServers = 0;
   ACE_NEW_THROW_EX (pServers,
                     ::Components::Deployment::ComponentServers (this->servers_.current_size()),
                     CORBA::NO_MEMORY());
@@ -227,7 +227,7 @@ ServerActivator_Impl::initializeComponentServer (::Components::Deployment::Compo
   Components::Deployment::ComponentServer_var cdmwServer =
     Components::Deployment::ComponentServer::_narrow (server);
 
-  if (CORBA::is_nil (cdmwServer))
+  if (CORBA::is_nil (cdmwServer.in ())
     {
       // Component server is not Cdmw ComponentServer
       DANCE_ERROR ( (LM_ERROR, "[%M] ServerActivator_Impl::initializeComponentServer - ComponentServer is not CdmwComponentServer\n"));
diff --git a/flat/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h b/flat/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h
index d5ca2053cfe..8ce81ca1db6 100644
--- a/flat/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h
+++ b/flat/CIAO/DAnCE/NodeApplication/ServerActivator_Impl.h
@@ -76,9 +76,6 @@ namespace DAnCE
       virtual ::Components::Deployment::ComponentServers * get_component_servers (
       );
 
-
-
-
     private:
       typedef ACE_Map_Manager<ACE_CString, ::Components::Deployment::ComponentServer_var, ACE_Null_Mutex > TCompServers;
       TCompServers servers_;
@@ -88,12 +85,9 @@ namespace DAnCE
       CosNaming::NamingContext_var naming_;
       Components::Deployment::ComponentInstallation_var compInst_;
 
-
     private:
       void initializeComponentServer (::Components::Deployment::ComponentServer_ptr server);
-
     };
-
 };
 
 #endif /*SERVERACTIVATOR_IMPL_H_*/
diff --git a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Exec.cpp b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Exec.cpp
index 4cf2e9cfe81..889604048c5 100644
--- a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Exec.cpp
+++ b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Exec.cpp
@@ -4,4 +4,3 @@
 #define DANCE_MODULE_MAIN_CLASS_NAME DAnCE_NodeManager_Module
 #include "Deployment/Module_Main.h"
 
-
diff --git a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index f3be8606a76..8d6e458dd9e 100644
--- a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -31,7 +31,7 @@ namespace DAnCE
     write_IOR (const ACE_TCHAR * ior_file_name, const char* ior)
     {
       FILE* ior_output_file_ =
-        ACE_OS::fopen (ior_file_name, "w");
+        ACE_OS::fopen (ior_file_name, ACE_TEXT("w"));
 
       if (ior_output_file_)
         {
@@ -90,23 +90,23 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
 {
   ACE_Get_Opt get_opts (argc,
                         argv,
-                        "e:n:p::c::r::ifs:t:h",
+                        ACE_TEXT("e:n:p::c::r::ifs:t:h"),
                         0,
                         0,
                         ACE_Get_Opt::RETURN_IN_ORDER);
 
-  get_opts.long_option ("exec-mgr", 'e', ACE_Get_Opt::ARG_REQUIRED);
-  get_opts.long_option ("node-mgr", 'n', ACE_Get_Opt::ARG_REQUIRED);
-  get_opts.long_option ("process-ns", 'p', ACE_Get_Opt::ARG_OPTIONAL);
-  get_opts.long_option ("create-plan-ns", 'c', ACE_Get_Opt::ARG_OPTIONAL);
-  get_opts.long_option ("rebind-plan-ns", 'r', ACE_Get_Opt::ARG_OPTIONAL);
-  get_opts.long_option ("port-indirection", 'i', ACE_Get_Opt::NO_ARG);
-  get_opts.long_option ("ignore-failure", 'f', ACE_Get_Opt::NO_ARG);
-  get_opts.long_option ("server-executable", 's', ACE_Get_Opt::ARG_REQUIRED);
-  get_opts.long_option ("server-args", ACE_Get_Opt::ARG_REQUIRED);
-  get_opts.long_option ("standalone-nm", ACE_Get_Opt::NO_ARG);
-  get_opts.long_option ("timeout", 't', ACE_Get_Opt::ARG_REQUIRED);
-  get_opts.long_option ("help", 'h', ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT("exec-mgr"), 'e', ACE_Get_Opt::ARG_REQUIRED);
+  get_opts.long_option (ACE_TEXT("node-mgr"), 'n', ACE_Get_Opt::ARG_REQUIRED);
+  get_opts.long_option (ACE_TEXT("process-ns"), 'p', ACE_Get_Opt::ARG_OPTIONAL);
+  get_opts.long_option (ACE_TEXT("create-plan-ns"), 'c', ACE_Get_Opt::ARG_OPTIONAL);
+  get_opts.long_option (ACE_TEXT("rebind-plan-ns"), 'r', ACE_Get_Opt::ARG_OPTIONAL);
+  get_opts.long_option (ACE_TEXT("port-indirection"), 'i', ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT("ignore-failure"), 'f', ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT("server-executable"), 's', ACE_Get_Opt::ARG_REQUIRED);
+  get_opts.long_option (ACE_TEXT("server-args"), ACE_Get_Opt::ARG_REQUIRED);
+  get_opts.long_option (ACE_TEXT("standalone-nm"), ACE_Get_Opt::NO_ARG);
+  get_opts.long_option (ACE_TEXT("timeout"), 't', ACE_Get_Opt::ARG_REQUIRED);
+  get_opts.long_option (ACE_TEXT("help"), 'h', ACE_Get_Opt::NO_ARG);
   //get_opts.long_option ("help", '?');
 
   char c;
@@ -177,8 +177,7 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
           break;
 
         case 0:
-          if (ACE_OS::strcmp (get_opts.long_option (),
-                              "standalone-nm") == 0)
+          if (ACE_OS::strcmp (get_opts.long_option (), ACE_TEXT("standalone-nm")) == 0)
             {
               DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - "
                             "Found option directing NodeManager to run as standalone entity.\n"));
diff --git a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.h b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.h
index d0fcbfb0895..17d23077ee9 100644
--- a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.h
+++ b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.h
@@ -68,9 +68,9 @@ class DAnCE_NodeManager_Module_Export DAnCE_NodeManager_Module
         unsigned int timeout_;
         CORBA::Boolean standalone_;
         const char * server_args_;
-        
+
         SOptions()
-            : process_ns_ (false), 
+            : process_ns_ (false),
               process_ns_file_ (0),
               create_plan_ns_ (false),
               create_plan_ns_ior_ (0),
@@ -90,27 +90,26 @@ class DAnCE_NodeManager_Module_Export DAnCE_NodeManager_Module
 
   /// Destructor.
   ~DAnCE_NodeManager_Module (void);
-    
+
   /// Overload the base class method to create a new instance
   /// of a DAnCE_NodeManager_Module object.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []);
-  
+
   virtual const char * usage (void);
-  
-  virtual bool parse_args (int argc,
-                           ACE_TCHAR *argv []);
+
+  virtual bool parse_args (int argc, ACE_TCHAR *argv []);
 
  private:
   void register_value_factories (void);
   void create_poas (void);
   void create_nm_properties (DAnCE::PROPERTY_MAP &props);
-  
+
   /// Here we store the servants.
   typedef ACE_Map_Manager < ACE_CString,
-    DAnCE::NodeManager_Impl *,
-    ACE_Null_Mutex > Servant_Map;
+                            DAnCE::NodeManager_Impl *,
+                            ACE_Null_Mutex > Servant_Map;
   Servant_Map nm_map_;
   CORBA::ORB_var orb_;
   CosNaming::NamingContext_var domain_nc_;
@@ -118,7 +117,7 @@ class DAnCE_NodeManager_Module_Export DAnCE_NodeManager_Module
   /// Single redirection service for all NMs.
   DAnCE::RedirectionService * redirection_;
   SOptions options_;
-  
+
   PortableServer::POA_var root_poa_;
   PortableServer::POA_var nm_poa_;
 };