Wed Nov 26 16:17:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 35 insertions, 23 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index daa935f4677..0254731e6d7 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed Nov 26 16:17:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+          Layout changes
+
+        * DAnCE/NodeManager/Node_Manager_Module.cpp:
+          Layout changes to the help message
+
+        * examples/Hello/Receiver/Receiver_exec.cpp:
+        * examples/Hello/Sender/starter.cpp:
+          Unicode changes
+
 Wed Nov 26 15:04:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/ComponentServer/Configurators/NoOp/NoOp_Configurator.mpc:
diff --git a/flat/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/flat/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index 434fde90a61..9ebd5b13356 100644
--- a/flat/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/flat/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -8,7 +8,8 @@ project(NodeApplication): dance_lib, dynamicinterface, dance_component_server_sv
   sharedname   = DAnCE_NodeApplication
   dynamicflags = NODEAPPLICATION_BUILD_DLL
 
-  Source_Files {
+
+Source_Files {
 //    ComponentInstallation_Impl.cpp
 //    ServerActivator_Impl.cpp
     NodeApplication_Impl.cpp
diff --git a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index 7cf7b80f54a..5c7e9a578af 100644
--- a/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/flat/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -71,20 +71,20 @@ DAnCE_NodeManager_Module::usage (void)
 {
   DANCE_TRACE ("DAnCE_NodeManager_Module::usage");
   return "Node Manager Options:\n"
-    "\t-e,--exec-mgr\t\t\t [execution manager ior file name]\n"
-    "\t-n,--node-mgr\t\t\t <node name> [=node manager ior file name]\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]\t\t create plan objects (components and ports) representation in name context with ior NC\n"
-    "\t-r,--rebind-plan-ns [NC]\t\t bind plan representation name context to NC\n"
-    "\t-i,--port-indirection\t\t enable plan objects indirection via servant locator\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"
     //"\t-f,--ignore-failure\t\t ignore deployment failures\n"
-    "\t-s,--server-executable\t\t default component server executable\n"
+    "\t-s,--server-executable\t default component server executable\n"
     "\t--server-args\t\t additional arguments to supply to the component server\n"
     "\t--standalone-nm\t\t Indicates that this NodeManager is not managed by an ExecutionManager\n"
-    "\t-t,--timeout\t\t\t default timeout in seconds to wait for component server spawn\n"
-    "\t-d,--domain-nc [NC]\t\t\t Default naming context for domain objects.\n"
-    "\t--instance-nc [NC]\t\t\t Default naming context for instance registration directives. No argument indicates Domain NC.\n"
-    "\t-h,help\t\t\t\t print this help message\n";
+    "\t-t,--timeout\t\t default timeout in seconds to wait for component server spawn\n"
+    "\t-d,--domain-nc [NC]\t Default naming context for domain objects.\n"
+    "\t--instance-nc [NC]\t Default naming context for instance registration directives. No argument indicates Domain NC.\n"
+    "\t-h,help\t\t\t print this help message\n";
 }
 
 bool
@@ -111,7 +111,7 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
   get_opts.long_option (ACE_TEXT("domain-nc"), 'd', ACE_Get_Opt::ARG_REQUIRED);
   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_OPTIONAL);
-  
+
   //get_opts.long_option ("help", '?');
 
   char c;
@@ -171,14 +171,14 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
                         get_opts.opt_arg ()));
           this->options_.timeout_ = ACE_OS::atoi (get_opts.opt_arg ());
           break;
-          
+
         case 'd':
           DANCE_DEBUG ((LM_DEBUG, DLINFO "Node_Manager_Module::parse_args - "
                         "Binding to provided Domain Naming Context: '%C'\n",
                         get_opts.opt_arg ()));
           this->options_.domain_nc_ = get_opts.opt_arg ();
           break;
-          
+
         case 'h':
           //case '?': // Display help for use of the server.
           //default:
@@ -232,7 +232,7 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
                             "ERROR: unknown long option %C\n",
                             get_opts.long_option ()));
             }
-          
+
           break;
 
         default:
diff --git a/flat/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/flat/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
index 9309b8bbaa2..ab2635814fc 100644
--- a/flat/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
+++ b/flat/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
@@ -36,7 +36,7 @@ namespace CIDL_Receiver_Impl
   {
     //Get the message from the Sender first.
     ACE_DEBUG ((LM_DEBUG,
-                "Receiver - Informed by the Sender with message [%s]\n",
+                "Receiver - Informed by the Sender with message [%C]\n",
                 ev->data ()));
 
     Hello::ReadMessage_var rev
@@ -48,7 +48,7 @@ namespace CIDL_Receiver_Impl
     CORBA::String_var str = rev->get_message ();
 
     ACE_DEBUG ((LM_DEBUG,
-                "Receiver - Got message from the server [%s] \n",
+                "Receiver - Got message from the server [%C]\n",
                 str.in () ));
   }
 
diff --git a/flat/CIAO/examples/Hello/Sender/starter.cpp b/flat/CIAO/examples/Hello/Sender/starter.cpp
index 4b839684ea1..8069eb18b88 100644
--- a/flat/CIAO/examples/Hello/Sender/starter.cpp
+++ b/flat/CIAO/examples/Hello/Sender/starter.cpp
@@ -4,13 +4,13 @@
 #include "ace/Get_Opt.h"
 
 // IOR file of the Sender
-const char * ior = 0;
+const ACE_TCHAR * ior = 0;
 const char * message = 0;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:m:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:m:"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -39,7 +39,7 @@ parse_args (int argc, char *argv[])
 
   if (ior  == 0)
     {
-      ior = "file://Sender.ior";
+      ior = ACE_TEXT("file://Sender.ior");
     }
 
   return 0;
@@ -51,8 +51,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
-                                            "");
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       if (parse_args (argc, argv) != 0)
         {