diff --git a/examples/MQ/1-sampler-sink/testMQEx1.sh.in b/examples/MQ/1-sampler-sink/testMQEx1.sh.in
index baee2ec8..435022d0 100755
--- a/examples/MQ/1-sampler-sink/testMQEx1.sh.in
+++ b/examples/MQ/1-sampler-sink/testMQEx1.sh.in
@@ -7,8 +7,8 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SI
SAMPLER="ex1-sampler"
SAMPLER+=" --id sampler1"
-SAMPLER+=" --verbosity NOLOG"
-SAMPLER+=" --control static --log-color false"
+SAMPLER+=" --severity NOLOG"
+SAMPLER+=" --control static --color false"
SAMPLER+=" --max-iterations 1"
SAMPLER+=" --mq-config $ex1config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/1-sampler-sink/$SAMPLER &
@@ -16,7 +16,7 @@ SAMPLER_PID=$!
SINK="ex1-sink"
SINK+=" --id sink1"
-SINK+=" --control static --log-color false"
+SINK+=" --control static --color false"
SINK+=" --max-iterations 1"
SINK+=" --mq-config $ex1config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/1-sampler-sink/$SINK &
diff --git a/examples/MQ/2-sampler-processor-sink/testMQEx2.sh.in b/examples/MQ/2-sampler-processor-sink/testMQEx2.sh.in
index 6ef1a3cc..971c968a 100755
--- a/examples/MQ/2-sampler-processor-sink/testMQEx2.sh.in
+++ b/examples/MQ/2-sampler-processor-sink/testMQEx2.sh.in
@@ -7,8 +7,8 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; kill -TERM $PROCESSOR1_PID;
SAMPLER="ex2-sampler"
SAMPLER+=" --id sampler1"
-SAMPLER+=" --verbosity NOLOG"
-SAMPLER+=" --control static --log-color false"
+SAMPLER+=" --severity NOLOG"
+SAMPLER+=" --control static --color false"
SAMPLER+=" --max-iterations 2"
SAMPLER+=" --mq-config $ex2config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/2-sampler-processor-sink/$SAMPLER &
@@ -16,8 +16,8 @@ SAMPLER_PID=$!
PROCESSOR1="ex2-processor"
PROCESSOR1+=" --id processor1"
-PROCESSOR1+=" --verbosity NOLOG"
-PROCESSOR1+=" --control static --log-color false"
+PROCESSOR1+=" --severity NOLOG"
+PROCESSOR1+=" --control static --color false"
PROCESSOR1+=" --mq-config $ex2config"
PROCESSOR1+=" --config-key processor"
@CMAKE_BINARY_DIR@/bin/examples/MQ/2-sampler-processor-sink/$PROCESSOR1 &
@@ -25,8 +25,8 @@ PROCESSOR1_PID=$!
PROCESSOR2="ex2-processor"
PROCESSOR2+=" --id processor2"
-PROCESSOR2+=" --verbosity NOLOG"
-PROCESSOR2+=" --control static --log-color false"
+PROCESSOR2+=" --severity NOLOG"
+PROCESSOR2+=" --control static --color false"
PROCESSOR2+=" --mq-config $ex2config"
PROCESSOR2+=" --config-key processor"
@CMAKE_BINARY_DIR@/bin/examples/MQ/2-sampler-processor-sink/$PROCESSOR2 &
@@ -34,7 +34,7 @@ PROCESSOR2_PID=$!
SINK="ex2-sink"
SINK+=" --id sink1"
-SINK+=" --control static --log-color false"
+SINK+=" --control static --color false"
SINK+=" --max-iterations 2"
SINK+=" --mq-config $ex2config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/2-sampler-processor-sink/$SINK &
diff --git a/examples/MQ/3-dds/ex3-dds-topology.xml b/examples/MQ/3-dds/ex3-dds-topology.xml
index b960c336..dcfac5fb 100644
--- a/examples/MQ/3-dds/ex3-dds-topology.xml
+++ b/examples/MQ/3-dds/ex3-dds-topology.xml
@@ -8,7 +8,7 @@
- @CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-sampler --id sampler --log-color false --channel-config name=data1,type=push,method=bind -S "<@CMAKE_BINARY_DIR@/lib" -P dds
+ @CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-sampler --id sampler --color false --channel-config name=data1,type=push,method=bind -S "<@CMAKE_BINARY_DIR@/lib" -P dds
SamplerWorker
@@ -18,7 +18,7 @@
- @CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-processor --id processor_%taskIndex% --config-key processor --log-color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -S "<@CMAKE_BINARY_DIR@/lib" -P dds
+ @CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-processor --id processor_%taskIndex% --config-key processor --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -S "<@CMAKE_BINARY_DIR@/lib" -P dds
ProcessorWorker
@@ -29,7 +29,7 @@
- @CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-sink --id sink --log-color false --channel-config name=data2,type=pull,method=bind -S "<@CMAKE_BINARY_DIR@/lib" -P dds
+ @CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-sink --id sink --color false --channel-config name=data2,type=pull,method=bind -S "<@CMAKE_BINARY_DIR@/lib" -P dds
SinkWorker
diff --git a/examples/MQ/4-copypush/testMQEx4.sh.in b/examples/MQ/4-copypush/testMQEx4.sh.in
index 0e25cd35..6cad6829 100755
--- a/examples/MQ/4-copypush/testMQEx4.sh.in
+++ b/examples/MQ/4-copypush/testMQEx4.sh.in
@@ -7,8 +7,8 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK1_PID; kill -TERM $SINK2_PID; wai
SAMPLER="ex4-sampler"
SAMPLER+=" --id sampler1"
-SAMPLER+=" --verbosity NOLOG"
-SAMPLER+=" --control static --log-color false"
+SAMPLER+=" --severity NOLOG"
+SAMPLER+=" --control static --color false"
SAMPLER+=" --max-iterations 1"
SAMPLER+=" --mq-config $ex4config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/4-copypush/$SAMPLER &
@@ -16,8 +16,8 @@ SAMPLER_PID=$!
SINK1="ex4-sink"
SINK1+=" --id sink1"
-SINK1+=" --verbosity NOLOG"
-SINK1+=" --control static --log-color false"
+SINK1+=" --severity NOLOG"
+SINK1+=" --control static --color false"
SINK1+=" --max-iterations 1"
SINK1+=" --mq-config $ex4config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/4-copypush/$SINK1 &
@@ -25,7 +25,7 @@ SINK1_PID=$!
SINK2="ex4-sink"
SINK2+=" --id sink2"
-SINK2+=" --control static --log-color false"
+SINK2+=" --control static --color false"
SINK2+=" --max-iterations 1"
SINK2+=" --mq-config $ex4config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/4-copypush/$SINK2 &
diff --git a/examples/MQ/5-req-rep/testMQEx5.sh.in b/examples/MQ/5-req-rep/testMQEx5.sh.in
index ad7f7623..488cc7c7 100755
--- a/examples/MQ/5-req-rep/testMQEx5.sh.in
+++ b/examples/MQ/5-req-rep/testMQEx5.sh.in
@@ -7,7 +7,7 @@ trap 'kill -TERM $CLIENT_PID; kill -TERM $SERVER_PID; wait $CLIENT_PID; wait $SE
CLIENT="ex5-client"
CLIENT+=" --id client"
-CLIENT+=" --control static --log-color false"
+CLIENT+=" --control static --color false"
CLIENT+=" --max-iterations 1"
CLIENT+=" --mq-config $ex5config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/5-req-rep/$CLIENT &
@@ -15,8 +15,8 @@ CLIENT_PID=$!
SERVER="ex5-server"
SERVER+=" --id server"
-SERVER+=" --verbosity NOLOG"
-SERVER+=" --control static --log-color false"
+SERVER+=" --severity NOLOG"
+SERVER+=" --control static --color false"
SERVER+=" --max-iterations 1"
SERVER+=" --mq-config $ex5config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/5-req-rep/$SERVER &
diff --git a/examples/MQ/6-multiple-channels/testMQEx6.sh.in b/examples/MQ/6-multiple-channels/testMQEx6.sh.in
index 591632c7..a1c67e9d 100755
--- a/examples/MQ/6-multiple-channels/testMQEx6.sh.in
+++ b/examples/MQ/6-multiple-channels/testMQEx6.sh.in
@@ -8,7 +8,7 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; kill -TERM $BROADCASTER_PID
SINK="ex6-sink"
SINK+=" --id sink1"
SINK+=" --max-iterations 1"
-SINK+=" --control static --log-color false"
+SINK+=" --control static --color false"
SINK+=" --mq-config $ex6config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/6-multiple-channels/$SINK &
SINK_PID=$!
@@ -17,17 +17,17 @@ sleep 1
SAMPLER="ex6-sampler"
SAMPLER+=" --id sampler1"
-SAMPLER+=" --verbosity NOLOG"
+SAMPLER+=" --severity NOLOG"
SAMPLER+=" --max-iterations 1"
-SAMPLER+=" --control static --log-color false"
+SAMPLER+=" --control static --color false"
SAMPLER+=" --mq-config $ex6config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/6-multiple-channels/$SAMPLER &
SAMPLER_PID=$!
BROADCASTER="ex6-broadcaster"
BROADCASTER+=" --id broadcaster1"
-BROADCASTER+=" --verbosity NOLOG"
-BROADCASTER+=" --control static --log-color false"
+BROADCASTER+=" --severity NOLOG"
+BROADCASTER+=" --control static --color false"
BROADCASTER+=" --mq-config $ex6config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/6-multiple-channels/$BROADCASTER &
BROADCASTER_PID=$!
diff --git a/examples/MQ/8-multipart/testMQEx8.sh.in b/examples/MQ/8-multipart/testMQEx8.sh.in
index a8f204b8..77b3509e 100755
--- a/examples/MQ/8-multipart/testMQEx8.sh.in
+++ b/examples/MQ/8-multipart/testMQEx8.sh.in
@@ -6,16 +6,16 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SI
SAMPLER="ex8-sampler"
SAMPLER+=" --id sampler1"
-SAMPLER+=" --verbosity NOLOG"
+SAMPLER+=" --severity NOLOG"
SAMPLER+=" --max-iterations 1"
-SAMPLER+=" --control static --log-color false"
+SAMPLER+=" --control static --color false"
SAMPLER+=" --mq-config $ex8config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/8-multipart/$SAMPLER &
SAMPLER_PID=$!
SINK="ex8-sink"
SINK+=" --id sink1"
-SINK+=" --control static --log-color false"
+SINK+=" --control static --color false"
SINK+=" --mq-config $ex8config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/8-multipart/$SINK &
SINK_PID=$!
diff --git a/examples/MQ/multiple-transports/startMTEx.sh.in b/examples/MQ/multiple-transports/startMTEx.sh.in
index 32343563..e039171d 100755
--- a/examples/MQ/multiple-transports/startMTEx.sh.in
+++ b/examples/MQ/multiple-transports/startMTEx.sh.in
@@ -3,18 +3,21 @@ config="@CMAKE_BINARY_DIR@/bin/config/ex-multiple-transports.json"
SAMPLER1="ex-mt-sampler1"
SAMPLER1+=" --id sampler1"
+SAMPLER1+=" --severity debug"
SAMPLER1+=" --transport shmem"
SAMPLER1+=" --mq-config $config"
xterm -geometry 80x30+0+0 -hold -e @CMAKE_BINARY_DIR@/bin/examples/MQ/multiple-transports/$SAMPLER1 &
SAMPLER2="ex-mt-sampler2"
SAMPLER2+=" --id sampler2"
+SAMPLER2+=" --severity debug"
SAMPLER2+=" --transport nanomsg"
SAMPLER2+=" --mq-config $config"
xterm -geometry 80x30+0+450 -hold -e @CMAKE_BINARY_DIR@/bin/examples/MQ/multiple-transports/$SAMPLER2 &
SINK="ex-mt-sink"
SINK+=" --id sink1"
+SINK+=" --severity debug"
SINK+=" --transport shmem"
SINK+=" --mq-config $config"
xterm -geometry 80x30+500+0 -hold -e @CMAKE_BINARY_DIR@/bin/examples/MQ/multiple-transports/$SINK &
diff --git a/examples/MQ/multiple-transports/testMTEx.sh.in b/examples/MQ/multiple-transports/testMTEx.sh.in
index cc7669ce..9d590a05 100755
--- a/examples/MQ/multiple-transports/testMTEx.sh.in
+++ b/examples/MQ/multiple-transports/testMTEx.sh.in
@@ -8,7 +8,7 @@ SINK="ex-mt-sink"
SINK+=" --id sink1"
SINK+=" --session $SESSION"
SINK+=" --max-iterations 1"
-SINK+=" --control static --log-color false"
+SINK+=" --control static --color false"
SINK+=" --transport shmem"
SINK+=" --mq-config $config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/multiple-transports/$SINK &
@@ -17,9 +17,9 @@ SINK_PID=$!
SAMPLER1="ex-mt-sampler1"
SAMPLER1+=" --id sampler1"
SAMPLER1+=" --session $SESSION"
-SAMPLER1+=" --verbosity NOLOG"
+SAMPLER1+=" --severity NOLOG"
SAMPLER1+=" --max-iterations 1"
-SAMPLER1+=" --control static --log-color false"
+SAMPLER1+=" --control static --color false"
SAMPLER1+=" --transport shmem"
SAMPLER1+=" --mq-config $config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/multiple-transports/$SAMPLER1 &
@@ -28,9 +28,9 @@ SAMPLER1_PID=$!
SAMPLER2="ex-mt-sampler2"
SAMPLER2+=" --id sampler2"
SAMPLER2+=" --session $SESSION"
-SAMPLER2+=" --verbosity NOLOG"
+SAMPLER2+=" --severity NOLOG"
SAMPLER2+=" --max-iterations 1"
-SAMPLER2+=" --control static --log-color false"
+SAMPLER2+=" --control static --color false"
SAMPLER2+=" --transport nanomsg"
SAMPLER2+=" --mq-config $config"
@CMAKE_BINARY_DIR@/bin/examples/MQ/multiple-transports/$SAMPLER2 &
diff --git a/examples/advanced/Region/startMQExRegion.sh.in b/examples/advanced/Region/startMQExRegion.sh.in
index 1cc7e6a4..40789b90 100755
--- a/examples/advanced/Region/startMQExRegion.sh.in
+++ b/examples/advanced/Region/startMQExRegion.sh.in
@@ -9,6 +9,7 @@ fi
SAMPLER="ex-region-sampler"
SAMPLER+=" --id sampler1"
+SAMPLER+=" --severity debug"
SAMPLER+=" --msg-size $msgSize"
# SAMPLER+=" --rate 10"
SAMPLER+=" --transport shmem"
@@ -17,6 +18,7 @@ xterm -geometry 80x23+0+0 -hold -e @CMAKE_BINARY_DIR@/bin/examples/advanced/Regi
SINK="ex-region-sink"
SINK+=" --id sink1"
+SINK+=" --severity debug"
SINK+=" --transport shmem"
SINK+=" --mq-config $exRegionConfig"
xterm -geometry 80x23+500+0 -hold -e @CMAKE_BINARY_DIR@/bin/examples/advanced/Region/$SINK &
diff --git a/examples/advanced/Region/testMQExRegion.sh.in b/examples/advanced/Region/testMQExRegion.sh.in
index 4108139f..8a66ec62 100755
--- a/examples/advanced/Region/testMQExRegion.sh.in
+++ b/examples/advanced/Region/testMQExRegion.sh.in
@@ -9,8 +9,9 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SI
SAMPLER="ex-region-sampler"
SAMPLER+=" --id sampler1"
+SAMPLER+=" --severity debug"
SAMPLER+=" --session $SESSION"
-SAMPLER+=" --control static --log-color false"
+SAMPLER+=" --control static --color false"
SAMPLER+=" --max-iterations 1"
SAMPLER+=" --msg-size $msgSize"
SAMPLER+=" --transport shmem"
@@ -21,8 +22,8 @@ SAMPLER_PID=$!
SINK="ex-region-sink"
SINK+=" --id sink1"
SINK+=" --session $SESSION"
-SINK+=" --verbosity NOLOG"
-SINK+=" --control static --log-color false"
+SINK+=" --severity NOLOG"
+SINK+=" --control static --color false"
SINK+=" --max-iterations 1"
SINK+=" --transport shmem"
SINK+=" --mq-config $exRegionConfig"