Change options --log.foo to --log-foo for consistency.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@592956 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 36 insertions, 36 deletions

diff --git a/cpp/src/qpid/log/Options.cpp b/cpp/src/qpid/log/Options.cpp
index 592c10a48a..a945d5eb35 100644
--- a/cpp/src/qpid/log/Options.cpp
+++ b/cpp/src/qpid/log/Options.cpp
@@ -36,30 +36,30 @@ Options::Options(const std::string& name) : qpid::Options(name),
     for (int i = 1; i < LevelTraits::COUNT; ++i)
         levels << " " << LevelTraits::name(Level(i));
     addOptions()
-        ("log.output", optValue(outputs, "FILE"),
+        ("log-output", optValue(outputs, "FILE"),
          "Send log output to FILE. "
          "FILE can be a file name or one of the special values:\n"
          "stderr, stdout, syslog")
         ("trace,t", optValue(trace), "Enables all logging" )
-        ("log.enable", optValue(selectors, "RULE"),
+        ("log-enable", optValue(selectors, "RULE"),
          ("Enables logging for selected levels and components. " 
          "RULE is in the form 'LEVEL[+][:COMPONENT]' "
          "Levels are one of: \n\t "+levels.str()+"\n"
          "For example:\n"
-         "\t'--log.enable warning+' "
+         "\t'--log-enable warning+' "
          "logs all warning, error and critical messages.\n"
-         "\t'--log.enable debug:framing' "
+         "\t'--log-enable debug:framing' "
           "logs debug messages from the framing component. "
          "This option can be used multiple times").c_str())
-        ("log.time", optValue(time, "yes|no"),
+        ("log-time", optValue(time, "yes|no"),
          "Include time in log messages")
-        ("log.level", optValue(level,"yes|no"),
+        ("log-level", optValue(level,"yes|no"),
          "Include severity level in log messages")
-        ("log.source", optValue(source,"yes|no"),
+        ("log-source", optValue(source,"yes|no"),
          "Include source file:line in log messages")
-        ("log.thread", optValue(thread,"yes|no"),
+        ("log-thread", optValue(thread,"yes|no"),
          "Include thread ID in log messages")
-        ("log.function", optValue(function,"yes|no"),
+        ("log-function", optValue(function,"yes|no"),
          "Include function signature in log messages");
 }        
         
diff --git a/cpp/src/tests/logging.cpp b/cpp/src/tests/logging.cpp
index a4e131ec57..72262ab3bc 100644
--- a/cpp/src/tests/logging.cpp
+++ b/cpp/src/tests/logging.cpp
@@ -264,15 +264,15 @@ Statement statement(
 BOOST_AUTO_TEST_CASE(testOptionsParse) {
     char* argv[]={
         0,
-        "--log.enable", "error+:foo",
-        "--log.enable", "debug:bar",
-        "--log.enable", "info",
-        "--log.output", "x",
-        "--log.output", "y",
-        "--log.level", "yes",
-        "--log.source", "1",
-        "--log.thread", "true",
-        "--log.function", "YES"
+        "--log-enable", "error+:foo",
+        "--log-enable", "debug:bar",
+        "--log-enable", "info",
+        "--log-output", "x",
+        "--log-output", "y",
+        "--log-level", "yes",
+        "--log-source", "1",
+        "--log-thread", "true",
+        "--log-function", "YES"
     };
     qpid::log::Options opts;
     opts.parse(ARGC(argv), argv);
@@ -299,9 +299,9 @@ BOOST_AUTO_TEST_CASE(testOptionsDefault) {
 BOOST_AUTO_TEST_CASE(testSelectorFromOptions) {
     char* argv[]={
         0,
-        "--log.enable", "error+:foo",
-        "--log.enable", "debug:bar",
-        "--log.enable", "info"
+        "--log-enable", "error+:foo",
+        "--log-enable", "debug:bar",
+        "--log-enable", "info"
     };
     qpid::log::Options opts;
     opts.parse(ARGC(argv), argv);
@@ -322,10 +322,10 @@ BOOST_AUTO_TEST_CASE(testOptionsFormat) {
         BOOST_CHECK_EQUAL(Logger::TIME|Logger::LEVEL, l.format(opts));
         char* argv[]={
             0,
-            "--log.time", "no", 
-            "--log.level", "no",
-            "--log.source", "1",
-            "--log.thread",  "1"
+            "--log-time", "no", 
+            "--log-level", "no",
+            "--log-source", "1",
+            "--log-thread",  "1"
         };
         opts.parse(ARGC(argv), argv);
         BOOST_CHECK_EQUAL(
@@ -335,10 +335,10 @@ BOOST_AUTO_TEST_CASE(testOptionsFormat) {
         Options opts;           // Clear.
         char* argv[]={
             0,
-            "--log.level", "no",
-            "--log.thread", "true",
-            "--log.function", "YES",
-            "--log.time", "YES"
+            "--log-level", "no",
+            "--log-thread", "true",
+            "--log-function", "YES",
+            "--log-time", "YES"
         };
         opts.parse(ARGC(argv), argv);
         BOOST_CHECK_EQUAL(
@@ -353,10 +353,10 @@ BOOST_AUTO_TEST_CASE(testLoggerConfigure) {
     Options opts;
     char* argv[]={
         0,
-        "--log.time", "no", 
-        "--log.source", "yes",
-        "--log.output", "logging.tmp",
-        "--log.enable", "critical"
+        "--log-time", "no", 
+        "--log-source", "yes",
+        "--log-output", "logging.tmp",
+        "--log-enable", "critical"
     };
     opts.parse(ARGC(argv), argv);
     l.configure(opts, "test");
diff --git a/cpp/src/tests/quick_perftest b/cpp/src/tests/quick_perftest
index 085d2b2e81..9108d58a71 100755
--- a/cpp/src/tests/quick_perftest
+++ b/cpp/src/tests/quick_perftest
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec `dirname $0`/run_test ./perftest --listen --publish --count 1000
+exec `dirname $0`/run_test ./perftest --count 1000
diff --git a/cpp/src/tests/start_broker b/cpp/src/tests/start_broker
index 6f5752befb..0d4352644b 100755
--- a/cpp/src/tests/start_broker
+++ b/cpp/src/tests/start_broker
@@ -1,4 +1,4 @@
 #!/bin/sh
 rm -f qpidd.vglog qpidd.log
 test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=qpidd.vglog --"
-exec libtool --mode=execute $VALGRIND ../qpidd --daemon --port 0 --log.output qpidd.log "$@" > qpidd.port
+exec libtool --mode=execute $VALGRIND ../qpidd --daemon --port 0 --log-output qpidd.log "$@" > qpidd.port
diff --git a/cpp/src/tests/start_cluster b/cpp/src/tests/start_cluster
index 8f44854978..5992a75d8d 100755
--- a/cpp/src/tests/start_cluster
+++ b/cpp/src/tests/start_cluster
@@ -12,7 +12,7 @@ shift
 OPTS=$*
 CLUSTER=`whoami`		# Cluster name=user name, avoid clashes.
 for (( i=0; i<SIZE; ++i )); do
-    PORT=`../qpidd -dp0 --log.output=cluster$i.log --cluster $CLUSTER $OPTS` || exit 1
+    PORT=`../qpidd -dp0 --log-output=cluster$i.log --cluster $CLUSTER $OPTS` || exit 1
     echo $PORT >> cluster.ports
 done