Tue Jun 29 12:06:24 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
          Added -q (quiet) option. This will suppress error messages.

        * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl:
          Using the -q option on the plan launcher

3 files changed, 140 insertions, 58 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d771b66b271..7bb6036f78a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jun 29 12:06:24 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
+          Added -q (quiet) option. This will suppress error messages.
+
+        * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl:
+          Using the -q option on the plan launcher
+
 Tue Jun 29 11:30:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/MPC/config/dance_artifact_installation.mpb:
@@ -23,7 +31,7 @@ Tue Jun 29 11:30:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
         * MPC/config/dds4ccm_ts_default.mpb:
           Added missing
           // -*- MPC -*-
- 
+
 Tue Jun 29 11:09:58 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tutorials/Shapes/Tutorial/01_general.html:
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index e138d3bb24d..80d2638feae 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -39,7 +39,8 @@ namespace
         output_ (false),
         output_prefix_ (0),
         mode_ (LAUNCH),
-        force_ (false)
+        force_ (false),
+        quiet_ (false)
     {}
 
     const ACE_TCHAR *em_ior_;
@@ -53,6 +54,7 @@ namespace
     const ACE_TCHAR *output_prefix_;
     MODE mode_;
     bool force_;
+    bool quiet_;
   };
 }
 
@@ -104,6 +106,7 @@ usage(const ACE_TCHAR*)
               ACE_TEXT ("to plan UUID if plan is provided. ")
               ACE_TEXT ("Default is on for NM-based deployments.\n")
 
+              ACE_TEXT ("\t-q|--quiet\t\t\tSupress error messages.\n")
               ACE_TEXT ("\t-h|--help\t\t\tShow this usage information\n")
               ));
 }
@@ -119,7 +122,7 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
     }
 
   ACE_Get_Opt get_opt(argc, argv,
-                      ACE_TEXT ("k:n:c:x:u:m:a:lsfo::h"));
+                      ACE_TEXT ("k:n:c:x:u:m:a:lsfqo::h"));
   get_opt.long_option(ACE_TEXT("em-ior"), 'k', ACE_Get_Opt::ARG_REQUIRED);
   get_opt.long_option(ACE_TEXT("nm-ior"), 'n', ACE_Get_Opt::ARG_REQUIRED);
   get_opt.long_option(ACE_TEXT("xml-plan"), 'x', ACE_Get_Opt::ARG_REQUIRED);
@@ -130,6 +133,7 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
   get_opt.long_option(ACE_TEXT("launch-plan"), 'l', ACE_Get_Opt::NO_ARG);
   get_opt.long_option(ACE_TEXT("stop-plan"), 's', ACE_Get_Opt::NO_ARG);
   get_opt.long_option(ACE_TEXT("force"), 'f', ACE_Get_Opt::NO_ARG);
+  get_opt.long_option(ACE_TEXT("quiet"), 'q', ACE_Get_Opt::NO_ARG);
   get_opt.long_option(ACE_TEXT("output"), 'o', ACE_Get_Opt::ARG_OPTIONAL);
   get_opt.long_option(ACE_TEXT("help"), 'h', ACE_Get_Opt::NO_ARG);
 
@@ -247,6 +251,13 @@ parse_args(int argc, ACE_TCHAR *argv[], Options &options)
 
           break;
 
+        case 'q':
+          options.quiet_ = true;
+          DANCE_DEBUG (6, (LM_DEBUG, DLINFO
+                           ACE_TEXT ("Plan_Launcher::parse_args - ")
+                           ACE_TEXT ("Plan_Launcher will hide all ouput")
+                           ACE_TEXT ("messages.\n")));
+          break;
         case 'h':
           usage (argv[0]);
           return false;
@@ -371,23 +382,32 @@ int launch_plan (const Options &opts,
     }
   catch (const DAnCE::Deployment_Failure &ex)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ")
-                  ACE_TEXT ("Deployment failed, exception: %C\n"),
-                  ex.ex_.c_str ()));
+      if (!opts.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ")
+                      ACE_TEXT ("Deployment failed, exception: %C\n"),
+                      ex.ex_.c_str ()));
+        }
       return 1;
     }
   catch (const CORBA::Exception &ex)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ")
-                  ACE_TEXT ("Deployment failed, caught CORBA exception %C\n"),
-                  ex._info ().c_str ()));
+      if (!opts.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ")
+                      ACE_TEXT ("Deployment failed, caught CORBA exception %C\n"),
+                      ex._info ().c_str ()));
+        }
       return 1;
     }
   catch (...)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ")
-                  ACE_TEXT ("Deployment failed, ")
-                  ACE_TEXT ("caught unknown C++ exception\n")));
+      if (!opts.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ")
+                      ACE_TEXT ("Deployment failed, ")
+                      ACE_TEXT ("caught unknown C++ exception\n")));
+        }
       return 1;
     }
 
@@ -461,23 +481,36 @@ int teardown_plan (const Options &opts,
         }
       catch (const DAnCE::Deployment_Failure &ex)
         {
-          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ")
-                    ACE_TEXT ("Application Teardown failed, exception: %C\n"),
-                    ex.ex_.c_str ()));
+          if (!opts.quiet_)
+            {
+              ACE_ERROR ((LM_ERROR, DLINFO
+                        ACE_TEXT ("Plan_Launcher::teardown_plan - ")
+                        ACE_TEXT ("Application Teardown failed, exception: %C\n"),
+                        ex.ex_.c_str ()));
+            }
           rc = 1;
         }
       catch (const CORBA::Exception &ex)
         {
-          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ")
-                      ACE_TEXT ("Application Teardown failed, caught CORBA exception %C\n"),
-                      ex._info ().c_str ()));
+          if (!opts.quiet_)
+            {
+              ACE_ERROR ((LM_ERROR, DLINFO
+                          ACE_TEXT ("Plan_Launcher::teardown_plan - ")
+                          ACE_TEXT ("Application Teardown failed, ")
+                          ACE_TEXT ("caught CORBA exception %C\n"),
+                          ex._info ().c_str ()));
+            }
           rc = 1;
         }
       catch (...)
         {
-          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ")
-                      ACE_TEXT ("Application Teardown failed, ")
-                      ACE_TEXT ("caught unknown C++ exception\n")));
+          if (!opts.quiet_)
+            {
+              ACE_ERROR ((LM_ERROR, DLINFO
+                          ACE_TEXT ("Plan_Launcher::teardown_plan - ")
+                          ACE_TEXT ("Application Teardown failed, ")
+                          ACE_TEXT ("caught unknown C++ exception\n")));
+            }
           rc = 1;
         }
 
@@ -486,23 +519,35 @@ int teardown_plan (const Options &opts,
     }
   catch (const DAnCE::Deployment_Failure &ex)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ")
-                 ACE_TEXT ("Teardown failed, exception: %C\n"),
-                 ex.ex_.c_str ()));
+      if (!opts.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, DLINFO
+                      ACE_TEXT ("Plan_Launcher::teardown_plan - ")
+                      ACE_TEXT ("Teardown failed, exception: %C\n"),
+                      ex.ex_.c_str ()));
+        }
       return 1;
     }
   catch (const CORBA::Exception &ex)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ")
-                  ACE_TEXT ("Teardown failed, caught CORBA exception %C\n"),
-                  ex._info ().c_str ()));
+      if (!opts.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, DLINFO
+                      ACE_TEXT ("Plan_Launcher::teardown_plan - ")
+                      ACE_TEXT ("Teardown failed, caught CORBA exception %C\n"),
+                      ex._info ().c_str ()));
+        }
       return 1;
     }
   catch (...)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ")
-                  ACE_TEXT ("Teardown failed, ")
-                  ACE_TEXT ("caught unknown C++ exception\n")));
+      if (!opts.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, DLINFO
+                      ACE_TEXT ("Plan_Launcher::teardown_plan - ")
+                      ACE_TEXT ("Teardown failed, ")
+                      ACE_TEXT ("caught unknown C++ exception\n")));
+        }
       return 1;
     }
 
@@ -530,6 +575,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   int retval = 0;
 
+  Options options;
+
   try
     {
       DAnCE::Logger_Service * dlf =
@@ -547,7 +594,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       ORB_Destroyer safe_orb (orb);
 
-      Options options;
       if (!parse_args (argc, argv, options))
         {
           return 1;
@@ -567,10 +613,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
           if (CORBA::is_nil (tmp_em.in ()))
             {
-              ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher - ")
-                          ACE_TEXT ("Unable to resolve ")
-                          ACE_TEXT ("ExecutionManager reference <%s>\n"),
-                          options.em_ior_));
+              if (!options.quiet_)
+                {
+                  ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher - ")
+                              ACE_TEXT ("Unable to resolve ")
+                              ACE_TEXT ("ExecutionManager reference <%s>\n"),
+                              options.em_ior_));
+                }
               return 1;
             }
 
@@ -592,10 +641,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
           if (CORBA::is_nil (tmp_em.in ()))
             {
-              ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher - ")
-                          ACE_TEXT ("Unable to resolve ")
-                          ACE_TEXT ("NodeManager reference <%s>\n"),
-                          options.em_ior_));
+              if (!options.quiet_)
+                {
+                  ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher - ")
+                              ACE_TEXT ("Unable to resolve ")
+                              ACE_TEXT ("NodeManager reference <%s>\n"),
+                              options.em_ior_));
+                }
               return 1;
             }
 
@@ -616,9 +668,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           dp = DAnCE::Convert_Plan::read_cdr_plan (options.cdr_plan_);
           if (!dp.ptr ())
             {
-              ACE_ERROR ((LM_ERROR, DLINFO
-                          ACE_TEXT ("PlanLauncher - ")
-                          ACE_TEXT ("Error: Unable to read in CDR plan\n")));
+              if (!options.quiet_)
+                {
+                  ACE_ERROR ((LM_ERROR, DLINFO
+                              ACE_TEXT ("PlanLauncher - ")
+                              ACE_TEXT ("Error: Unable to read ")
+                              ACE_TEXT ("in CDR plan\n")));
+                }
               return 1;
             }
         }
@@ -628,9 +684,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
           if (!dp.ptr ())
             {
-              ACE_ERROR ((LM_ERROR, DLINFO
-                          ACE_TEXT ("PlanLauncher - Error: ")
-                          ACE_TEXT ("Unable to read in XML plan\n")));
+              if (!options.quiet_)
+                {
+                  ACE_ERROR ((LM_ERROR, DLINFO
+                              ACE_TEXT ("PlanLauncher - Error: ")
+                              ACE_TEXT ("Unable to read in XML plan\n")));
+                }
               return 1;
             }
         }
@@ -647,36 +706,51 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           break;
 
         default:
-          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher -")
-                      ACE_TEXT ("Mode not yet supported\n")));
+          if (!options.quiet_)
+            {
+              ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher -")
+                          ACE_TEXT ("Mode not yet supported\n")));
+            }
           break;
 
         };
     }
   catch (const Deployment::PlanError &ex)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("PlanLauncher - ")
-                  ACE_TEXT ("Error in plan: <%C>, <%C>\n"),
-                  ex.name.in (),
-                  ex.reason.in ()));
+      if (!options.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("PlanLauncher - ")
+                      ACE_TEXT ("Error in plan: <%C>, <%C>\n"),
+                      ex.name.in (),
+                      ex.reason.in ()));
+        }
       retval = -1;
     }
   catch (const DAnCE::Deployment_Failure& e)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("PlanLauncher - ")
-                  ACE_TEXT ("Error: %C.\n"), e.ex_.c_str()));
+      if (!options.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("PlanLauncher - ")
+                      ACE_TEXT ("Error: %C.\n"), e.ex_.c_str()));
+        }
       retval = 1;
     }
   catch (const CORBA::Exception& ex)
     {
-      ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ( "PlanLauncher - ")
-                  ACE_TEXT ("Error: %C\n"), ex._info ().c_str ()));
+      if (!options.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ( "PlanLauncher - ")
+                      ACE_TEXT ("Error: %C\n"), ex._info ().c_str ()));
+        }
       retval = 1;
     }
   catch (...)
     {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("PlanLauncher - ")
-                  ACE_TEXT ("Error: Unknown exception.\n")));
+      if (!options.quiet_)
+        {
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("PlanLauncher - ")
+                      ACE_TEXT ("Error: Unknown exception.\n")));
+        }
       retval = 1;
     }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
index 95219f2f8b0..22ae5acba17 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl
@@ -201,7 +201,7 @@ print "Invoking executor - launch the application -\n";
 
 print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
 $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-x $cdp_file -k file://$ior_emfile");
+                        "-x $cdp_file -k file://$ior_emfile -q");
 $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
 
 if ($pl_status != 0) {