Fix race condition in the control plugin

2025-10-15 09:31:45 +00:00 · 2018-09-12 16:14:32 +02:00
345 changed files with 10395 additions and 19509 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,33 +0,0 @@
---
-Language: Cpp
-BasedOnStyle: Mozilla
-
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: true
-AllowShortFunctionsOnASingleLine: true
-AllowShortIfStatementsOnASingleLine: false
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlwaysBreakAfterReturnType: None
-AlwaysBreakAfterDefinitionReturnType: None
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeBinaryOperators: NonAssignment
-BreakConstructorInitializers: BeforeComma
-ColumnLimit: 100
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: true
-FixNamespaceComments: true
-IndentWidth: 4
-IndentWrappedFunctionNames: true
-IncludeBlocks: Regroup
-NamespaceIndentation: None
-PointerAlignment: Left
-SortIncludes: true
-SpacesBeforeTrailingComments: 3
-Standard: Cpp11
-UseTab: Never
-...
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,3 +0,0 @@
---
-Checks:          '*,-google-*,-fuchsia-*,-cert-*,-llvm-header-guard,-readability-named-parameter,-misc-non-private-member-variables-in-classes,-*-magic-numbers,-llvm-include-order,-hicpp-no-array-decay,-performance-unnecessary-value-param,-cppcoreguidelines-pro-bounds-array-to-pointer-decay'
-HeaderFilterRegex: '/(fairmq/|FairMQ)'
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -1,2 +0,0 @@
-comment:
-  layout: "diff, files"
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,30 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-
---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Describe environment
-2. Describe compile options used
-3. Give commands you invoked
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Logs / Screenshots**
-If applicable, add logs or screenshots to help explain your problem.
-
-**System information (please complete the following information):**
- - OS: [e.g. MacOS 10.13, Fedora 28, Ubuntu 14.04]
- - Compiler: [e.g. GCC 8.1, Clang 3.5]
- - Environment: [e.g. FairSoft version, alfadist revision]
-
-**Additional context**
-Add any other context about the problem here.
-
-See [github markdown cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet#code) on how to format inline codes examples and logs.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,17 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,7 +0,0 @@
---
-name: Question / Support
-about: Any FairMQ related matter you are interested in
-
---
-
-
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 build

 .DS_Store
-
-.vscode
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,24 +6,19 @@
 #                  copied verbatim in the file "LICENSE"                       #
 ################################################################################

-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
-cmake_policy(VERSION 3.10...3.14)
+cmake_minimum_required(VERSION 3.9.4 FATAL_ERROR)
+

 # Project ######################################################################
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include(FairMQLib)

+set_fairmq_cmake_policies()
 get_git_version()

 project(FairMQ VERSION ${PROJECT_VERSION} LANGUAGES CXX)
 message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")

-if(BUILD_OFI_TRANSPORT)
-  set(PROJECT_MIN_CXX_STANDARD 14)
-else()
-  set(PROJECT_MIN_CXX_STANDARD 11)
-endif()
-
 set_fairmq_defaults()

 include(CTest)
@@ -37,114 +32,56 @@ cmake_dependent_option(BUILD_TESTING "Build tests." OFF "BUILD_FAIRMQ" OFF)
 cmake_dependent_option(BUILD_NANOMSG_TRANSPORT "Build nanomsg transport." OFF "BUILD_FAIRMQ" OFF)
 cmake_dependent_option(BUILD_OFI_TRANSPORT "Build experimental OFI transport." OFF "BUILD_FAIRMQ" OFF)
 cmake_dependent_option(BUILD_DDS_PLUGIN "Build DDS plugin." OFF "BUILD_FAIRMQ" OFF)
-cmake_dependent_option(BUILD_PMIX_PLUGIN "Build PMIx plugin." OFF "BUILD_FAIRMQ" OFF)
 cmake_dependent_option(BUILD_EXAMPLES "Build FairMQ examples." ON "BUILD_FAIRMQ" OFF)
-option(BUILD_SDK "Build the FairMQ controller SDK." OFF)
 option(BUILD_DOCS "Build FairMQ documentation." OFF)
-option(FAST_BUILD "Fast production build. Not recommended for development." OFF)
 ################################################################################


 # Dependencies #################################################################
-if(FAST_BUILD)
-  include(cotire)
+if(BUILD_FAIRMQ)
+  find_package2(PUBLIC Boost VERSION 1.64 REQUIRED
+    COMPONENTS program_options thread system filesystem regex date_time signals
+  )
+  find_package2(PUBLIC FairLogger VERSION 1.2.0 REQUIRED)
+  find_package2(PRIVATE ZeroMQ VERSION 4.1.5 REQUIRED)
 endif()

-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package(Threads REQUIRED)
-
 if(BUILD_NANOMSG_TRANSPORT)
-  find_package2(PRIVATE nanomsg REQUIRED)
-  set(PROJECT_nanomsg_VERSION 1.1.3) # Once upstream releases 1.1.5, we should bump again and use version check
+  find_package2(PRIVATE nanomsg VERSION 1.0.0 REQUIRED)
+  find_package2(PRIVATE msgpack VERSION 3.0.0)
+  set(PROJECT_msgpack_VERSION 2.1.5)
+  if(NOT msgpack_FOUND)
+    find_package2(PRIVATE msgpack VERSION 2.1.5 REQUIRED)
+  endif()
+  set(msgpack_ROOT ${PACKAGE_PREFIX_DIR})
 endif()

 if(BUILD_OFI_TRANSPORT)
-  find_package2(PRIVATE asiofi REQUIRED
-    VERSION 0.3.1
-  )
-  find_package2(PRIVATE OFI REQUIRED
-    ADD_REQUIREMENTS_OF asiofi
-  )
+  find_package2(PRIVATE OFI VERSION 1.6.0 REQUIRED COMPONENTS fi_sockets fi_verbs)
+  find_package2(PRIVATE Protobuf VERSION 3.4.0 REQUIRED)
 endif()

-if(BUILD_NANOMSG_TRANSPORT)
-  find_package2(PRIVATE msgpack REQUIRED
-    VERSION 3.1.0
-  )
-endif()
-
-if(BUILD_SDK)
-  set(required_dds_version 2.5.22)
-else()
-  set(required_dds_version 2.4)
-endif()
-if(BUILD_DDS_PLUGIN OR BUILD_SDK)
-  find_package2(PRIVATE DDS REQUIRED
-    VERSION ${required_dds_version}
-  )
-  set(DDS_Boost_COMPONENTS system log log_setup)
-  set(DDS_Boost_VERSION 1.67)
-endif()
-
-if(BUILD_PMIX_PLUGIN)
-  find_package2(PRIVATE PMIx REQUIRED
-    VERSION 2.1.4
-  )
-endif()
-
-if(BUILD_FAIRMQ OR BUILD_SDK)
-  find_package2(PUBLIC FairLogger REQUIRED
-    VERSION 1.2.0
-  )
-
-  if(NOT DEFINED Boost_NO_BOOST_CMAKE AND CMAKE_VERSION VERSION_LESS 3.15)
-    # Since Boost 1.70 a CMake package is shipped by default. Unfortunately, it has a number
-    # of problems that are only fixed in Boost 1.71 or CMake 3.15. By default we skip the
-    # BoostConfig lookup. This can be overridden on the command line via -DBoost_NO_BOOST_CMAKE=OFF
-    set(Boost_NO_BOOST_CMAKE ON)
-  endif()
-  find_package2(PUBLIC Boost REQUIRED
-    VERSION 1.64
-
-    COMPONENTS
-    container
-    program_options
-    filesystem
-    date_time
-    regex
-
-    ADD_REQUIREMENTS_OF
-    asiofi
-    DDS
-    FairLogger
-  )
-endif()
-
-if(BUILD_FAIRMQ)
-  find_package2(PRIVATE ZeroMQ REQUIRED
-    VERSION 4.1.5
-  )
+if(BUILD_DDS_PLUGIN)
+  find_package2(PRIVATE DDS VERSION 2.0 REQUIRED)
 endif()

 if(BUILD_TESTING)
-  find_package2(PRIVATE GTest REQUIRED
-    VERSION 1.7.0
-  )
+  find_package2(PRIVATE GTest VERSION 1.7.0 REQUIRED)
 endif()

 if(BUILD_DOCS)
-  find_package2(PRIVATE Doxygen REQUIRED
-    VERSION 1.8.8
-    COMPONENTS dot
-    OPTIONAL_COMPONENTS mscgen dia
-  )
+  find_package2(PRIVATE Doxygen VERSION 1.8.8 REQUIRED COMPONENTS dot OPTIONAL_COMPONENTS mscgen dia)
 endif()
 ################################################################################


 # Targets ######################################################################
-if(BUILD_FAIRMQ OR BUILD_SDK)
+if(BUILD_FAIRMQ)
+  configure_file(${PROJECT_NAME_LOWER}/Version.h.in
+    ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
+    @ONLY
+  )
+
  add_subdirectory(fairmq)
 endif()

@@ -159,7 +96,7 @@ endif()
 if(BUILD_DOCS)
  set(DOXYGEN_OUTPUT_DIRECTORY doxygen)
  set(DOXYGEN_PROJECT_NUMBER ${PROJECT_GIT_VERSION})
-  set(DOXYGEN_PROJECT_BRIEF "C++ Message Queuing Library and Framework")
+  set(DOXYGEN_PROJECT_BRIEF "C++ Message Passing Framework")
  set(DOXYGEN_USE_MDFILE_AS_MAINPAGE README.md)
  set(DOXYGEN_HTML_FOOTER docs/footer.html)
  doxygen_add_docs(doxygen README.md fairmq)
@@ -178,9 +115,6 @@ endif()
 if(BUILD_DDS_PLUGIN)
  list(APPEND PROJECT_PACKAGE_COMPONENTS dds_plugin)
 endif()
-if(BUILD_PMIX_PLUGIN)
-  list(APPEND PROJECT_PACKAGE_COMPONENTS pmix_plugin)
-endif()
 if(BUILD_NANOMSG_TRANSPORT)
  list(APPEND PROJECT_PACKAGE_COMPONENTS nanomsg_transport)
 endif()
@@ -193,18 +127,34 @@ endif()
 if(BUILD_DOCS)
  list(APPEND PROJECT_PACKAGE_COMPONENTS docs)
 endif()
-if(BUILD_SDK)
-  list(APPEND PROJECT_PACKAGE_COMPONENTS sdk)
-endif()
 ################################################################################


 # Installation #################################################################
 if(BUILD_FAIRMQ)
+  install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h
+    DESTINATION ${PROJECT_INSTALL_INCDIR}
+  )
+
  install(FILES cmake/FindZeroMQ.cmake
    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
  )
 endif()
+if(BUILD_DDS_PLUGIN)
+  install(FILES cmake/FindDDS.cmake
+    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
+  )
+endif()
+if(BUILD_NANOMSG_TRANSPORT)
+  install(FILES cmake/Findnanomsg.cmake
+    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
+  )
+endif()
+if(BUILD_OFI_TRANSPORT)
+  install(FILES cmake/FindOFI.cmake
+    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
+  )
+endif()
 if(BUILD_DOCS)
  install(DIRECTORY ${CMAKE_BINARY_DIR}/doxygen/html
    DESTINATION ${PROJECT_INSTALL_DATADIR}/docs
@@ -216,42 +166,13 @@ install_cmake_package()


 # Summary ######################################################################
-message(STATUS "  ")
-message(STATUS "  ${Cyan}CXX STANDARD${CR}       ${BGreen}C++${CMAKE_CXX_STANDARD}${CR} (>= C++${PROJECT_MIN_CXX_STANDARD}, change with ${BMagenta}-DCMAKE_CXX_STANDARD=17${CR})")
-if(CMAKE_CXX_FLAGS)
-  message(STATUS "  ")
-  message(STATUS "  ${Cyan}GLOBAL CXX FLAGS${CR}  ${BGreen}${CMAKE_CXX_FLAGS}${CR}")
-endif()
-if(CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "  ")
-  message(STATUS "  ${Cyan}BUILD TYPE         CXX FLAGS${CR}")
-  string(TOUPPER "${CMAKE_BUILD_TYPE}" selected_type)
-  foreach(type IN LISTS CMAKE_CONFIGURATION_TYPES)
-    string(TOUPPER "${type}" type_upper)
-    if(type_upper STREQUAL selected_type)
-      pad("${type}" 18 " " type_padded)
-      message(STATUS "${BGreen}* ${type_padded}${CMAKE_CXX_FLAGS_${type_upper}}${CR}")
-    else()
-      pad("${type}" 18 " " type_padded)
-      message(STATUS "  ${BWhite}${type_padded}${CR}${CMAKE_CXX_FLAGS_${type_upper}}")
-    endif()
-    unset(type_padded)
-    unset(type_upper)
-  endforeach()
-  message(STATUS "  ")
-  message(STATUS "  (Change the build type with ${BMagenta}-DCMAKE_BUILD_TYPE=...${CR})")
-endif()
 if(PROJECT_PACKAGE_DEPENDENCIES)
  message(STATUS "  ")
  message(STATUS "  ${Cyan}DEPENDENCY FOUND     VERSION                   PREFIX${CR}")
  foreach(dep IN LISTS PROJECT_PACKAGE_DEPENDENCIES)
    if(${dep}_VERSION)
      if(${dep} STREQUAL Boost)
-        if(Boost_VERSION_MAJOR)
-          set(version_str "${BGreen}${${dep}_VERSION_MAJOR}.${${dep}_VERSION_MINOR}${CR}")
-        else()
-          set(version_str "${BGreen}${${dep}_MAJOR_VERSION}.${${dep}_MINOR_VERSION}${CR}")
-        endif()
+        set(version_str "${BGreen}${${dep}_MAJOR_VERSION}.${${dep}_MINOR_VERSION}${CR}")
      else()
        set(version_str "${BGreen}${${dep}_VERSION}${CR}")
      endif()
@@ -268,32 +189,13 @@ if(PROJECT_PACKAGE_DEPENDENCIES)
      pad("${version_str}${version_req_str}" 25 " " version_padded COLOR 1)
    endif()
    if(${dep} STREQUAL FairLogger)
-      if(FairLogger_PREFIX)
-        set(prefix ${FairLogger_PREFIX})
-      else()
-        set(prefix ${FairLogger_ROOT})
-      endif()
+      set(prefix ${FairLogger_ROOT})
    elseif(${dep} STREQUAL GTest)
      get_filename_component(prefix ${GTEST_INCLUDE_DIRS}/.. ABSOLUTE)
    elseif(${dep} STREQUAL msgpack)
-      get_target_property(msgpack_include msgpackc-cxx INTERFACE_INCLUDE_DIRECTORIES)
-      get_filename_component(prefix ${msgpack_include}/.. ABSOLUTE)
-    elseif(${dep} STREQUAL asiofi)
-      set(prefix ${asiofi_ROOT})
+      set(prefix ${msgpack_ROOT})
    elseif(${dep} STREQUAL OFI)
      get_filename_component(prefix ${${dep}_INCLUDE_DIRS}/.. ABSOLUTE)
-    elseif(${dep} STREQUAL nanomsg)
-      get_target_property(nn_include nanomsg INTERFACE_INCLUDE_DIRECTORIES)
-      get_filename_component(prefix ${nn_include}/.. ABSOLUTE)
-    elseif(${dep} STREQUAL DDS)
-      set(prefix "${DDS_INSTALL_PREFIX}")
-    elseif(${dep} STREQUAL Boost)
-      if(TARGET Boost::headers)
-        get_target_property(boost_include Boost::headers INTERFACE_INCLUDE_DIRECTORIES)
-      else()
-        get_target_property(boost_include Boost::boost INTERFACE_INCLUDE_DIRECTORIES)
-      endif()
-      get_filename_component(prefix ${boost_include}/.. ABSOLUTE)
    elseif(${dep} STREQUAL Doxygen)
      get_target_property(doxygen_bin Doxygen::doxygen INTERFACE_LOCATION)
      get_filename_component(prefix ${doxygen_bin} DIRECTORY)
@@ -328,9 +230,9 @@ else()
 endif()
 message(STATUS "  ${BWhite}nanomsg_transport${CR}  ${nn_summary}")
 if(BUILD_OFI_TRANSPORT)
-  set(ofi_summary "${BGreen}YES${CR}    EXPERIMENTAL (requires C++14) (disable with ${BMagenta}-DBUILD_OFI_TRANSPORT=OFF${CR})")
+  set(ofi_summary "${BGreen}YES${CR}    EXPERIMENTAL (disable with ${BMagenta}-DBUILD_OFI_TRANSPORT=OFF${CR})")
 else()
-  set(ofi_summary "${BRed} NO${CR}    EXPERIMENTAL (requires C++14) (default, enable with ${BMagenta}-DBUILD_OFI_TRANSPORT=ON${CR})")
+  set(ofi_summary "${BRed} NO${CR}    EXPERIMENTAL (default, enable with ${BMagenta}-DBUILD_OFI_TRANSPORT=ON${CR})")
 endif()
 message(STATUS "  ${BWhite}ofi_transport${CR}      ${ofi_summary}")
 if(BUILD_DDS_PLUGIN)
@@ -339,12 +241,6 @@ else()
  set(dds_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_DDS_PLUGIN=ON${CR})")
 endif()
 message(STATUS "  ${BWhite}dds_plugin${CR}         ${dds_summary}")
-if(BUILD_PMIX_PLUGIN)
-  set(pmix_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_PMIX_PLUGIN=OFF${CR})")
-else()
-  set(pmix_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_PMIX_PLUGIN=ON${CR})")
-endif()
-message(STATUS "  ${BWhite}pmix_plugin${CR}        ${pmix_summary}")
 if(BUILD_EXAMPLES)
  set(examples_summary "${BGreen}YES${CR}    (default, disable with ${BMagenta}-DBUILD_EXAMPLES=OFF${CR})")
 else()
@@ -357,33 +253,5 @@ else()
  set(docs_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_DOCS=ON${CR})")
 endif()
 message(STATUS "  ${BWhite}docs${CR}               ${docs_summary}")
-if(BUILD_SDK)
-  set(sdk_summary "${BGreen}YES${CR}    EXPERIMENTAL (disable with ${BMagenta}-DBUILD_SDK=OFF${CR})")
-else()
-  set(sdk_summary "${BRed} NO${CR}    EXPERIMENTAL (default, enable with ${BMagenta}-DBUILD_SDK=ON${CR})")
-endif()
-message(STATUS "  ${BWhite}sdk${CR}                ${sdk_summary}")
-message(STATUS "  ")
-if(RUN_STATIC_ANALYSIS)
-  list(LENGTH PROJECT_STATIC_ANALYSERS size)
-  unset(analyser_list)
-  set(count 0)
-  foreach(analyser IN LISTS PROJECT_STATIC_ANALYSERS)
-    if(${analyser}_FOUND)
-      set(${analyser}_status "${analyser} ${BGreen}YES${CR}")
-    else()
-      set(${analyser}_status "${analyser} ${BRed}NO${CR}")
-    endif()
-    math(EXPR count "${count} + 1")
-    string(APPEND analyser_list "${${analyser}_status}")
-    if(count LESS size)
-      string(APPEND analyser_list "${BWhite},${CR} ")
-    endif()
-  endforeach()
-  set(static_ana_summary "${BWhite}(${CR}${analyser_list}${BWhite})${CR}  (disable with ${BMagenta}-DRUN_STATIC_ANALYSIS=OFF${CR})")
-else()
-  set(static_ana_summary "${BRed}OFF${CR}  (default, enable with ${BMagenta}-DRUN_STATIC_ANALYSIS=ON${CR})")
-endif()
-message(STATUS "  ${Cyan}RUN STATIC ANALYSIS  ${static_ana_summary}")
 message(STATUS "  ")
 ################################################################################
--- a/1
+++ b/1
@@ -4,7 +4,6 @@ Eulisse, Giulio
 Karabowicz, Radoslaw
 Kretz, Matthias <kretz@kde.org>
 Krzewicki, Mikolaj 
-Mrnjavac, Teo <teo.m@cern.ch>
 Neskovic, Gvozden
 Richter, Matthias
 Uhlig, Florian
--- a/41
+++ b/41
@@ -1,41 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: FairMQ
-Upstream-Contact: Mohammad Al-Turany <m.al-turany@gsi.de>
-Source: https://github.com/FairRootGroup/FairMQ
-
-Files: *
-Copyright: 2012-2019, GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
-Copyright: 2012-2019, [see AUTHORS file]
-Copyright: 2012-2019, [see CONTRIBUTORS file]
-Comment: The copyright of individual contributors is documented in the
-  Git history.
-License: LGPL-3.0-only
-
-Files: cmake/cotire.cmake
-Copyright: 2012-2018 Sascha Kratky
-License: COTIRE
-
-License: LGPL-3.0-only
-  [see LICENSE file]
-
-License: COTIRE
-  Permission is hereby granted, free of charge, to any person
-  obtaining a copy of this software and associated documentation
-  files (the "Software"), to deal in the Software without
-  restriction, including without limitation the rights to use,
-  copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the
-  Software is furnished to do so, subject to the following
-  conditions:
-
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
--- a/Dart.sh
+++ b/Dart.sh
@@ -41,15 +41,13 @@ if [ "$#" -lt "2" ]; then
 fi

 # test if a valid ctest model is defined
-case "$1" in
-  Experimental|Nightly|Continuous|Profile|alfa_ci|codecov)
-    ;;
-  *)
-    echo "-- Error -- This ctest model is not supported."
-    echo "-- Error -- Possible arguments are Nightly, Experimental, Continuous or Profile."
-    exit 1
-    ;;
-esac
+if [ "$1" == "Experimental" -o "$1" == "Nightly" -o "$1" == "Continuous" -o "$1" == "Profile" -o "$1" == "alfa_ci" ]; then
+  echo ""
+else
+  echo "-- Error -- This ctest model is not supported."
+  echo "-- Error -- Possible arguments are Nightly, Experimental, Continuous or Profile."
+  exit 1
+fi

 # test if the input file exists and execute it
 if [ -e "$2" ];then
@@ -63,9 +61,6 @@ fi
 # set the ctest model to command line parameter
 if [ "$1" == "alfa_ci" ]; then
  export ctest_model=Experimental
-elif [ "$1" == "codecov" ]; then
-  export ctest_model=Profile
-  export do_codecov_upload=1
 else
  export ctest_model=$1
 fi
@@ -88,20 +83,13 @@ else
  COMPILER=$CXX$($CXX -dumpversion)
 fi

-case "$1" in
-  alfa_ci)
-    export LABEL1=alfa_ci-$COMPILER-FairMQ_$GIT_BRANCH
-    export LABEL=$(echo $LABEL1 | sed -e 's#/#_#g')
-    ;;
-  codecov)
-    export LABEL1=codecov-$COMPILER-FairMQ_$GIT_BRANCH
-    export LABEL=$(echo $LABEL1 | sed -e 's#/#_#g')
-    ;;
-  *)
-    export LABEL1=${LINUX_FLAVOUR}-$chip-$COMPILER-FairMQ_$GIT_BRANCH
-    export LABEL=$(echo $LABEL1 | sed -e 's#/#_#g')
-    ;;
-esac
+if [ "$1" == "alfa_ci" ]; then
+  export LABEL1=alfa_ci-$COMPILER-FairMQ_$GIT_BRANCH
+  export LABEL=$(echo $LABEL1 | sed -e 's#/#_#g')
+else
+  export LABEL1=${LINUX_FLAVOUR}-$chip-$COMPILER-FairMQ_$GIT_BRANCH
+  export LABEL=$(echo $LABEL1 | sed -e 's#/#_#g')
+fi

 # get the number of processors
 # and information about the host
--- a/FairMQTest.cmake
+++ b/FairMQTest.cmake
@@ -19,7 +19,7 @@ Set(BUILD_COMMAND "make")
 Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -j$ENV{number_of_processors}")

 String(TOUPPER $ENV{ctest_model} _Model)
-Set(configure_options "-DCMAKE_BUILD_TYPE=$ENV{ctest_model}")
+Set(configure_options "-DCMAKE_BUILD_TYPE=${_Model}")

 Set(CTEST_USE_LAUNCHERS 1)
 Set(configure_options "${configure_options};-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}")
@@ -27,27 +27,25 @@ Set(configure_options "${configure_options};-DCTEST_USE_LAUNCHERS=${CTEST_USE_LA
 Set(configure_options "${configure_options};-DDISABLE_COLOR=ON")
 Set(configure_options "${configure_options};-DCMAKE_PREFIX_PATH=$ENV{SIMPATH}")
 Set(configure_options "${configure_options};-DBUILD_NANOMSG_TRANSPORT=ON")
-# Set(configure_options "${configure_options};-DBUILD_OFI_TRANSPORT=ON")
 Set(configure_options "${configure_options};-DBUILD_DDS_PLUGIN=ON")
-Set(configure_options "${configure_options};-DBUILD_SDK=OFF")
-Set(configure_options "${configure_options};-DFAST_BUILD=ON")
-Set(configure_options "${configure_options};-DCOTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES=-j$ENV{number_of_processors}")

 Set(EXTRA_FLAGS $ENV{EXTRA_FLAGS})
 If(EXTRA_FLAGS)
  Set(configure_options "${configure_options};${EXTRA_FLAGS}") 
 EndIf()

-If($ENV{ctest_model} MATCHES Profile)
+If($ENV{ctest_model} MATCHES Nightly OR $ENV{ctest_model} MATCHES Profile)
+
  Find_Program(GCOV_COMMAND gcov)
  If(GCOV_COMMAND)
    Message("Found GCOV: ${GCOV_COMMAND}")
    Set(CTEST_COVERAGE_COMMAND ${GCOV_COMMAND})
  EndIf(GCOV_COMMAND)
-EndIf()

-If($ENV{ctest_model} MATCHES Nightly OR $ENV{ctest_model} MATCHES Profile)
-  Ctest_Empty_Binary_Directory(${CTEST_BINARY_DIRECTORY})
+  Set(ENV{ctest_model} Nightly)
+
+  CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
+
 EndIf()

 Ctest_Start($ENV{ctest_model})
@@ -59,22 +57,12 @@ Ctest_Configure(BUILD "${CTEST_BINARY_DIRECTORY}"
 Ctest_Build(BUILD "${CTEST_BINARY_DIRECTORY}")

 Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}" 
-           # PARALLEL_LEVEL $ENV{number_of_processors}
           PARALLEL_LEVEL $ENV{number_of_processors}
           RETURN_VALUE _ctest_test_ret_val
          )

 If(GCOV_COMMAND)
-  Ctest_Coverage(BUILD "${CTEST_BINARY_DIRECTORY}" LABELS coverage)
-EndIf()
-
-If("$ENV{do_codecov_upload}")
-  Execute_Process(COMMAND curl https://codecov.io/bash -o codecov_uploader.sh
-                  WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}
-                  TIMEOUT 60)
-  Execute_Process(COMMAND bash ./codecov_uploader.sh -X gcov
-                  WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}
-                  TIMEOUT 60)
+  Ctest_Coverage(BUILD "${CTEST_BINARY_DIRECTORY}")
 EndIf()

 Ctest_Submit()
--- a/67
+++ b/67
@@ -4,53 +4,24 @@ def specToLabel(Map spec) {
  return "${spec.os}-${spec.arch}-${spec.compiler}-FairSoft_${spec.fairsoft}"
 }

-def jobMatrix(String prefix, List specs, Closure callback) {
+def buildMatrix(List specs, Closure callback) {
  def nodes = [:]
  for (spec in specs) {
    def label = specToLabel(spec)
-    def fairsoft = spec.fairsoft
-    def os = spec.os
-    def compiler = spec.compiler
-    nodes["${prefix}/${label}"] = {
+    nodes[label] = {
      node(label) {
-        githubNotify(context: "${prefix}/${label}", description: 'Building ...', status: 'PENDING')
+        githubNotify(context: "alfa-ci/${label}", description: 'Building ...', status: 'PENDING')
        try {
          deleteDir()
          checkout scm

-          sh """\
-            echo "export SIMPATH=\${SIMPATH_PREFIX}${fairsoft}" >> Dart.cfg
-            echo "export FAIRSOFT_VERSION=${fairsoft}" >> Dart.cfg
-          """
-          if (os =~ /Debian/ && compiler =~ /gcc8/) {
-            sh '''\
-              echo "source /etc/profile.d/modules.sh" >> Dart.cfg
-              echo "module use /cvmfs/it.gsi.de/modulefiles" >> Dart.cfg
-              echo "module load compiler/gcc/8" >> Dart.cfg
-            '''
-          }
-          if (os =~ /MacOS/) {
-            sh "echo \"export EXTRA_FLAGS='-DCMAKE_CXX_COMPILER=clang++'\" >> Dart.cfg"
-          } else {
-            sh "echo \"export EXTRA_FLAGS='-DCMAKE_CXX_COMPILER=g++'\" >> Dart.cfg"
-          }
-
-          sh '''\
-            echo "export BUILDDIR=$PWD/build" >> Dart.cfg
-            echo "export SOURCEDIR=$PWD" >> Dart.cfg
-            echo "export PATH=\\\$SIMPATH/bin:\\\$PATH" >> Dart.cfg
-            echo "export GIT_BRANCH=$JOB_BASE_NAME" >> Dart.cfg
-            echo "echo \\\$PATH" >> Dart.cfg
-          '''
-          sh 'cat Dart.cfg'
-
          callback.call(spec, label)

          deleteDir()
-          githubNotify(context: "${prefix}/${label}", description: 'Success', status: 'SUCCESS')
+          githubNotify(context: "alfa-ci/${label}", description: 'Success', status: 'SUCCESS')
        } catch (e) {
          deleteDir()
-          githubNotify(context: "${prefix}/${label}", description: 'Error', status: 'ERROR')
+          githubNotify(context: "alfa-ci/${label}", description: 'Error', status: 'ERROR')
          throw e
        }
      }
@@ -62,26 +33,22 @@ def jobMatrix(String prefix, List specs, Closure callback) {
 pipeline{
  agent none
  stages {
-    stage("Run CI Matrix") {
+    stage("Run Build/Test Matrix") {
      steps{
        script {
-          def build_jobs = jobMatrix('alfa-ci/build', [
-            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc8.1.0',        fairsoft: 'fairmq_dev'],
-            [os: 'MacOS10.13', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
-            [os: 'MacOS10.14', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
+          parallel(buildMatrix([
+            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc4.9',         fairsoft: 'may18'],
+            [os: 'MacOS10.11', arch: 'x86_64', compiler: 'AppleLLVM8.0.0', fairsoft: 'may18'],
+            [os: 'MacOS10.13', arch: 'x86_64', compiler: 'AppleLLVM9.0.0', fairsoft: 'may18'],
          ]) { spec, label ->
+            sh '''\
+              echo "export BUILDDIR=$PWD/build" >> Dart.cfg
+              echo "export SOURCEDIR=$PWD" >> Dart.cfg
+              echo "export PATH=$SIMPATH/bin:$PATH" >> Dart.cfg
+              echo "export GIT_BRANCH=$JOB_BASE_NAME" >> Dart.cfg
+            '''
            sh './Dart.sh alfa_ci Dart.cfg'
-          }
-
-          def profile_jobs = jobMatrix('alfa-ci/codecov', [
-            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc8.1.0',        fairsoft: 'fairmq_dev'],
-          ]) { spec, label ->
-            withCredentials([string(credentialsId: 'fairmq_codecov_token', variable: 'CODECOV_TOKEN')]) {
-              sh './Dart.sh codecov Dart.cfg'
-            }
-          }
-
-          parallel(build_jobs + profile_jobs)
+          })
        }
      }
    }
--- a/Jenkinsfile.nightly
+++ b/Jenkinsfile.nightly
@@ -8,40 +8,12 @@ def buildMatrix(List specs, Closure callback) {
  def nodes = [:]
  for (spec in specs) {
    def label = specToLabel(spec)
-    def fairsoft = spec.fairsoft
-    def os = spec.os
-    def compiler = spec.compiler
    nodes[label] = {
      node(label) {
        try {
          deleteDir()
          checkout scm

-          sh """\
-            echo "export SIMPATH=\${SIMPATH_PREFIX}${fairsoft}" >> Dart.cfg
-            echo "export FAIRSOFT_VERSION=${fairsoft}" >> Dart.cfg
-          """
-          if (os =~ /Debian/ && compiler =~ /gcc8/) {
-            sh '''\
-              echo "source /etc/profile.d/modules.sh" >> Dart.cfg
-              echo "module use /cvmfs/it.gsi.de/modulefiles" >> Dart.cfg
-              echo "module load compiler/gcc/8" >> Dart.cfg
-            '''
-          }
-          if (os =~ /MacOS/) {
-            sh "echo \"export EXTRA_FLAGS='-DCMAKE_CXX_COMPILER=clang++'\" >> Dart.cfg"
-          } else {
-            sh "echo \"export EXTRA_FLAGS='-DCMAKE_CXX_COMPILER=g++'\" >> Dart.cfg"
-          }
-          sh '''\
-            echo "export BUILDDIR=$PWD/build" >> Dart.cfg
-            echo "export SOURCEDIR=$PWD" >> Dart.cfg
-            echo "export PATH=\\\$SIMPATH/bin:\\\$PATH" >> Dart.cfg
-            echo "export GIT_BRANCH=dev" >> Dart.cfg
-            echo "echo \\\$PATH" >> Dart.cfg
-          '''
-          sh 'cat Dart.cfg'
-
          callback.call(spec, label)

          deleteDir()
@@ -63,10 +35,16 @@ pipeline{
      steps{
        script {
          parallel(buildMatrix([
-            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc8.1.0',        fairsoft: 'fairmq_dev'],
-            [os: 'MacOS10.13', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
-            [os: 'MacOS10.14', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
+            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc4.9',         fairsoft: 'may18'],
+            [os: 'MacOS10.11', arch: 'x86_64', compiler: 'AppleLLVM8.0.0', fairsoft: 'may18'],
+            [os: 'MacOS10.13', arch: 'x86_64', compiler: 'AppleLLVM9.0.0', fairsoft: 'may18'],
          ]) { spec, label ->
+            sh '''\
+              echo "export BUILDDIR=$PWD/build" >> Dart.cfg
+              echo "export SOURCEDIR=$PWD" >> Dart.cfg
+              echo "export PATH=$SIMPATH/bin:$PATH" >> Dart.cfg
+              echo "export GIT_BRANCH=dev" >> Dart.cfg
+            '''
            sh './Dart.sh Nightly Dart.cfg'
            sh './Dart.sh Profile Dart.cfg'
          })
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,4 @@
-Describe your proposal.
-
-Mention any issue this PR resolves or is related to.
+Replace me with your description.

 ---

--- a/README.md
+++ b/README.md
@@ -1,16 +1,12 @@
 <!-- {#mainpage} -->
-# FairMQ [![license](https://alfa-ci.gsi.de/shields/badge/license-LGPL--3.0-orange.svg)](COPYRIGHT) [![build status](https://alfa-ci.gsi.de/buildStatus/icon?job=FairRootGroup/FairMQ/master)](https://alfa-ci.gsi.de/blue/organizations/jenkins/FairRootGroup%2FFairMQ/branches) [![test coverage master branch](https://codecov.io/gh/FairRootGroup/FairMQ/branch/master/graph/badge.svg)](https://codecov.io/gh/FairRootGroup/FairMQ/branch/master) [![Coverity Badge](https://alfa-ci.gsi.de/shields/coverity/scan/fairrootgroup-fairmq.svg)](https://scan.coverity.com/projects/fairrootgroup-fairmq) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/6b648d95d68d4c4eae833b84f84d299c)](https://www.codacy.com/app/dennisklein/FairMQ?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=FairRootGroup/FairMQ&amp;utm_campaign=Badge_Grade)
+# FairMQ

-C++ Message Queuing Library and Framework
+C++ Message passing framework

-| Release | Version | Docs |
-| :---: | :--- | :--- |
-| `stable` | [![release](https://alfa-ci.gsi.de/shields/github/release/FairRootGroup/FairMQ.svg)](https://github.com/FairRootGroup/FairMQ/releases/latest) | [API](https://fairrootgroup.github.io/FairMQ/latest), [Book](https://github.com/FairRootGroup/FairMQ/blob/master/README.md#documentation) |
-| `testing` | [![dev tag](https://alfa-ci.gsi.de/shields/github/tag/FairRootGroup/FairMQ.svg)](https://github.com/FairRootGroup/FairMQ/tags) | [Book](https://github.com/FairRootGroup/FairMQ/blob/dev/README.md#documentation) |
-
-Find all FairMQ releases [here](https://github.com/FairRootGroup/FairMQ/releases).
-
-## Introduction
+| Branch | Build Status |
+| :---: | :--- |
+| `master` | ![build status master branch](https://alfa-ci.gsi.de/buildStatus/icon?job=FairRootGroup/FairMQ/master) |
+| `dev` | ![build status dev branch](https://alfa-ci.gsi.de/buildStatus/icon?job=FairRootGroup/FairMQ/dev) |

 FairMQ is designed to help implementing large-scale data processing workflows needed in next-generation Particle Physics experiments. FairMQ is written in C++ and aims to
  * provide **an asynchronous message passing abstraction** of different data transport technologies,
@@ -35,13 +31,30 @@ a simulation, reconstruction and analysis framework.

 ## Dependencies

-  * PUBLIC: [**Boost**](https://www.boost.org/), [**FairLogger**](https://github.com/FairRootGroup/FairLogger)
-  * BUILD: [CMake](https://cmake.org/), [GTest](https://github.com/google/googletest), [Doxygen](http://www.doxygen.org/)
-  * PRIVATE: [ZeroMQ](http://zeromq.org/), [Msgpack](https://msgpack.org/index.html), [nanomsg](http://nanomsg.org/),
-[asiofi](https://github.com/FairRootGroup/asiofi), [DDS](http://dds.gsi.de), [PMIx](https://pmix.org/)
+  * [**Boost**](https://www.boost.org/) (PUBLIC)
+  * [**FairLogger**](https://github.com/FairRootGroup/FairLogger) (PUBLIC)
+  * [CMake](https://cmake.org/) (BUILD)
+  * [GTest](https://github.com/google/googletest) (BUILD, optional, `tests`)
+  * [Doxygen](http://www.doxygen.org/) (BUILD, optional, `docs`)
+  * [ZeroMQ](http://zeromq.org/) (PRIVATE)
+  * [Msgpack](https://msgpack.org/index.html) (PRIVATE, optional, `nanomsg_transport`)
+  * [nanomsg](http://nanomsg.org/) (PRIVATE, optional, `nanomsg_transport`)
+  * [OFI](https://ofiwg.github.io/libfabric/) (PRIVATE, optional, `ofi_transport`)
+  * [Protobuf](https://developers.google.com/protocol-buffers/) (PRIVATE, optional, `ofi_transport`)
+  * [DDS](http://dds.gsi.de) (PRIVATE, optional, `dds_plugin`)

  Supported platforms: Linux and MacOS.

+## Releases
+
+| Stable release | Date | API Docs |
+| --- | --- | --- |
+| [**1.2.3**](https://github.com/FairRootGroup/FairMQ/releases/tag/v1.2.3) | May 2018 | [link](https://fairrootgroup.github.io/FairMQ/v1.2.3/index.html) |
+| [**1.2.1**](https://github.com/FairRootGroup/FairMQ/releases/tag/v1.2.1) | May 2018 | [link](https://fairrootgroup.github.io/FairMQ/v1.2.1/index.html) |
+| [**1.2.0**](https://github.com/FairRootGroup/FairMQ/releases/tag/v1.2.0) | May 2018 | [link](https://fairrootgroup.github.io/FairMQ/v1.2.0/index.html) |
+
+Find all FairMQ stable and development releases [here](https://github.com/FairRootGroup/FairMQ/releases).
+
 ## Installation from Source

 ```bash
@@ -51,7 +64,7 @@ cmake -DCMAKE_INSTALL_PREFIX=./fairmq_install ../fairmq
 cmake --build . --target install
 ```

-If dependencies are not installed in standard system directories, you can hint the installation location via `-DCMAKE_PREFIX_PATH=...` or per dependency via `-D{DEPENDENCY}_ROOT=...`. `{DEPENDENCY}` can be `GTEST`, `BOOST`, `FAIRLOGGER`, `ZEROMQ`, `MSGPACK`, `NANOMSG`, `OFI`, `PMIX`, `ASIOFI` or `DDS` (`*_ROOT` variables can also be environment variables).
+If dependencies are not installed in standard system directories, you can hint the installation location via `-DCMAKE_PREFIX_PATH=...` or per dependency via `-D{DEPENDENCY}_ROOT=...`. `{DEPENDENCY}` can be `GTEST`, `BOOST`, `FAIRLOGGER`, `ZEROMQ`, `MSGPACK`, `NANOMSG`, `OFI`, `PROTOBUF`, or `DDS` (`*_ROOT` variables can also be environment variables).

 ## Usage

@@ -76,7 +89,7 @@ In order to succesfully compile and link against the `FairMQ::FairMQ` target, yo
 find_package(FairMQ)
 if(FairMQ_FOUND)
  find_package(FairLogger ${FairMQ_FairLogger_VERSION})
-  find_package(Boost ${FairMQ_Boost_VERSION} COMPONENTS ${FairMQ_Boost_COMPONENTS})
+  find_package(Boost ${FairMQ_Boost_VERSION} COMPONENTS ${FairMQ_BOOST_COMPONENTS})
 endif()
 ```

@@ -88,7 +101,7 @@ Optionally, you can require certain FairMQ package components and a minimum vers
 find_package(FairMQ 1.1.0 COMPONENTS nanomsg_transport dds_plugin)
 if(FairMQ_FOUND)
  find_package(FairLogger ${FairMQ_FairLogger_VERSION})
-  find_package(Boost ${FairMQ_Boost_VERSION} COMPONENTS ${FairMQ_Boost_COMPONENTS})
+  find_package(Boost ${FairMQ_Boost_VERSION} COMPONENTS ${FairMQ_BOOST_COMPONENTS})
 endif()
 ```

@@ -104,7 +117,6 @@ On command line:
  * `-DBUILD_NANOMSG_TRANSPORT=ON` enables building of nanomsg transport.
  * `-DBUILD_OFI_TRANSPORT=ON` enables building of the experimental OFI transport.
  * `-DBUILD_DDS_PLUGIN=ON` enables building of the DDS plugin.
-  * `-DBUILD_PMIX_PLUGIN=ON` enables building of the PMIx plugin.
  * `-DBUILD_DOCS=ON` enables building of API docs.
  * You can hint non-system installations for dependent packages, see the #Installation section above

@@ -120,17 +132,15 @@ After the `find_package(FairMQ)` call the following CMake variables are defined:
 | `${FairMQ_#COMPONENT#_FOUND}` | `TRUE` if this component was built |
 | `${FairMQ_VERSION}` | the version in format `MAJOR.MINOR.PATCH` |
 | `${FairMQ_GIT_VERSION}` | the version in the format returned by `git describe --tags --dirty --match "v*"` |
-| `${FairMQ_PREFIX}` | the actual installation prefix |
+| `${FairMQ_ROOT}` | the actual installation prefix, notice the difference to the hint variable `FAIRMQ_ROOT` |
 | `${FairMQ_BINDIR}` | the installation bin directory |
 | `${FairMQ_INCDIR}` | the installation include directory |
 | `${FairMQ_LIBDIR}` | the installation lib directory |
 | `${FairMQ_DATADIR}` | the installation data directory (`../share/fairmq`) |
 | `${FairMQ_CMAKEMODDIR}` | the installation directory of shipped CMake find modules |
-| `${FairMQ_CXX_STANDARD_REQUIRED}` | the value of `CMAKE_CXX_STANDARD_REQUIRED` at build-time |
-| `${FairMQ_CXX_STANDARD}` | the value of `CMAKE_CXX_STANDARD` at build-time |
-| `${FairMQ_CXX_EXTENSIONS}` | the values of `CMAKE_CXX_EXTENSIONS` at build-time |
-| `${FairMQ_BUILD_TYPE}` | the value of `CMAKE_BUILD_TYPE` at build-time |
-| `${FairMQ_CXX_FLAGS}` | the values of `CMAKE_CXX_FLAGS` and `CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}` at build-time |
+| `${FairMQ_CXX_STANDARD_REQUIRED}` | the value of `CMAKE_CXX_STANDARD_REQUIRED` at built-time |
+| `${FairMQ_CXX_STANDARD}` | the value of `CMAKE_CXX_STANDARD` at built-time |
+| `${FairMQ_CXX_EXTENSIONS}` | the values of `CMAKE_CXX_EXTENSIONS` at built-time |

 ## Documentation

@@ -159,10 +169,9 @@ After the `find_package(FairMQ)` call the following CMake variables are defined:
   4. [File output](docs/Logging.md#54-file-output)
   5. [Custom sinks](docs/Logging.md#55-custom-sinks)
 6. [Examples](docs/Examples.md#6-examples)
-7. [Plugins](docs/Plugins.md#7-plugins)
-   1. [Usage](docs/Plugins.md#71-usage)
-   2. [Development](docs/Plugins.md#72-development)
-   3. [Provided Plugins](docs/Plugins.md#73-provided-plugins)
-       1. [DDS](docs/Plugins.md#731-dds)
-       2. [PMIx](docs/Plugins.md#732-pmix)

+## License
+
+GNU Lesser General Public Licence (LGPL) version 3, see [LICENSE](LICENSE).
+
+Copyright (C) 2013-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
--- a/cmake/FairMQConfig.cmake.in
+++ b/cmake/FairMQConfig.cmake.in
@@ -13,20 +13,16 @@ set(@PROJECT_NAME@_VERSION @PROJECT_VERSION@)
 set(@PROJECT_NAME@_GIT_VERSION @PROJECT_GIT_VERSION@)
 set(@PROJECT_NAME@_GIT_DATE @PROJECT_GIT_DATE@)

-set(@PROJECT_NAME@_PREFIX @PACKAGE_CMAKE_INSTALL_PREFIX@)
-set(@PROJECT_NAME@_BINDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_BINDIR@)
-set(@PROJECT_NAME@_INCDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@)
-set(@PROJECT_NAME@_LIBDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_LIBDIR@)
-set(@PROJECT_NAME@_DATADIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_DATADIR@)
-set(@PROJECT_NAME@_CMAKEMODDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_CMAKEMODDIR@)
+set_and_check(@PROJECT_NAME@_ROOT @PACKAGE_CMAKE_INSTALL_PREFIX@)
+set_and_check(@PROJECT_NAME@_BINDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_BINDIR@)
+set_and_check(@PROJECT_NAME@_INCDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@)
+set_and_check(@PROJECT_NAME@_LIBDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_LIBDIR@)
+set_and_check(@PROJECT_NAME@_DATADIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_DATADIR@)
+set_and_check(@PROJECT_NAME@_CMAKEMODDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_CMAKEMODDIR@)

 set(@PROJECT_NAME@_CXX_STANDARD_REQUIRED @CMAKE_CXX_STANDARD_REQUIRED@)
 set(@PROJECT_NAME@_CXX_STANDARD @CMAKE_CXX_STANDARD@)
 set(@PROJECT_NAME@_CXX_EXTENSIONS @CMAKE_CXX_EXTENSIONS@)
-set(@PROJECT_NAME@_VERSION_HOTFIX @PROJECT_VERSION_HOTFIX@)
-set(@PROJECT_NAME@_BUILD_TYPE @CMAKE_BUILD_TYPE@)
-set(@PROJECT_NAME@_BUILD_TYPE_UPPER @PROJECT_BUILD_TYPE_UPPER@)
-set(@PROJECT_NAME@_CXX_FLAGS @PROJECT_CXX_FLAGS@)

 ### Import cmake modules
 set(CMAKE_MODULE_PATH ${@PROJECT_NAME@_CMAKEMODDIR} ${CMAKE_MODULE_PATH})
--- a/cmake/FairMQLib.cmake
+++ b/cmake/FairMQLib.cmake
@@ -29,6 +29,25 @@ if(NOT WIN32 AND NOT DISABLE_COLOR)
  set(BWhite   "${Esc}[1;37m")
 endif()

+# set_fairmq_cmake_policies()
+#
+# Sets CMake policies.
+macro(set_fairmq_cmake_policies)
+  # Find more details to each policy with cmake --help-policy CMPXXXX
+  foreach(policy
+    CMP0025 # Compiler id for Apple Clang is now AppleClang.
+    CMP0028 # Double colon in target name means ALIAS or IMPORTED target.
+    CMP0042 # MACOSX_RPATH is enabled by default.
+    CMP0048 # The ``project()`` command manages VERSION variables.
+    CMP0054 # Only interpret ``if()`` arguments as variables or keywords when unquoted.
+  )
+    if(POLICY ${policy})
+      cmake_policy(SET ${policy} NEW)
+    endif()
+  endforeach()
+endmacro()
+
+
 find_package(Git)
 # get_git_version([DEFAULT_VERSION version] [DEFAULT_DATE date] [OUTVAR_PREFIX prefix])
 #
@@ -93,23 +112,20 @@ macro(set_fairmq_defaults)
    set(CMAKE_BUILD_TYPE RelWithDebInfo)
  endif()

+
  # Handle C++ standard level
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
  if(NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD ${PROJECT_MIN_CXX_STANDARD})
-  elseif(${CMAKE_CXX_STANDARD} LESS ${PROJECT_MIN_CXX_STANDARD})
-    message(FATAL_ERROR "A minimum CMAKE_CXX_STANDARD of ${PROJECT_MIN_CXX_STANDARD} is required.")
+    set(CMAKE_CXX_STANDARD 11)
+  elseif(${CMAKE_CXX_STANDARD} LESS 11)
+    message(FATAL_ERROR "A minimum CMAKE_CXX_STANDARD of 11 is required.")
+  elseif(${CMAKE_CXX_STANDARD} GREATER 11)
+    message(WARNING "A CMAKE_CXX_STANDARD of ${CMAKE_CXX_STANDARD} (greater than 11) is not tested. Use on your own risk.")
  endif()
  set(CMAKE_CXX_EXTENSIONS OFF)

-  if(NOT BUILD_SHARED_LIBS)
-    set(BUILD_SHARED_LIBS ON CACHE BOOL "Whether to build shared libraries or static archives")
-  endif()
-
  # Set -fPIC as default for all library types
-  if(NOT CMAKE_POSITION_INDEPENDENT_CODE)
-    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-  endif()
+  set(CMAKE_POSITION_INDEPENDENT_CODE ON)

  # Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -142,58 +158,9 @@ macro(set_fairmq_defaults)
  # Define export set, only one for now
  set(PROJECT_EXPORT_SET ${PROJECT_NAME}Targets)

-  # Configure build types
-  set(CMAKE_CONFIGURATION_TYPES "Debug" "Release" "RelWithDebInfo" "Nightly" "Profile" "Experimental" "AdressSan" "ThreadSan")
-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -Wshadow -Wall -Wextra")
-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -Wshadow -Wall -Wextra -DNDEBUG")
-  set(CMAKE_CXX_FLAGS_NIGHTLY        "-O2 -g -Wshadow -Wall -Wextra")
-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -Wshadow -Wall -Wextra -fno-inline -ftest-coverage -fprofile-arcs")
-  set(CMAKE_CXX_FLAGS_EXPERIMENTAL   "-O2 -g -Wshadow -Wall -Wextra -DNDEBUG")
-  set(CMAKE_CXX_FLAGS_ADRESSSAN      "-O2 -g -Wshadow -Wall -Wextra -fsanitize=address -fno-omit-frame-pointer")
-  set(CMAKE_CXX_FLAGS_THREADSAN      "-O2 -g -Wshadow -Wall -Wextra -fsanitize=thread")
-
-  if(CMAKE_GENERATOR STREQUAL "Ninja" AND
-     ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) OR
-      (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)))
-    # Force colored warnings in Ninja's output, if the compiler has -fdiagnostics-color support.
-    # Rationale in https://github.com/ninja-build/ninja/issues/814
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
-  endif()
-
-  if(NOT PROJECT_VERSION_TWEAK)
-    set(PROJECT_VERSION_HOTFIX 0)
-  else()
-    set(PROJECT_VERSION_HOTFIX ${PROJECT_VERSION_TWEAK})
-  endif()
-
-  if(NOT DEFINED RUN_STATIC_ANALYSIS)
-    set(RUN_STATIC_ANALYSIS OFF)
-  endif()
-
-  unset(PROJECT_STATIC_ANALYSERS)
-  if(RUN_STATIC_ANALYSIS)
-    set(analyser "clang-tidy")
-    find_program(${analyser}_FOUND "${analyser}")
-    if(${analyser}_FOUND)
-      set(CMAKE_CXX_CLANG_TIDY "${${analyser}_FOUND}")
-    endif()
-    list(APPEND PROJECT_STATIC_ANALYSERS "${analyser}")
-
-    set(analyser "iwyu")
-    find_program(${analyser}_FOUND "${analyser}")
-    if(${analyser}_FOUND)
-      set(CMAKE_CXX_IWYU "${${analyser}_FOUND}")
-    endif()
-    list(APPEND PROJECT_STATIC_ANALYSERS "${analyser}")
-
-    set(analyser "cpplint")
-    find_program(${analyser}_FOUND "${analyser}")
-    if(${analyser}_FOUND)
-      set(CMAKE_CXX_CPPLINT "${${analyser}_FOUND}")
-    endif()
-    list(APPEND PROJECT_STATIC_ANALYSERS "${analyser}")
-  endif()
+  # Override CMake defaults
+  set(CMAKE_CXX_FLAGS_NIGHTLY "-O2 -g -Wshadow -Wall -Wextra")
+  set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs -Wshadow -Wall -Wextra -Wunused-variable")
 endmacro()

 function(join VALUES GLUE OUTPUT)
@@ -268,11 +235,9 @@ endfunction()

 # Configure/Install CMake package
 macro(install_cmake_package)
-  list(SORT PROJECT_PACKAGE_DEPENDENCIES)
-  list(SORT PROJECT_INTERFACE_PACKAGE_DEPENDENCIES)
  include(CMakePackageConfigHelpers)
  set(PACKAGE_INSTALL_DESTINATION
-    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_GIT_VERSION}
+    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
  )
  if(BUILD_FAIRMQ)
    install(EXPORT ${PROJECT_EXPORT_SET}
@@ -288,8 +253,6 @@ macro(install_cmake_package)
  )
  generate_package_dependencies() # fills ${PACKAGE_DEPENDENCIES}
  generate_package_components() # fills ${PACKAGE_COMPONENTS}
-  string(TOUPPER ${CMAKE_BUILD_TYPE} PROJECT_BUILD_TYPE_UPPER)
-  set(PROJECT_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${PROJECT_BUILD_TYPE_UPPER}})
  configure_package_config_file(
    ${CMAKE_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in
    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
@@ -303,97 +266,36 @@ macro(install_cmake_package)
  )
 endmacro()

-#
-# find_package2(PRIVATE|PUBLIC|INTERFACE <pkgname>
-#               [VERSION <version>]
-#               [COMPONENTS <list of components>]
-#               [ADD_REQUIREMENTS_OF <list of dep_pgkname>]
-#               [any other option the native find_package supports]...)
-#
-# Wrapper around CMake's native find_package command to add some features and bookkeeping.
-#
-# The qualifier (PRIVATE|PUBLIC|INTERFACE) to the package to populate
-# the variables PROJECT_[INTERFACE]_<pkgname>_([VERSION]|[COMPONENTS]|PACKAGE_DEPENDENCIES)
-# accordingly. This bookkeeping information is used to print our dependency found summary
-# table and to generate a part of our CMake package.
-#
-# When a dependending package is listed with ADD_REQUIREMENTS_OF the variables
-# <dep_pkgname>_<pkgname>_VERSION|COMPONENTS are looked up to and added to the native
-# VERSION (selected highest version) and COMPONENTS (deduplicated) args.
-#
-# COMPONENTS and VERSION args are then just passed to the native find_package.
-#
 macro(find_package2 qualifier pkgname)
-  cmake_parse_arguments(ARGS "" "VERSION" "COMPONENTS;ADD_REQUIREMENTS_OF" ${ARGN})
+  cmake_parse_arguments(ARGS "" "VERSION" "COMPONENTS" ${ARGN})

  string(TOUPPER ${pkgname} pkgname_upper)
-  set(__old_cpp__ ${CMAKE_PREFIX_PATH})
+  set(old_CPP ${CMAKE_PREFIX_PATH})
  set(CMAKE_PREFIX_PATH ${${pkgname_upper}_ROOT} $ENV{${pkgname_upper}_ROOT} ${CMAKE_PREFIX_PATH})
-
-  # build lists of required versions and components
-  unset(__required_versions__)
-  unset(__components__)
-  if(ARGS_VERSION)
-    list(APPEND __required_versions__ ${ARGS_VERSION})
-  endif()
  if(ARGS_COMPONENTS)
-    list(APPEND __components__ ${ARGS_COMPONENTS})
-  endif()
-  if(ARGS_ADD_REQUIREMENTS_OF)
-    foreach(dep_pkgname IN LISTS ARGS_ADD_REQUIREMENTS_OF)
-      if(${dep_pkgname}_${pkgname}_VERSION)
-        list(APPEND __required_versions__ ${${dep_pkgname}_${pkgname}_VERSION})
-      endif()
-      if(${dep_pkgname}_${pkgname}_COMPONENTS)
-        list(APPEND __components__ ${${dep_pkgname}_${pkgname}_COMPONENTS})
-      endif()
-    endforeach()
-  endif()
-
-  # select highest required version
-  unset(__version__)
-  if(__required_versions__)
-    list(GET __required_versions__ 0 __version__)
-    foreach(v IN LISTS __required_versions__)
-      if(${v} VERSION_GREATER ${__version__})
-        set(__version__ ${v})
-      endif()
-    endforeach()
-  endif()
-  # deduplicate required component list
-  if(__components__)
-    list(REMOVE_DUPLICATES __components__)
-  endif()
-
-  # call native find_package
-  if(__components__)
-    find_package(${pkgname} ${__version__} QUIET COMPONENTS ${__components__} ${ARGS_UNPARSED_ARGUMENTS})
+    find_package(${pkgname} ${ARGS_VERSION} QUIET COMPONENTS ${ARGS_COMPONENTS} ${ARGS_UNPARSED_ARGUMENTS})
  else()
-    find_package(${pkgname} ${__version__} QUIET ${ARGS_UNPARSED_ARGUMENTS})
+    find_package(${pkgname} ${ARGS_VERSION} QUIET ${ARGS_UNPARSED_ARGUMENTS})
  endif()
+  set(CMAKE_PREFIX_PATH ${old_CPP})
+  unset(old_CPP)

  if(${pkgname}_FOUND)
    if(${qualifier} STREQUAL PRIVATE)
-      set(PROJECT_${pkgname}_VERSION ${__version__})
-      set(PROJECT_${pkgname}_COMPONENTS ${__components__})
+      set(PROJECT_${pkgname}_VERSION ${ARGS_VERSION})
+      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
    elseif(${qualifier} STREQUAL PUBLIC)
-      set(PROJECT_${pkgname}_VERSION ${__version__})
-      set(PROJECT_${pkgname}_COMPONENTS ${__components__})
+      set(PROJECT_${pkgname}_VERSION ${ARGS_VERSION})
+      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
-      set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
-      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${__components__})
+      set(PROJECT_INTERFACE_${pkgname}_VERSION ${ARGS_VERSION})
+      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
    elseif(${qualifier} STREQUAL INTERFACE)
-      set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
-      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${__components__})
+      set(PROJECT_INTERFACE_${pkgname}_VERSION ${ARGS_VERSION})
+      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
    endif()
  endif()
-
-  unset(__version__)
-  unset(__components__)
-  unset(__required_versions__)
-  set(CMAKE_PREFIX_PATH ${__old_cpp__})
-  unset(__old_cpp__)
 endmacro()
--- a/cmake/FindDDS.cmake
+++ b/cmake/FindDDS.cmake
@@ -0,0 +1,88 @@
+################################################################################
+# Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+#                                                                              #
+#              This software is distributed under the terms of the             #
+#              GNU Lesser General Public Licence (LGPL) version 3,             #
+#                  copied verbatim in the file "LICENSE"                       #
+################################################################################
+
+find_path(DDS_INCLUDE_DIR
+  NAMES dds_intercom.h
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES include
+)
+
+find_path(DDS_LIBRARY_DIR
+  NAMES libdds_intercom_lib.dylib libdds_intercom_lib.so
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES lib
+)
+
+find_library(DDS_INTERCOM_LIBRARY_SHARED
+  NAMES libdds_intercom_lib.dylib libdds_intercom_lib.so
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES lib
+  DOC "Path to libdds_intercom_lib.dylib libdds_intercom_lib.so."
+)
+
+find_library(DDS_PROTOCOL_LIBRARY_SHARED
+  NAMES libdds_protocol_lib.dylib libdds_protocol_lib.so
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES lib
+  DOC "Path to libdds_protocol_lib.dylib libdds_protocol_lib.so."
+)
+
+find_library(DDS_USER_DEFAULTS_LIBRARY_SHARED
+  NAMES libdds-user-defaults.dylib libdds-user-defaults.so
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES lib
+  DOC "Path to libdds-user-defaults.dylib libdds-user-defaults.so."
+)
+
+find_file(DDS_VERSION_FILE
+  NAMES version
+  HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
+  PATH_SUFFIXES etc
+)
+
+if(DDS_VERSION_FILE AND NOT DDS_VERSION)
+  file(READ ${DDS_VERSION_FILE} DDS_VERSION)
+  string(STRIP "${DDS_VERSION}" DDS_VERSION)
+  set(DDS_VERSION ${DDS_VERSION} CACHE string "DDS version.")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(DDS
+  REQUIRED_VARS
+  DDS_INCLUDE_DIR
+  DDS_LIBRARY_DIR
+  DDS_INTERCOM_LIBRARY_SHARED
+  DDS_PROTOCOL_LIBRARY_SHARED
+  DDS_USER_DEFAULTS_LIBRARY_SHARED
+
+  VERSION_VAR DDS_VERSION
+)
+
+if(NOT TARGET DDS::dds_intercom_lib AND DDS_FOUND)
+  add_library(DDS::dds_intercom_lib SHARED IMPORTED)
+  set_target_properties(DDS::dds_intercom_lib PROPERTIES
+    IMPORTED_LOCATION ${DDS_INTERCOM_LIBRARY_SHARED}
+    INTERFACE_INCLUDE_DIRECTORIES ${DDS_INCLUDE_DIR}
+  )
+endif()
+
+if(NOT TARGET DDS::dds_protocol_lib AND DDS_FOUND)
+  add_library(DDS::dds_protocol_lib SHARED IMPORTED)
+  set_target_properties(DDS::dds_protocol_lib PROPERTIES
+    IMPORTED_LOCATION ${DDS_PROTOCOL_LIBRARY_SHARED}
+    INTERFACE_INCLUDE_DIRECTORIES ${DDS_INCLUDE_DIR}
+  )
+endif()
+
+if(NOT TARGET DDS::dds-user-defaults AND DDS_FOUND)
+  add_library(DDS::dds-user-defaults SHARED IMPORTED)
+  set_target_properties(DDS::dds-user-defaults PROPERTIES
+    IMPORTED_LOCATION ${DDS_USER_DEFAULTS_LIBRARY_SHARED}
+    INTERFACE_INCLUDE_DIRECTORIES ${DDS_INCLUDE_DIR}
+  )
+endif()
--- a/cmake/FindFlatBuffers.cmake
+++ b/cmake/FindFlatBuffers.cmake
@@ -0,0 +1,67 @@
+################################################################################
+# Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+#                                                                              #
+#              This software is distributed under the terms of the             #
+#              GNU Lesser General Public Licence (LGPL) version 3,             #
+#                  copied verbatim in the file "LICENSE"                       #
+################################################################################
+
+find_path(FLATBUFFERS_INCLUDE_DIR
+  NAMES flatbuffers/flatbuffers.h
+  HINTS ${FLATBUFFERS_ROOT} $ENV{FLATBUFFERS_ROOT}
+  PATH_SUFFIXES include
+)
+
+find_path(FLATBUFFERS_LIBRARY_DIR
+  NAMES libflatbuffers.a
+  HINTS ${FLATBUFFERS_ROOT} $ENV{FLATBUFFERS_ROOT}
+  PATH_SUFFIXES lib
+)
+
+find_library(FLATBUFFERS_STATIC_LIBRARY
+  NAMES libflatbuffers.a
+  HINTS ${FLATBUFFERS_ROOT} $ENV{FLATBUFFERS_ROOT}
+  PATH_SUFFIXES lib
+)
+
+find_path(FLATBUFFERS_BINARY_DIR
+  NAMES flatc
+  HINTS ${FLATBUFFERS_ROOT} $ENV{FLATBUFFERS_ROOT}
+  PATH_SUFFIXES bin
+)
+
+find_program(FLATBUFFERS_BINARY_FLATC
+  NAMES flatc
+  HINTS ${FLATBUFFERS_ROOT} $ENV{FLATBUFFERS_ROOT}
+  PATH_SUFFIXES bin
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FlatBuffers
+  REQUIRED_VARS
+  FLATBUFFERS_INCLUDE_DIR
+  FLATBUFFERS_LIBRARY_DIR
+  FLATBUFFERS_BINARY_DIR
+)
+
+# idempotently import targets
+if(NOT TARGET FlatBuffers)
+  if(FLATBUFFERS_FOUND)
+    # import target
+    add_library(FlatBuffers STATIC IMPORTED)
+    set_target_properties(FlatBuffers PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES ${FLATBUFFERS_INCLUDE_DIR}
+      IMPORTED_LOCATION ${FLATBUFFERS_STATIC_LIBRARY}
+    )
+  endif()
+endif()
+
+if(NOT TARGET FlatBuffers::flatc)
+  if(FLATBUFFERS_FOUND)
+  # import target
+  add_executable(FlatBuffers::flatc IMPORTED)
+  set_target_properties(FlatBuffers::flatc PROPERTIES
+    IMPORTED_LOCATION ${FLATBUFFERS_BINARY_FLATC}
+  )
+  endif()
+endif()
--- a/cmake/FindOFI.cmake
+++ b/cmake/FindOFI.cmake
@@ -0,0 +1,89 @@
+################################################################################
+#    Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
+#                                                                              #
+#              This software is distributed under the terms of the             #
+#              GNU Lesser General Public Licence (LGPL) version 3,             #
+#                  copied verbatim in the file "LICENSE"                       #
+################################################################################
+
+# According to the docs the modification of the PKG_CONFIG_PATH environment should
+# not be necessary, but it does not work otherwise.
+if(OFI_ROOT)
+  list(APPEND CMAKE_PREFIX_PATH "${OFI_ROOT}/lib/pkgconfig")
+  set(ENV{PKG_CONFIG_PATH} "${OFI_ROOT}/lib/pkgconfig:" $ENV{PKG_CONFIG_PATH})
+endif()
+
+if(ENV{OFI_ROOT})
+  list(APPEND CMAKE_PREFIX_PATH "$ENV{OFI_ROOT}/lib/pkgconfig")
+  set(ENV{PKG_CONFIG_PATH} "$ENV{OFI_ROOT}/lib/pkgconfig:" $ENV{PKG_CONFIG_PATH})
+endif()
+
+# This should be the default as of CMake 3.1, but it is not set. BUG? Also, it does not work
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH 1)
+find_package(PkgConfig QUIET)
+
+if(PKG_CONFIG_FOUND)
+  # Find include dir and dependencies from pkgconfig
+  pkg_check_modules(_OFI libfabric QUIET)
+
+  # Retrieve version from pkgconfig
+  execute_process(
+    COMMAND ${PKG_CONFIG_EXECUTABLE} libfabric --modversion
+    OUTPUT_VARIABLE OFI_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+
+  # The IMPORTED_TARGET option of the pkg_check_modules() function is useless,
+  # so let's build it ourselves
+  find_library(OFI_LIBFABRIC
+    NAMES libfabric.so libfabric.dylib
+    HINTS ${OFI_ROOT} $ENV{OFI_ROOT}
+    PATH_SUFFIXES lib
+  )
+
+  # Just take the include dirs found by the PkgConfig module
+  set(OFI_INCLUDE_DIRS ${_OFI_INCLUDE_DIRS})
+
+  # Find fi_info command to be able to check required features of the OFI installation
+  find_program(OFI_INFO_EXECUTABLE
+    NAMES fi_info
+    HINTS ${OFI_ROOT} $ENV{OFI_ROOT}
+    PATH_SUFFIXES bin
+  )
+
+  # Detect ofi providers, they can be required via the COMPONENTS argument of find_package
+  if(OFI_INFO_EXECUTABLE)
+    execute_process(
+      COMMAND ${OFI_INFO_EXECUTABLE} -l
+      OUTPUT_VARIABLE output
+    )
+    string(REPLACE "\n" ";" lines ${output})
+    foreach(line IN LISTS lines)
+      string(REGEX
+        MATCH "^([a-zA-Z0-9_]+):"
+        found "${line}"
+      )
+      if(found)
+        string(TOLOWER "${CMAKE_MATCH_1}" provider)
+        set(OFI_fi_${provider}_FOUND TRUE)
+      endif()
+    endforeach()
+  endif()
+
+  # Check search result, check version constraints and print status
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(OFI
+    REQUIRED_VARS OFI_LIBFABRIC OFI_INCLUDE_DIRS OFI_INFO_EXECUTABLE
+    VERSION_VAR OFI_VERSION
+    HANDLE_COMPONENTS
+  )
+endif()
+
+if(NOT TARGET OFI::libfabric AND OFI_FOUND)
+  # Define an imported target
+  add_library(OFI::libfabric SHARED IMPORTED GLOBAL)
+  set_target_properties(OFI::libfabric PROPERTIES
+    IMPORTED_LOCATION ${OFI_LIBFABRIC}
+    INTERFACE_INCLUDE_DIRECTORIES ${OFI_INCLUDE_DIRS}
+  )
+endif()
--- a/cmake/FindPMIx.cmake
+++ b/cmake/FindPMIx.cmake
@@ -1,67 +0,0 @@
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-find_path(PMIx_INCLUDE_DIR
-  NAMES pmix.h
-  HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT}
-  PATH_SUFFIXES include
-)
-
-find_path(PMIx_LIBRARY_DIR
-  NAMES libpmix.dylib libpmix.so
-  HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT}
-  PATH_SUFFIXES lib lib64
-)
-
-find_library(PMIx_LIBRARY_SHARED
-  NAMES libpmix.dylib libpmix.so
-  HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT}
-  PATH_SUFFIXES lib lib64
-)
-
-find_file(PMIx_VERSION_FILE
-  NAMES pmix_version.h
-  HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT}
-  PATH_SUFFIXES include
-)
-
-file(READ "${PMIx_VERSION_FILE}" __version_raw)
-string(REGEX MATCH "#define PMIX_VERSION_MAJOR ([0-9]?)L?"
-  __version_major_raw "${__version_raw}"
-)
-set(PMIx_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
-string(REGEX MATCH "#define PMIX_VERSION_MINOR ([0-9]?)L?"
-  __version_minor_raw "${__version_raw}"
-)
-set(PMIx_VERSION_MINOR "${CMAKE_MATCH_1}")
-
-string(REGEX MATCH "#define PMIX_VERSION_RELEASE ([0-9]?)L?"
-  __version_patch_raw "${__version_raw}"
-)
-set(PMIx_VERSION_PATCH "${CMAKE_MATCH_1}")
-
-set(PMIx_VERSION "${PMIx_VERSION_MAJOR}.${PMIx_VERSION_MINOR}.${PMIx_VERSION_PATCH}")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PMIx
-  REQUIRED_VARS
-  PMIx_INCLUDE_DIR
-  PMIx_LIBRARY_DIR
-  PMIx_LIBRARY_SHARED
-
-  VERSION_VAR PMIx_VERSION
-)
-
-if(NOT TARGET PMIx::libpmix AND PMIx_FOUND)
-  add_library(PMIx::libpmix SHARED IMPORTED)
-  set_target_properties(PMIx::libpmix PROPERTIES
-    IMPORTED_LOCATION ${PMIx_LIBRARY_SHARED}
-    INTERFACE_INCLUDE_DIRECTORIES ${PMIx_INCLUDE_DIR}
-  )
-endif()
--- a/cmake/FindZeroMQ.cmake
+++ b/cmake/FindZeroMQ.cmake
@@ -89,7 +89,7 @@ endif()

 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(ZeroMQ
-    REQUIRED_VARS ZeroMQ_LIBRARY_SHARED ZeroMQ_INCLUDE_DIR
+    REQUIRED_VARS ZeroMQ_LIBRARY_SHARED ZeroMQ_INCLUDE_DIR ZeroMQ_LIBRARY_STATIC
    VERSION_VAR ZeroMQ_VERSION
 )

--- a/cmake/Findnanomsg.cmake
+++ b/cmake/Findnanomsg.cmake
@@ -0,0 +1,34 @@
+################################################################################
+# Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+#                                                                              #
+#              This software is distributed under the terms of the             #
+#              GNU Lesser General Public Licence (LGPL) version 3,             #
+#                  copied verbatim in the file "LICENSE"                       #
+################################################################################
+
+find_path(nanomsg_INCLUDE_DIR
+  NAMES nanomsg/nn.h
+  HINTS ${NANOMSG_ROOT} $ENV{NANOMSG_ROOT}
+  PATH_SUFFIXES include
+  DOC "Path to nanomsg include header files."
+)
+
+find_library(nanomsg_LIBRARY_SHARED
+  NAMES libnanomsg.dylib libnanomsg.so
+  HINTS ${NANOMSG_ROOT} $ENV{NANOMSG_ROOT}
+  PATH_SUFFIXES lib
+  DOC "Path to libnanomsg.dylib libnanomsg.so."
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(nanomsg
+  REQUIRED_VARS nanomsg_LIBRARY_SHARED nanomsg_INCLUDE_DIR
+)
+
+if(NOT TARGET nanomsg AND nanomsg_FOUND)
+  add_library(nanomsg SHARED IMPORTED)
+  set_target_properties(nanomsg PROPERTIES
+    IMPORTED_LOCATION ${nanomsg_LIBRARY_SHARED}
+    INTERFACE_INCLUDE_DIRECTORIES ${nanomsg_INCLUDE_DIR}
+  )
+endif()
--- a/cmake/GTestHelper.cmake
+++ b/cmake/GTestHelper.cmake
@@ -47,13 +47,11 @@
 #
 #

-include(GoogleTest)
-
 function(add_testsuite suitename)
    cmake_parse_arguments(testsuite
        ""
        "TIMEOUT;RUN_SERIAL"
-        "SOURCES;LINKS;DEPENDS;INCLUDES;DEFINITIONS"
+        "SOURCES;LINKS;DEPENDS;INCLUDES"
        ${ARGN}
    )

@@ -71,27 +69,14 @@ function(add_testsuite suitename)
    if(testsuite_INCLUDES)
        target_include_directories(${target} PUBLIC ${testsuite_INCLUDES})
    endif()
-    if(testsuite_DEFINITIONS)
-        target_compile_definitions("${target}" PUBLIC ${testsuite_DEFINITIONS})
-    endif()

-    # add_test(NAME "${suitename}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${target})
+    add_test(NAME "${suitename}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${target})
    if(testsuite_TIMEOUT)
-        # set_tests_properties("${suitename}" PROPERTIES TIMEOUT ${testsuite_TIMEOUT})
-    else()
-        set(testsuite_TIMEOUT 10)
+        set_tests_properties("${suitename}" PROPERTIES TIMEOUT ${testsuite_TIMEOUT})
    endif()
    if(testsuite_RUN_SERIAL)
-        # set_tests_properties("${suitename}" PROPERTIES RUN_SERIAL ${testsuite_RUN_SERIAL})
-    else()
-        set(testsuite_RUN_SERIAL OFF)
+        set_tests_properties("${suitename}" PROPERTIES RUN_SERIAL ${testsuite_RUN_SERIAL})
    endif()
-    gtest_discover_tests(${target}
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      TEST_PREFIX ${suitename}.
-      PROPERTIES RUN_SERIAL ${testsuite_RUN_SERIAL}
-                 TIMEOUT ${testsuite_TIMEOUT}
-    )

    list(APPEND ALL_TEST_TARGETS ${target})
    set(ALL_TEST_TARGETS ${ALL_TEST_TARGETS} PARENT_SCOPE)
@@ -101,7 +86,7 @@ function(add_testhelper helpername)
    cmake_parse_arguments(testhelper
        ""
        ""
-        "SOURCES;LINKS;DEPENDS;INCLUDES;DEFINITIONS"
+        "SOURCES;LINKS;DEPENDS;INCLUDES"
        ${ARGN}
    )

@@ -117,9 +102,6 @@ function(add_testhelper helpername)
    if(testhelper_INCLUDES)
        target_include_directories(${target} PUBLIC ${testhelper_INCLUDES})
    endif()
-    if(testhelper_DEFINITIONS)
-        target_compile_definitions(${target} PUBLIC ${testhelper_DEFINITIONS})
-    endif()

    list(APPEND ALL_TEST_TARGETS ${target})
    set(ALL_TEST_TARGETS ${ALL_TEST_TARGETS} PARENT_SCOPE)
@@ -129,7 +111,7 @@ function(add_testlib libname)
    cmake_parse_arguments(testlib
        "HIDDEN"
        "VERSION"
-        "SOURCES;LINKS;DEPENDS;INCLUDES;DEFINITIONS"
+        "SOURCES;LINKS;DEPENDS;INCLUDES"
        ${ARGN}
    )

@@ -151,9 +133,6 @@ function(add_testlib libname)
    if(testlib_VERSION)
        set_target_properties(${target} PROPERTIES VERSION ${testlib_VERSION})
    endif()
-    if(testlib_DEFINITIONS)
-        target_compile_definitions(${target} PUBLIC ${testlib_DEFINITIONS})
-    endif()

    list(APPEND ALL_TEST_TARGETS ${target})
    set(ALL_TEST_TARGETS ${ALL_TEST_TARGETS} PARENT_SCOPE)
--- a/cmake/cotire.cmake
+++ b/cmake/cotire.cmake
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -4,37 +4,7 @@

 ## 3.1 Device Configuration

-Device Configuration is stored in configuration object - `fair::mq::ProgOptions`. It is accessible by the device, plugins or from DeviceRunner/main:
-
-Plugins <---read/write---> ProgOptions <---read/write---> Device
-
-Whenever a configuration property is set, it is set in ProgOptions. Device/Channels/User code read this value and apply it as necessary at different stages:
- - apply it immidiately
- - apply it in device/channels during InitializingDevice/Binding/Connecting states
-
-Here is an overview of the device/channel options and when they are applied:
-
-| Property | Applied in |
-| --- | --- |
-| `severity` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `file-severity` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `verbosity` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `color` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `log-to-file` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<runFairMQDevice.h>`)) |
-| `id` | at the end of `fair::mq::State::InitializingDevice` |
-| `io-threads` | at the end of `fair::mq::State::InitializingDevice` |
-| `transport` | at the end of `fair::mq::State::InitializingDevice` |
-| `network-interface` | at the end of `fair::mq::State::InitializingDevice` |
-| `init-timeout` | at the end of `fair::mq::State::InitializingDevice` |
-| `max-run-time` | at the end of `fair::mq::State::InitializingDevice` |
-| `shm-segment-size` | at the end of `fair::mq::State::InitializingDevice` |
-| `shm-monitor` | at the end of `fair::mq::State::InitializingDevice` |
-| `ofi-size-hint` | at the end of `fair::mq::State::InitializingDevice` |
-| `rate` | at the end of `fair::mq::State::InitializingDevice` |
-| `session` | at the end of `fair::mq::State::InitializingDevice` |
-| `chan.*` | at the end of `fair::mq::State::InitializingDevice` (channel addresses can be also applied during `fair::mq::State::Binding`/`fair::mq::State::Connecting`) |
-
-## 3.2 Configuration options
+Devices receive configuration primarily via provided command line options (that can be extended per device).

 ## 3.2 Communication Channels Configuration

@@ -62,14 +32,6 @@ This parser reads channel configuration from a JSON file. Example:
                                "address": "tcp://*:5555",
                                "sndBufSize": 1000,
                                "rcvBufSize": 1000,
-                                "sndKernelSize" : 0,
-                                "rcvKernelSize" : 0,
-                                "transport": "shmem",
-                                "linger": "500",
-                                "portRangeMin": "22000",
-                                "portRangeMax": "23000",
-                                "autoBind": false,
-                                "numSockets": 0,
                                "rateLogging": 1
                            }
                        ]
@@ -86,7 +48,9 @@ This parser reads channel configuration from a JSON file. Example:
                                "type": "pull",
                                "method": "connect",
                                "address": "tcp://localhost:5555",
-                                "transport": "shmem"
+                                "sndBufSize": 1000,
+                                "rcvBufSize": 1000,
+                                "rateLogging": 1
                            }
                        ]
                    }
--- a/docs/Device.md
+++ b/docs/Device.md
@@ -24,22 +24,21 @@ FairMQ devices communicate via the communication patterns offered by ZeroMQ (or

 Each FairMQ device has an internal state machine:

-![FairMQ state machine](images/device_states.svg "FairMQ state machine")
+![FairMQ state machine](images/device_states.png?raw=true "FairMQ state machine")

 The state machine can be querried and controlled via `GetCurrentStateName()` and `ChangeState("<state name>")` methods. Only legal state transitions are allowed (see image above). Illegal transitions will fail with an error.

 If the device is running in interactive mode (default), states can be changed via keyboard input:

 - `'h'` - help
+ - `'p'` - pause
 - `'r'` - run
 - `'s'` - stop
 - `'t'` - reset task
 - `'d'` - reset device
 - `'q'` - end
 - `'j'` - init task
- - `'i'` - initialize
- - `'b'` - bind
- - `'x'` - connect
+ - `'i'` - init device

 Without the interactive mode, for example for a run in background, two other control mechanisms are available:

@@ -48,6 +47,6 @@ Without the interactive mode, for example for a run in background, two other con

 ## 1.4 Multiple devices in the same process

-Technically one can create two or more devices within the same process without any conflicts. However the configuration (fair::mq::ProgOptions) currently assumes the supplied configuration values are for one device/process.
+Technically one can create two or more devices within the same process without any conflicts. However the configuration (FairMQProgOptions) currently assumes the supplied configuration values are for one device/process.

 ← [Back](../README.md)
--- a/docs/Plugins.md
+++ b/docs/Plugins.md
@@ -1,93 +0,0 @@
-← [Back](../README.md)
-
-# 7. Plugins
-
-FairMQ devices can be integrated with external configuration and control systems through its plugin system. FairMQ plugins are special dynamic libraries that can be loaded at runtime. Plugins have access to the Plugin API which includes the capability to control/monitor the device [state machine](Device.md#13-state-machine) and change/monitor configuration properties.
-
-A simple plugin may add the feature to read configuration from a certain desired file format once at the start of a device. A more complex plugin may create a long-running thread that integrates a network client to an external API of a central experiment control system.
-
-Because plugins are loaded dynamically, they can be developed in separate repositories/projects and also have their own set of runtime dependency that are not needed to be known at compile-time of the FairMQ device.
-
-## 7.1 Usage
-
-To load a plugin pass the `-P <name>[,<name>]` (or long `--plugin`) command line option. Multiple plugins can be loaded at the same time. The load order is as specified at the command line. This determines the order in which the plugins are instantiated (ctor call order) and in which order they are notified, should they subscribe to any notifications.
-
-When passing `-h/--help` on the command line one can find more detailed information:
-
-```
-Plugin Manager:
-  -S [ --plugin-search-path ] arg       List of plugin search paths.
-                                        * Override default search path, e.g.
-                                          -S /home/user/lib /lib
-                                        * Append(>) or prepend(<) to default
-                                        search path, e.g.
-                                          -S >/lib </home/user/lib
-                                        * If you mix the overriding and
-                                        appending/prepending syntaxes, the
-                                        overriding paths act as default search
-                                        path, e.g.
-                                          -S /usr/lib >/lib </home/user/lib
-                                        /usr/local/lib results in
-                                        /home/user/lib,/usr/local/lib,/usr/lib/
-                                        ,/lib
-                                        If nothing is found, the default
-                                        dynamic library lookup is performed,
-                                        see man ld.so(8) for details.
-  -P [ --plugin ] arg                   List of plugin names to load in
-                                        order,e.g. if the file is called
-                                        'libFairMQPlugin_example.so', just list
-                                        'example' or 'd:example' here.To load a
-                                        prelinked plugin, list 'p:example'
-                                        here.
-```
-
-## 7.2 Development
-
-To develop a custom FairMQ plugin, one simply needs to inherit from the `fair::mq::Plugin` base class (`#include <fairmq/Plugin.h>`) and call the `REGISTER_FAIRMQ_PLUGIN` macro. It is possible to introduce new command line option together with a plugin.
-
-The Plugin API includes:
-  * `Take/Steal/ReleaseDeviceControl()`/`GetCurrent/ChangeDeviceState()`/`SubscribeTo/UnsubscribeFromDeviceStateChange()` APIs enable controlling the device state machine. Only one plugin is authorized to control at the same time. Which one is determined by which plugin calls `TakeDeviceControl()` first.
-  * `Set/GetProperty()`/`GetPropertyKeys()`/`SubscribeTo/UnsubscribeFromPropertyChange()` APIs enable configuration of device properties.
-See [`<fairmq/Plugin.h>`](/fairmq/Plugin.h) for the full API.
-
-A more complete example which may serve as a start including example CMake code can be found here: [FairRootGroup/FairMQPlugin_example](https://github.com/FairRootGroup/FairMQPlugin_example).
-
-## 7.3 Provided Plugins
-
-### 7.3.1 DDS
-
-When launching a FairMQ topology via [DDS](http://dds.gsi.de/) the DDS plugin enables FairMQ devices to interact with DDS' custom command and property subsystems - enable the plugin by passing `-P dds` on the command line.
-
-Via the property subsystem a FairMQ topology may exchange channel connection data (essentially to do service discovery) needed to connect/bind all FairMQ channels appropriately. DDS is highly optimized for this use case. See [examples/dds](examples/dds/README.md) for more details.
-
-Via the custom command subsystem a FairMQ device can receive a number of commands. FairMQ provides a convenient command line tool `fairmq-dds-command-ui` that allows interactive or scripted control of a running FairMQ topology managed via DDS. If one develops directly against the custom command DDS API, the following table lists all the commands the DDS plugin currently understands:
-
-| Custom Command | Response | Error | Description |
-| --- | --- | --- | --- |
-| `check-state` | `<ID>: <STATE> (pid: <PID>)` | n/a | Query current device state, see state machine for possible states |
-| `dump-config` | `(<ID>: <PKEY> -> <PVALUE>\n)+` | n/a | Query current device config (list property key/value pairs) |
-| `INIT DEVICE` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `BIND` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `CONNECT` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `INIT TASK` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `RUN` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `STOP` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `RESET TASK` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `RESET DEVICE` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `END` | `<ID>: queued <CMD> transition` | `<ID>: could not queue <CMD> transition` | Initiate state transition |
-| `subscribe-to-heartbeats` | `heartbeat-subscription: <ID>,OK` | n/a | Subscribe to heartbeats |
-| on heartbeat subscription | `heartbeat: <ID>,<PID>` | n/a | Heartbeat every 100ms |
-| `unsubscribe-from-heartbeats` | `heartbeat-unsubscription: <ID>,OK` | n/a | Unsubscribe from heartbeats |
-| `subscribe-to-state-changes` | `state-changes-subscription: <ID>,OK` | n/a | Subscribe to state changes |
-| on state changes subscription | `state-change: <ID>,<STATE>` | n/a | State change notification |
-| `unsubscribe-from-state-changes` | `state-changes-unsubscription: <ID>,OK` | n/a | Unsubscribe from state changes |
-
-If unknown commands are received the plugin will print a warning.
-
-### 7.3.2 PMIx
-
-The [PMIx](https://pmix.org/) plugin enables launching a FairMQ topology with any PMIx capable launcher, e.g. the [Open Run-Time Environment (ORTE) of OpenMPI](https://www.open-mpi.org/doc/v4.0/man1/mpirun.1.php) or the [Slurm workload manager](https://slurm.schedmd.com/srun.html). This plugin is not (yet) very mature and serves as a proof of concept at the moment.
-
-TODO example usage
-
-← [Back](../README.md)
--- a/docs/images/device_states.png
+++ b/docs/images/device_states.png
--- a/docs/images/device_states.svg
+++ b/docs/images/device_states.svg
--- a/examples/1-1/CMakeLists.txt
+++ b/examples/1-1/CMakeLists.txt
@@ -31,16 +31,16 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-1-1.sh.in ${CMAKE_CUR

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-ex-1-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-1.sh)

-add_test(NAME Example.1-1.zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-1.sh zeromq)
-set_tests_properties(Example.1-1.zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")
+add_test(NAME Example-1-1-zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-1.sh zeromq)
+set_tests_properties(Example-1-1-zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")

 if(BUILD_NANOMSG_TRANSPORT)
-  add_test(NAME Example.1-1.nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-1.sh nanomsg)
-  set_tests_properties(Example.1-1.nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")
+  add_test(NAME Example-1-1-nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-1.sh nanomsg)
+  set_tests_properties(Example-1-1-nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")
 endif()

-add_test(NAME Example.1-1.shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-1.sh shmem)
-set_tests_properties(Example.1-1.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")
+add_test(NAME Example-1-1-shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-1.sh shmem)
+set_tests_properties(Example-1-1-shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")

 # install

--- a/examples/1-1/Sampler.cxx
+++ b/examples/1-1/Sampler.cxx
@@ -1,10 +1,16 @@
 /********************************************************************************
- * Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
 *                                                                              *
 *              This software is distributed under the terms of the             *
 *              GNU Lesser General Public Licence (LGPL) version 3,             *
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
+/**
+ * Sampler.cpp
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */

 #include <thread> // this_thread::sleep_for
 #include <chrono>
@@ -26,8 +32,8 @@ Sampler::Sampler()
 void Sampler::InitTask()
 {
    // Get the fText and fMaxIterations values from the command line options (via fConfig)
-    fText = fConfig->GetProperty<string>("text");
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fText = fConfig->GetValue<string>("text");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler::ConditionalRun()
@@ -58,6 +64,8 @@ bool Sampler::ConditionalRun()
        return false;
    }

+    this_thread::sleep_for(chrono::seconds(1));
+
    return true;
 }

--- a/examples/1-1/Sink.cxx
+++ b/examples/1-1/Sink.cxx
@@ -30,7 +30,7 @@ Sink::Sink()
 void Sink::InitTask()
 {
    // Get the fMaxIterations value from the command line options (via fConfig)
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 // handler is called whenever a message arrives on "data", with a reference to the message and a sub-channel index (here 0)
--- a/examples/1-1/fairmq-start-ex-1-1.sh.in
+++ b/examples/1-1/fairmq-start-ex-1-1.sh.in
@@ -4,7 +4,6 @@ export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@

 SAMPLER="fairmq-ex-1-1-sampler"
 SAMPLER+=" --id sampler1"
-SAMPLER+=" --rate 1"
 SAMPLER+=" --channel-config name=data,type=push,method=bind,address=tcp://*:5555,rateLogging=0"
 xterm -geometry 80x23+0+0 -hold -e @EX_BIN_DIR@/$SAMPLER &

--- a/examples/1-1/runSampler.cxx
+++ b/examples/1-1/runSampler.cxx
@@ -18,7 +18,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_1::Sampler();
 }
--- a/examples/1-1/runSink.cxx
+++ b/examples/1-1/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_1::Sink();
 }
--- a/examples/1-1/test-ex-1-1.sh.in
+++ b/examples/1-1/test-ex-1-1.sh.in
@@ -8,17 +8,13 @@ if [[ $1 =~ ^[a-z]+$ ]]; then
    transport=$1
 fi

-SESSION="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"
-
 # setup a trap to kill everything if the test fails/timeouts
 trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SINK_PID;' TERM

 SAMPLER="fairmq-ex-1-1-sampler"
 SAMPLER+=" --id sampler1"
-SAMPLER+=" --rate 1"
 SAMPLER+=" --transport $transport"
 SAMPLER+=" --verbosity veryhigh"
-SAMPLER+=" --session $SESSION"
 SAMPLER+=" --control static --color false"
 SAMPLER+=" --max-iterations 1"
 SAMPLER+=" --channel-config name=data,type=push,method=bind,address=tcp://*:5555,rateLogging=0"
@@ -29,7 +25,6 @@ SINK="fairmq-ex-1-1-sink"
 SINK+=" --id sink1"
 SINK+=" --transport $transport"
 SINK+=" --verbosity veryhigh"
-SINK+=" --session $SESSION"
 SINK+=" --control static --color false"
 SINK+=" --max-iterations 1"
 SINK+=" --channel-config name=data,type=pull,method=connect,address=tcp://localhost:5555,rateLogging=0"
--- a/examples/1-n-1/CMakeLists.txt
+++ b/examples/1-n-1/CMakeLists.txt
@@ -39,16 +39,16 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-1-n-1.json ${CMAKE_CURRENT_BINARY_

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-ex-1-n-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-n-1.sh)

-add_test(NAME Example.1-n-1.zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-n-1.sh zeromq)
-set_tests_properties(Example.1-n-1.zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")
+add_test(NAME Example-1-n-1-zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-n-1.sh zeromq)
+set_tests_properties(Example-1-n-1-zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")

 if(BUILD_NANOMSG_TRANSPORT)
-  add_test(NAME Example.1-n-1.nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-n-1.sh nanomsg)
-  set_tests_properties(Example.1-n-1.nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")
+  add_test(NAME Example-1-n-1-nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-n-1.sh nanomsg)
+  set_tests_properties(Example-1-n-1-nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")
 endif()

-add_test(NAME Example.1-n-1.shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-n-1.sh shmem)
-set_tests_properties(Example.1-n-1.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")
+add_test(NAME Example-1-n-1-shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-1-n-1.sh shmem)
+set_tests_properties(Example-1-n-1-shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received: ")

 # install

--- a/examples/1-n-1/Sampler.cxx
+++ b/examples/1-n-1/Sampler.cxx
@@ -32,8 +32,8 @@ Sampler::Sampler()
 void Sampler::InitTask()
 {
    // Get the fText and fMaxIterations values from the command line options (via fConfig)
-    fText = fConfig->GetProperty<string>("text");
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fText = fConfig->GetValue<string>("text");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler::ConditionalRun()
--- a/examples/1-n-1/Sink.cxx
+++ b/examples/1-n-1/Sink.cxx
@@ -30,7 +30,7 @@ Sink::Sink()
 void Sink::InitTask()
 {
    // Get the fMaxIterations value from the command line options (via fConfig)
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 // handler is called whenever a message arrives on "data2", with a reference to the message and a sub-channel index (here 0)
--- a/examples/1-n-1/runProcessor.cxx
+++ b/examples/1-n-1/runProcessor.cxx
@@ -15,7 +15,7 @@ void addCustomOptions(bpo::options_description& /*options*/)
 {
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_n_1::Processor();
 }
--- a/examples/1-n-1/runSampler.cxx
+++ b/examples/1-n-1/runSampler.cxx
@@ -18,7 +18,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_n_1::Sampler();
 }
--- a/examples/1-n-1/runSink.cxx
+++ b/examples/1-n-1/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_1_n_1::Sink();
 }
--- a/examples/1-n-1/test-ex-1-n-1.sh.in
+++ b/examples/1-n-1/test-ex-1-n-1.sh.in
@@ -9,7 +9,6 @@ if [[ $1 =~ ^[a-z]+$ ]]; then
 fi

 ex2config="@CMAKE_CURRENT_BINARY_DIR@/ex-1-n-1.json"
-SESSION="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"

 # setup a trap to kill everything if the test fails/timeouts
 trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; kill -TERM $PROCESSOR1_PID; kill -TERM $PROCESSOR2_PID; wait $SAMPLER_PID; wait $SINK_PID; wait $PROCESSOR1_PID; wait $PROCESSOR2_PID;' TERM
@@ -18,7 +17,6 @@ SAMPLER="fairmq-ex-1-n-1-sampler"
 SAMPLER+=" --id sampler1"
 SAMPLER+=" --transport $transport"
 SAMPLER+=" --verbosity veryhigh"
-SAMPLER+=" --session $SESSION"
 SAMPLER+=" --control static --color false"
 SAMPLER+=" --max-iterations 2"
 SAMPLER+=" --mq-config $ex2config"
@@ -29,7 +27,6 @@ PROCESSOR1="fairmq-ex-1-n-1-processor"
 PROCESSOR1+=" --id processor1"
 PROCESSOR1+=" --transport $transport"
 PROCESSOR1+=" --verbosity veryhigh"
-PROCESSOR1+=" --session $SESSION"
 PROCESSOR1+=" --control static --color false"
 PROCESSOR1+=" --mq-config $ex2config"
 PROCESSOR1+=" --config-key processor"
@@ -40,7 +37,6 @@ PROCESSOR2="fairmq-ex-1-n-1-processor"
 PROCESSOR2+=" --id processor2"
 PROCESSOR2+=" --transport $transport"
 PROCESSOR2+=" --verbosity veryhigh"
-PROCESSOR2+=" --session $SESSION"
 PROCESSOR2+=" --control static --color false"
 PROCESSOR2+=" --mq-config $ex2config"
 PROCESSOR2+=" --config-key processor"
@@ -51,7 +47,6 @@ SINK="fairmq-ex-1-n-1-sink"
 SINK+=" --id sink1"
 SINK+=" --transport $transport"
 SINK+=" --verbosity veryhigh"
-SINK+=" --session $SESSION"
 SINK+=" --control static --color false"
 SINK+=" --max-iterations 2"
 SINK+=" --mq-config $ex2config"
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -8,7 +8,6 @@

 add_subdirectory(1-1)
 add_subdirectory(1-n-1)
-add_subdirectory(builtin-devices)
 add_subdirectory(copypush)
 add_subdirectory(dds)
 add_subdirectory(multipart)
@@ -16,6 +15,5 @@ add_subdirectory(multiple-channels)
 if(BUILD_NANOMSG_TRANSPORT)
  add_subdirectory(multiple-transports)
 endif()
-add_subdirectory(readout)
 add_subdirectory(region)
 add_subdirectory(req-rep)
--- a/examples/builtin-devices/CMakeLists.txt
+++ b/examples/builtin-devices/CMakeLists.txt
@@ -1,50 +0,0 @@
- ################################################################################
- #    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
- #                                                                              #
- #              This software is distributed under the terms of the             #
- #              GNU Lesser General Public Licence (LGPL) version 3,             #
- #                  copied verbatim in the file "LICENSE"                       #
- ################################################################################
-
-set(EX_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
-set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-builtin-devices.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-builtin-devices.sh)
-
-# test
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-ex-builtin-devices.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test-ex-builtin-devices.sh)
-
-add_test(NAME Example.BuiltinDevices.zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-builtin-devices.sh zeromq)
-set_tests_properties(Example.BuiltinDevices.zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Configured maximum number of iterations reached")
-
-if(BUILD_NANOMSG_TRANSPORT)
-  add_test(NAME Example.BuiltinDevices.nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-builtin-devices.sh nanomsg)
-  set_tests_properties(Example.BuiltinDevices.nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Configured maximum number of iterations reached")
-endif()
-
-add_test(NAME Example.BuiltinDevices.shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-builtin-devices.sh shmem)
-set_tests_properties(Example.BuiltinDevices.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Configured maximum number of iterations reached")
-
-add_test(NAME Example.BuiltinDevices.multipart.zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-builtin-devices.sh zeromq true 2)
-set_tests_properties(Example.BuiltinDevices.multipart.zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Configured maximum number of iterations reached")
-
-if(BUILD_NANOMSG_TRANSPORT)
-  add_test(NAME Example.BuiltinDevices.multipart.nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-builtin-devices.sh nanomsg true 2)
-  set_tests_properties(Example.BuiltinDevices.multipart.nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Configured maximum number of iterations reached")
-endif()
-
-add_test(NAME Example.BuiltinDevices.multipart.shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-builtin-devices.sh shmem true 2)
-set_tests_properties(Example.BuiltinDevices.multipart.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Configured maximum number of iterations reached")
-
-# install
-
-# configure run script with different executable paths for build and for install directories
-set(EX_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
-set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-builtin-devices.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-builtin-devices.sh_install)
-
-install(
-    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-builtin-devices.sh_install
-    DESTINATION ${PROJECT_INSTALL_BINDIR}
-    RENAME fairmq-start-ex-builtin-devices.sh
-)
--- a/examples/builtin-devices/README.md
+++ b/examples/builtin-devices/README.md
@@ -1,4 +0,0 @@
-Built-in devices
-==========================
-
-This example demonstrates use of generic devices that are provided with FairMQ - BenchmarkSampler, Merger, Multiplier, Proxy, Sink, Splitter. They are all connected in one topology and transfer some dummy buffers generated by the BenchmarkSampler.
--- a/examples/builtin-devices/fairmq-start-ex-builtin-devices.sh.in
+++ b/examples/builtin-devices/fairmq-start-ex-builtin-devices.sh.in
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@
-
-transport="zeromq"
-multipart="false"
-numParts="1"
-
-if [[ $1 =~ ^[a-z]+$ ]]; then
-    transport=$1
-fi
-
-if [[ $2 =~ ^[a-z]+$ ]]; then
-    multipart=$2
-fi
-
-if [[ $3 =~ ^[0-9]+$ ]]; then
-    numParts=$3
-fi
-
-SAMPLER="fairmq-bsampler"
-SAMPLER+=" --id bsampler1"
-SAMPLER+=" --transport $transport"
-SAMPLER+=" --control interactive"
-SAMPLER+=" --severity debug"
-SAMPLER+=" --msg-size 100000"
-SAMPLER+=" --multipart $multipart"
-SAMPLER+=" --num-parts $numParts"
-SAMPLER+=" --msg-rate 100"
-SAMPLER+=" --max-iterations 0"
-SAMPLER+=" --out-channel data1"
-SAMPLER+=" --channel-config name=data1,type=push,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5555"
-xterm -geometry 90x20+0+175 -hold -e @FAIRMQ_BIN_DIR@/$SAMPLER &
-
-SPLITTER="fairmq-splitter"
-SPLITTER+=" --id splitter"
-SPLITTER+=" --transport $transport"
-SPLITTER+=" --multipart $multipart"
-SPLITTER+=" --in-channel data1"
-SPLITTER+=" --out-channel data2"
-SPLITTER+=" --channel-config name=data1,type=pull,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5555"
-SPLITTER+="                  name=data2,type=push,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5556,address=tcp://localhost:5557"
-xterm -geometry 90x20+0+475 -hold -e @FAIRMQ_BIN_DIR@/$SPLITTER &
-
-PROXY1="fairmq-proxy"
-PROXY1+=" --id proxy1"
-PROXY1+=" --transport $transport"
-PROXY1+=" --multipart $multipart"
-PROXY1+=" --in-channel data2"
-PROXY1+=" --out-channel data3"
-PROXY1+=" --channel-config name=data2,type=pull,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5556"
-PROXY1+="                  name=data3,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5558"
-xterm -geometry 90x20+550+175 -hold -e @FAIRMQ_BIN_DIR@/$PROXY1 &
-
-PROXY2="fairmq-proxy"
-PROXY2+=" --id proxy2"
-PROXY2+=" --transport $transport"
-PROXY2+=" --multipart $multipart"
-PROXY2+=" --in-channel data2"
-PROXY2+=" --out-channel data3"
-PROXY2+=" --channel-config name=data2,type=pull,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5557"
-PROXY2+="                  name=data3,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5559"
-xterm -geometry 90x20+550+475 -hold -e @FAIRMQ_BIN_DIR@/$PROXY2 &
-
-MERGER="fairmq-merger"
-MERGER+=" --id merger"
-MERGER+=" --transport $transport"
-MERGER+=" --multipart $multipart"
-MERGER+=" --in-channel data3"
-MERGER+=" --out-channel data4"
-MERGER+=" --channel-config name=data3,type=pull,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5558,address=tcp://localhost:5559"
-MERGER+="                  name=data4,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5560"
-xterm -geometry 90x20+1100+50 -hold -e @FAIRMQ_BIN_DIR@/$MERGER &
-
-MULTIPLIER="fairmq-multiplier"
-MULTIPLIER+=" --id multiplier"
-MULTIPLIER+=" --transport $transport"
-MULTIPLIER+=" --multipart $multipart"
-MULTIPLIER+=" --in-channel data4"
-MULTIPLIER+=" --out-channel data5"
-MULTIPLIER+=" --channel-config name=data4,type=pull,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5560"
-MULTIPLIER+="                  name=data5,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5561,address=tcp://localhost:5561"
-xterm -geometry 90x20+1100+350 -hold -e @FAIRMQ_BIN_DIR@/$MULTIPLIER &
-
-SINK="fairmq-sink"
-SINK+=" --id sink1"
-SINK+=" --transport $transport"
-SINK+=" --severity debug"
-SINK+=" --multipart $multipart"
-SINK+=" --max-iterations 0"
-SINK+=" --in-channel data5"
-SINK+=" --channel-config name=data5,type=pull,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5561"
-xterm -geometry 90x20+1100+650 -hold -e @FAIRMQ_BIN_DIR@/$SINK &
--- a/examples/builtin-devices/test-ex-builtin-devices.sh.in
+++ b/examples/builtin-devices/test-ex-builtin-devices.sh.in
@@ -1,148 +0,0 @@
-#!/bin/bash
-
-export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@
-
-SESSION="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"
-
-transport="zeromq"
-multipart="false"
-numParts="1"
-
-if [[ $1 =~ ^[a-z]+$ ]]; then
-    transport=$1
-fi
-
-if [[ $2 =~ ^[a-z]+$ ]]; then
-    multipart=$2
-fi
-
-if [[ $3 =~ ^[0-9]+$ ]]; then
-    numParts=$3
-fi
-
-# setup a trap to kill everything if the test fails/timeouts
-trap 'kill -TERM $SAMPLER_PID; kill -TERM $SPLITTER_PID; kill -TERM $PROXY1_PID; kill -TERM $PROXY2_PID; kill -TERM $MERGER_PID; kill -TERM $MULTIPLIER_PID; kill -TERM $SINK_PID;' TERM
-
-SAMPLER="fairmq-bsampler"
-SAMPLER+=" --id bsampler1"
-SAMPLER+=" --session $SESSION"
-SAMPLER+=" --transport $transport"
-SAMPLER+=" --color false"
-SAMPLER+=" --control static"
-SAMPLER+=" --verbosity veryhigh"
-SAMPLER+=" --severity debug"
-SAMPLER+=" --msg-size 100000"
-SAMPLER+=" --multipart $multipart"
-SAMPLER+=" --num-parts $numParts"
-SAMPLER+=" --msg-rate 1"
-SAMPLER+=" --max-iterations 0"
-SAMPLER+=" --out-channel data1"
-SAMPLER+=" --channel-config name=data1,type=push,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5555"
-@FAIRMQ_BIN_DIR@/$SAMPLER &
-SAMPLER_PID=$!
-
-SPLITTER="fairmq-splitter"
-SPLITTER+=" --id splitter"
-SPLITTER+=" --session $SESSION"
-SPLITTER+=" --transport $transport"
-SPLITTER+=" --color false"
-SPLITTER+=" --control static"
-SPLITTER+=" --verbosity veryhigh"
-SPLITTER+=" --multipart $multipart"
-SPLITTER+=" --in-channel data1"
-SPLITTER+=" --out-channel data2"
-SPLITTER+=" --channel-config name=data1,type=pull,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5555"
-SPLITTER+="                  name=data2,type=push,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5556,address=tcp://localhost:5557"
-@FAIRMQ_BIN_DIR@/$SPLITTER &
-SPLITTER_PID=$!
-
-PROXY1="fairmq-proxy"
-PROXY1+=" --id proxy1"
-PROXY1+=" --session $SESSION"
-PROXY1+=" --transport $transport"
-PROXY1+=" --color false"
-PROXY1+=" --control static"
-PROXY1+=" --verbosity veryhigh"
-PROXY1+=" --multipart $multipart"
-PROXY1+=" --in-channel data2"
-PROXY1+=" --out-channel data3"
-PROXY1+=" --channel-config name=data2,type=pull,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5556"
-PROXY1+="                  name=data3,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5558"
-@FAIRMQ_BIN_DIR@/$PROXY1 &
-PROXY1_PID=$!
-
-PROXY2="fairmq-proxy"
-PROXY2+=" --id proxy2"
-PROXY2+=" --session $SESSION"
-PROXY2+=" --transport $transport"
-PROXY2+=" --color false"
-PROXY2+=" --control static"
-PROXY2+=" --verbosity veryhigh"
-PROXY2+=" --multipart $multipart"
-PROXY2+=" --in-channel data2"
-PROXY2+=" --out-channel data3"
-PROXY2+=" --channel-config name=data2,type=pull,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5557"
-PROXY2+="                  name=data3,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5559"
-@FAIRMQ_BIN_DIR@/$PROXY2 &
-PROXY2_PID=$!
-
-MERGER="fairmq-merger"
-MERGER+=" --id merger"
-MERGER+=" --session $SESSION"
-MERGER+=" --transport $transport"
-MERGER+=" --color false"
-MERGER+=" --control static"
-MERGER+=" --verbosity veryhigh"
-MERGER+=" --multipart $multipart"
-MERGER+=" --in-channel data3"
-MERGER+=" --out-channel data4"
-MERGER+=" --channel-config name=data3,type=pull,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5558,address=tcp://localhost:5559"
-MERGER+="                  name=data4,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5560"
-@FAIRMQ_BIN_DIR@/$MERGER &
-MERGER_PID=$!
-
-MULTIPLIER="fairmq-multiplier"
-MULTIPLIER+=" --id multiplier"
-MULTIPLIER+=" --session $SESSION"
-MULTIPLIER+=" --transport $transport"
-MULTIPLIER+=" --color false"
-MULTIPLIER+=" --control static"
-MULTIPLIER+=" --verbosity veryhigh"
-MULTIPLIER+=" --multipart $multipart"
-MULTIPLIER+=" --in-channel data4"
-MULTIPLIER+=" --out-channel data5"
-MULTIPLIER+=" --channel-config name=data4,type=pull,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5560"
-MULTIPLIER+="                  name=data5,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5561,address=tcp://localhost:5561"
-@FAIRMQ_BIN_DIR@/$MULTIPLIER &
-MULTIPLIER_PID=$!
-
-SINK="fairmq-sink"
-SINK+=" --id sink1"
-SINK+=" --session $SESSION"
-SINK+=" --transport $transport"
-SINK+=" --color false"
-SINK+=" --control static"
-SINK+=" --verbosity veryhigh"
-SINK+=" --severity debug"
-SINK+=" --multipart $multipart"
-SINK+=" --max-iterations 2"
-SINK+=" --in-channel data5"
-SINK+=" --channel-config name=data5,type=pull,method=bind,sndBufSize=50,rcvBufSize=50,address=tcp://localhost:5561"
-@FAIRMQ_BIN_DIR@/$SINK &
-SINK_PID=$!
-
-wait $SINK_PID
-
-kill -SIGINT $SAMPLER_PID
-kill -SIGINT $SPLITTER_PID
-kill -SIGINT $PROXY1_PID
-kill -SIGINT $PROXY2_PID
-kill -SIGINT $MERGER_PID
-kill -SIGINT $MULTIPLIER_PID
-
-wait $SAMPLER_PID
-wait $SPLITTER_PID
-wait $PROXY1_PID
-wait $PROXY2_PID
-wait $MERGER_PID
-wait $MULTIPLIER_PID
--- a/examples/copypush/CMakeLists.txt
+++ b/examples/copypush/CMakeLists.txt
@@ -32,16 +32,16 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-copypush.sh.in ${CMAK

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-ex-copypush.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test-ex-copypush.sh)

-add_test(NAME Example.CopyPush.zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-copypush.sh zeromq)
-set_tests_properties(Example.CopyPush.zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message: ")
+add_test(NAME Example-CopyPush-zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-copypush.sh zeromq)
+set_tests_properties(Example-CopyPush-zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message: ")

 if(BUILD_NANOMSG_TRANSPORT)
-  add_test(NAME Example.CopyPush.nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-copypush.sh nanomsg)
-  set_tests_properties(Example.CopyPush.nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message: ")
+  add_test(NAME Example-CopyPush-nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-copypush.sh nanomsg)
+  set_tests_properties(Example-CopyPush-nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message: ")
 endif()

-add_test(NAME Example.CopyPush.shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-copypush.sh shmem)
-set_tests_properties(Example.CopyPush.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message: ")
+add_test(NAME Example-CopyPush-shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-copypush.sh shmem)
+set_tests_properties(Example-CopyPush-shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message: ")

 # install

--- a/examples/copypush/Sampler.cxx
+++ b/examples/copypush/Sampler.cxx
@@ -33,11 +33,12 @@ Sampler::Sampler()
 void Sampler::InitTask()
 {
    fNumDataChannels = fChannels.at("data").size();
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler::ConditionalRun()
 {
+
    // NewSimpleMessage creates a copy of the data and takes care of its destruction (after the transfer takes place).
    // Should only be used for small data because of the cost of an additional copy
    FairMQMessagePtr msg(NewSimpleMessage(fCounter++));
--- a/examples/copypush/Sink.cxx
+++ b/examples/copypush/Sink.cxx
@@ -27,7 +27,7 @@ Sink::Sink()
 void Sink::InitTask()
 {
    // Get the fMaxIterations value from the command line options (via fConfig)
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sink::HandleData(FairMQMessagePtr& msg, int /*index*/)
--- a/examples/copypush/runSampler.cxx
+++ b/examples/copypush/runSampler.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_copypush::Sampler();
 }
--- a/examples/copypush/runSink.cxx
+++ b/examples/copypush/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_copypush::Sink();
 }
--- a/examples/copypush/test-ex-copypush.sh.in
+++ b/examples/copypush/test-ex-copypush.sh.in
@@ -8,8 +8,6 @@ if [[ $1 =~ ^[a-z]+$ ]]; then
    transport=$1
 fi

-SESSION="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"
-
 # setup a trap to kill everything if the test fails/timeouts
 trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK1_PID; kill -TERM $SINK2_PID; wait $SAMPLER_PID; wait $SINK1_PID; wait $SINK2_PID;' TERM

@@ -17,7 +15,6 @@ SAMPLER="fairmq-ex-copypush-sampler"
 SAMPLER+=" --id sampler1"
 SAMPLER+=" --transport $transport"
 SAMPLER+=" --verbosity veryhigh"
-SAMPLER+=" --session $SESSION"
 SAMPLER+=" --control static --color false"
 SAMPLER+=" --max-iterations 1"
 SAMPLER+=" --channel-config name=data,type=push,method=bind,rateLogging=0,address=tcp://*:5555,address=tcp://*:5556"
@@ -28,7 +25,6 @@ SINK1="fairmq-ex-copypush-sink"
 SINK1+=" --id sink1"
 SINK1+=" --transport $transport"
 SINK1+=" --verbosity veryhigh"
-SINK1+=" --session $SESSION"
 SINK1+=" --control static --color false"
 SINK1+=" --max-iterations 1"
 SINK1+=" --channel-config name=data,type=pull,method=connect,rateLogging=0,address=tcp://localhost:5555"
@@ -39,7 +35,6 @@ SINK2="fairmq-ex-copypush-sink"
 SINK2+=" --id sink2"
 SINK2+=" --transport $transport"
 SINK2+=" --verbosity veryhigh"
-SINK2+=" --session $SESSION"
 SINK2+=" --control static --color false"
 SINK2+=" --max-iterations 1"
 SINK2+=" --channel-config name=data,type=pull,method=connect,rateLogging=0,address=tcp://localhost:5556"
--- a/examples/dds/CMakeLists.txt
+++ b/examples/dds/CMakeLists.txt
@@ -1,5 +1,5 @@
 ################################################################################
-#  Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
+#    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -28,21 +28,14 @@ target_link_libraries(fairmq-ex-dds-sink PRIVATE ExampleDDSLib)

 add_custom_target(ExampleDDS DEPENDS fairmq-ex-dds-sampler fairmq-ex-dds-processor fairmq-ex-dds-sink)

-set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/plugins/DDS)
-set(DATA_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(EX_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(DDS_PLUGIN_LIB_DIR ${CMAKE_BINARY_DIR}/fairmq/plugins/DDS)
+set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology-infinite.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology-infinite.xml @ONLY)
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-hosts.cfg ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-hosts.cfg COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-dds-env.sh ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-dds-env.sh @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-dds.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh @ONLY)

 # test
-add_test(NAME Example.DDS.localhost COMMAND ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh localhost)
-set_tests_properties(Example.DDS.localhost PROPERTIES
-  TIMEOUT 15
-  RUN_SERIAL true
-  PASS_REGULAR_EXPRESSION "Example successful"
-)

 # install

@@ -57,12 +50,10 @@ install(
 )

 # configure run script with different executable paths for build and for install directories
-set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
-set(DATA_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_DATADIR})
+set(EX_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
+set(DDS_PLUGIN_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR})
+set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology-infinite.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology-infinite.xml_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-dds-env.sh ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-dds-env.sh_install @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-dds.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh_install @ONLY)

 install(
    FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml_install
@@ -70,25 +61,7 @@ install(
    RENAME ex-dds-topology.xml
 )

-install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology-infinite.xml_install
-    DESTINATION ${PROJECT_INSTALL_DATADIR}
-    RENAME ex-dds-topology-infinite.xml
-)
-
 install(
    FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-hosts.cfg
    DESTINATION ${PROJECT_INSTALL_DATADIR}
 )
-
-install(
-    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-dds-env.sh_install
-    DESTINATION ${PROJECT_INSTALL_BINDIR}
-    RENAME fairmq-ex-dds-env.sh
-)
-
-install(
-    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh_install
-    DESTINATION ${PROJECT_INSTALL_BINDIR}
-    RENAME fairmq-start-ex-dds.sh
-)
--- a/examples/dds/Processor.h
+++ b/examples/dds/Processor.h
@@ -1,8 +1,8 @@
 /********************************************************************************
 *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
 *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
+ *              This software is distributed under the terms of the             * 
+ *              GNU Lesser General Public Licence (LGPL) version 3,             *  
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/

--- a/examples/dds/README.md
+++ b/examples/dds/README.md
@@ -1,17 +1,23 @@
 DDS Example
 ===========

-This example demonstrates usage of the Dynamic Deployment System ([DDS](http://dds.gsi.de/)) to dynamically deploy and configure a topology of devices. The topology is similar to the one in Example 1-n-1, but now it can be easily distributed on different computing nodes without the need for manual addresses reconfiguration of the devices.
+This example demonstrates usage of the Dynamic Deployment System ([DDS](http://dds.gsi.de/)) to dynamically deploy and configure a topology of devices. The topology is similar to those of Example 2, but now it can be easily distributed on different computing nodes without the need for manual socket reconfiguration of the devices.
+
+To make use of DDS functionality the example executables need to find the DDS plugin libraries that are compiled with FairRoot when FairRoot find DDS installed. Custom DDS location can be given to CMake as follows:
+
+```bash
+cmake -DDDS_ROOT="/path/to/dds/install/dir/" ..
+```

 The description below outlines the minimal steps needed to run the example with DDS. For general DDS help please refer to DDS documentation on [DDS Website](http://dds.gsi.de/).

-##### 1. The device handles the channel addresses and ports configuration via DDS Plugin.
+##### 1. The device handles the socket addresses and ports configuration via DDS Plugin.

-It is sufficient to provide the `-S "<@FAIRMQ_INSTALL_DIR@/lib" -P dds` (`<` prepends the following path to the default plugin search paths; put in the path which points to the library dir of your FairRoot installation) command line arguments to let the devices be configured dynamically. No code changes in the device are necessary. See the XML topology file for example of using the command line arguments.
+It is sufficient to provide the `-S "<@FAIRROOT_INSTALL_DIR@/lib" -P dds` (`<` prepends the following path to the default plugin search paths; put in the path which points to the library dir of your FairRoot installation) command line arguments to let the devices be configured dynamically. No code changes in the device are necessary. See the XML topology file for example of using the command line arguments.

 ##### 2a. Write DDS hosts file that contains a list of worker nodes to run the topology on (When deploying using the SSH plug-in).

-We run this example on the local machine for simplicity. The file below defines 3 workers - sampler, processor and sink - with a total of 12 DDS agents (thus able to accept 12 tasks). The parameters for each worker node are:
+We run this example on the local machine for simplicity. The file below defines three workers, sampler, processor and sink, with a total of 12 DDS agents (thus able to accept 12 tasks). The parameters for each worker node are:
 - user-chosen worker ID (must be unique)
 - a host name with or without a login, in a form: login@host.fqdn (password-less SSH access to these hosts must be possible)
 - additional SSH params (can be empty)
@@ -34,31 +40,27 @@ If you want to deploy on a single host DDS 1.6+ provides a localhost rms plug-in

 ##### 3. Write DDS topology file that describes which tasks (processes) to run and their topology and configuration.

-Take a look at `ex-dds-topology.xml`. It consists of a definition part (properties, tasks, collections and more) and execution part (main). In our example Sampler, Processor and Sink tasks are defined, containing their executables and exchanged properties. The `<main>` of the topology uses the defined tasks. Besides one Sampler and one Sink task, a group containing Processor task is defined. The group has a multiplicity of 10, meaninig 10 Processors will be executed. Each of the Processors will receive the properties with Sampler and Sink addresses.
+Take a look at `ex-dds-topology.xml`. It consists of a definition part (properties, tasks, collections and more) and execution part (main). In our example Sampler, Processor and Sink tasks are defines, containing their executables and exchanged properties. The `<main>` of the topology uses the defined tasks. Besides one Sampler and one Sink task, a group containing Processor task is defined. The group has a multiplicity of 10, meaninig 10 Processors will be executed. Each of the Processors will receive the properties with Sampler and Sink addresses.

-The configuration of the channel connection addresses is done by the DDS plugin via the channel names. The task property names must correspond to the channel names (data1, data2), with binding channels writing the properties and connecting channel reading the properties.
+The configuration of the channel connection addresses is done by the DDS plugin via the channel names. The task property names must correspond to the channel names (data1, data2), with binding channels writing the properties and connecting channel reading the properties (see the example XML and JSON files).

-**If you chose step 2b earlier**, then modify the provided `ex-dds-topology.xml` in the top that the following lines read as following:
+If `eth0` network interface (default for binding) is not available on your system, specify another one in the topology file for each task. For example: `--network-interface lo0`.
+
+If you chose step 2b earlier, then modify the provided `ex-dds-topology.xml` in the top that the following lines read as following:
 ```xml
-<declrequirement name="SamplerWorker" type="wnname" value=".*"/>
-<declrequirement name="ProcessorWorker" type="wnname" value=".*"/>
-<declrequirement name="SinkWorker" type="wnname" value=".*"/>
+    <declrequirement id="SamplerWorker" type="wnname" value=".*"/>
+    <declrequirement id="ProcessorWorker" type="wnname" value=".*"/>
+    <declrequirement id="SinkWorker" type="wnname" value=".*"/>
 ```

 Note that the attributes `value` contain a different value.

-##### 4. Start DDS session.
+##### 4. Start DDS server.

-First you need to initialize DDS environment:
+The DDS server is started with:

 ```bash
-source DDS_env.sh  # this script is located in the DDS installation directory
-```
-
-The DDS session is started with:
-
-```bash
-dds-session start
+dds-server start -s
 ```

 ##### 5. Submit DDS Agents (configured in the hosts file).
@@ -69,7 +71,7 @@ dds-submit --rms ssh --config ex-dds-hosts.cfg
 ```
 The `--rms` option defines a destination resource management system. The `--config` specifies an SSH plug-in resource definition file.

-**If you chose step 2b earlier**, run the following command instead:
+If you chose step 2b earlier, run the following command instead:

 ```bash
 dds-submit --rms localhost -n 12
@@ -83,40 +85,23 @@ dds-topology --activate ex-dds-topology.xml

 ##### 7. Run

-After activation, agents will execute the defined tasks on the worker nodes. Output of the tasks will be stored in the directory that was specified in the hosts file (or in the system temporary directory when using the localhost plugin).
+After activation, agents will execute the defined tasks on the worker nodes. Output of the tasks will be stored in the directory that was specified in the hosts file.

 ##### 8. (optional) Use example command UI to check state of the devices

-A simple utility (fairmq-dds-command-ui) is included with FairMQ to send commands to devices and receive replies from them. The utility uses the DDS intercom library to query state/config of devices and allows changing their state. To let the device listen to the commands from the utility, start the device with `-S "<@FAIRMQ_INSTALL_DIR@/lib" -P dds` cmd option (see example XML topology).
+A simple utility (fairmq-dds-command-ui) is included with FairRoot to send commands to devices and receive replies from them. The utility uses the DDS intercom library to send "check-state" string to all devices, to which they reply with their ID and state they are in. The utility also allows requesting state changes from devices. To let the device listen to the commands from the utility, start the device with `-S "<@FAIRROOT_INSTALL_DIR@/lib" -P dds` cmd option (see example XML topology).

-To see it in action, start the fairmq-dds-command-ui while the topology is running. Run the utility with `-h` to see everything that it can do.
+To see it in action, start the fairmq-dds-command-ui while the topology is running.

-The utility requires a session parameter to connect to appropriate DDS session. The session value is given when starting dds-session.
-
-By default the command UI sends commands to all tasks. This can be further refined by giving a specific topology path via `-p` argument.
-Given our topology file, here are some examples of valid paths:
-```bash
-# get state of all devices
-./fairmq/plugins/DDS/fairmq-dds-command-ui -s 937ffbca-b524-44d8-9898-1d69aedc3751 -c c
-# get state of sampler
-./fairmq/plugins/DDS/fairmq-dds-command-ui -s 937ffbca-b524-44d8-9898-1d69aedc3751 -c c -p main/Sampler
-# get state of sink
-./fairmq/plugins/DDS/fairmq-dds-command-ui -s 937ffbca-b524-44d8-9898-1d69aedc3751 -c c -p main/Sink
-# get state all processors
-./fairmq/plugins/DDS/fairmq-dds-command-ui -s 937ffbca-b524-44d8-9898-1d69aedc3751 -c c -p main/ProcessorGroup/Processor
-# get state of a specific processor
-./fairmq/plugins/DDS/fairmq-dds-command-ui -s 937ffbca-b524-44d8-9898-1d69aedc3751 -c c -p main/ProcessorGroup/Processor_9
-```
-
-##### 9. Stop DDS session/topology.
+##### 9. Stop DDS server/topology.

 The execution of tasks can be stopped with:
 ```bash
 dds-topology --stop
 ```
-Or by stopping the DDS session:
+Or by stopping the DDS server:
 ```bash
-dds-session stop
+dds-server stop
 ```

 For general DDS documentation please refer to [DDS Website](http://dds.gsi.de/).
--- a/examples/dds/Sampler.cxx
+++ b/examples/dds/Sampler.cxx
@@ -1,8 +1,8 @@
 /********************************************************************************
 *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
 *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
+ *              This software is distributed under the terms of the             * 
+ *              GNU Lesser General Public Licence (LGPL) version 3,             *  
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
 /**
@@ -26,14 +26,10 @@ Sampler::Sampler()
 {
 }

-void Sampler::InitTask()
-{
-    fIterations = fConfig->GetValue<uint64_t>("iterations");
-    fCounter = 0;
-}
-
 bool Sampler::ConditionalRun()
 {
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+
    // NewSimpleMessage creates a copy of the data and takes care of its destruction (after the transfer takes place).
    // Should only be used for small data because of the cost of an additional copy
    FairMQMessagePtr msg(NewSimpleMessage("Data"));
@@ -42,18 +38,11 @@ bool Sampler::ConditionalRun()

    // in case of error or transfer interruption, return false to go to IDLE state
    // successfull transfer will return number of bytes transfered (can be 0 if sending an empty message).
-    if (Send(msg, "data1") < 0) {
+    if (Send(msg, "data1") < 0)
+    {
        return false;
    }

-    if (fIterations > 0) {
-        ++fCounter;
-        if (fCounter >= fIterations) {
-            LOG(info) << "Sent " << fCounter << " messages. Finished.";
-            return false;
-        }
-    }
-
    return true;
 }

--- a/examples/dds/Sampler.h
+++ b/examples/dds/Sampler.h
@@ -25,14 +25,9 @@ class Sampler : public FairMQDevice
  public:
    Sampler();
    virtual ~Sampler();
-    void InitTask() override;

  protected:
-    bool ConditionalRun() override;
-
-  private:
-    uint64_t fIterations;
-    uint64_t fCounter;
+    virtual bool ConditionalRun();
 };

 } // namespace example_dds
--- a/examples/dds/Sink.cxx
+++ b/examples/dds/Sink.cxx
@@ -1,8 +1,8 @@
 /********************************************************************************
 *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
 *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
+ *              This software is distributed under the terms of the             * 
+ *              GNU Lesser General Public Licence (LGPL) version 3,             *  
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
 /**
@@ -25,24 +25,11 @@ Sink::Sink()
    OnData("data2", &Sink::HandleData);
 }

-void Sink::InitTask()
-{
-    fIterations = fConfig->GetValue<uint64_t>("iterations");
-    fCounter = 0;
-}
-
 // handler is called whenever a message arrives on "data2", with a reference to the message and a sub-channel index (here 0)
 bool Sink::HandleData(FairMQMessagePtr& msg, int /*index*/)
 {
    LOG(info) << "Received: \"" << string(static_cast<char*>(msg->GetData()), msg->GetSize()) << "\"";

-    if (fIterations > 0) {
-        ++fCounter;
-        if (fCounter >= fIterations) {
-            LOG(info) << "Received " << fCounter << " messages. Finished.";
-            return false;
-        }
-    }
    // return true if want to be called again (otherwise go to IDLE state)
    return true;
 }
--- a/examples/dds/Sink.h
+++ b/examples/dds/Sink.h
@@ -25,14 +25,9 @@ class Sink : public FairMQDevice
  public:
    Sink();
    virtual ~Sink();
-    void InitTask() override;

  protected:
    bool HandleData(FairMQMessagePtr&, int);
-
-  private:
-    uint64_t fIterations;
-    uint64_t fCounter;
 };

 } // namespace example_dds
--- a/examples/dds/ex-dds-hosts.cfg
+++ b/examples/dds/ex-dds-hosts.cfg
@@ -1,3 +1,7 @@
-sampler, 127.0.0.1, , /tmp/fairmq-ex-dds, 1
-processor, 127.0.0.1, , /tmp/fairmq-ex-dds, 10
-sink, 127.0.0.1, , /tmp/fairmq-ex-dds, 1
+@bash_begin@
+# source setup.sh
+@bash_end@
+
+sampler, username@localhost, , /path/to/dds-work-dir/, 1
+processor, username@localhost, , /path/to/dds-work-dir/, 10
+sink, username@localhost, , /path/to/dds-work-dir/, 1
--- a/examples/dds/ex-dds-topology-infinite.xml
+++ b/examples/dds/ex-dds-topology-infinite.xml
@@ -1,52 +0,0 @@
-<topology name="ExampleDDS">
-
-    <property name="data1" />
-    <property name="data2" />
-
-    <declrequirement name="SamplerWorker" type="wnname" value="sampler"/>
-    <declrequirement name="ProcessorWorker" type="wnname" value="processor"/>
-    <declrequirement name="SinkWorker" type="wnname" value="sink"/>
-
-    <decltask name="Sampler">
-        <exe>fairmq-ex-dds-sampler --color false --channel-config name=data1,type=push,method=bind --rate 100 -P dds</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
-        <requirements>
-            <name>SamplerWorker</name>
-        </requirements>
-        <properties>
-            <name access="write">data1</name>
-        </properties>
-    </decltask>
-
-    <decltask name="Processor">
-        <exe>fairmq-ex-dds-processor --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -P dds</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
-        <requirements>
-            <name>ProcessorWorker</name>
-        </requirements>
-        <properties>
-            <name access="read">data1</name>
-            <name access="read">data2</name>
-        </properties>
-    </decltask>
-
-    <decltask name="Sink">
-        <exe>fairmq-ex-dds-sink --color false --channel-config name=data2,type=pull,method=bind -P dds</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
-        <requirements>
-            <name>SinkWorker</name>
-        </requirements>
-        <properties>
-            <name access="write">data2</name>
-        </properties>
-    </decltask>
-
-    <main name="main">
-        <task>Sampler</task>
-        <task>Sink</task>
-        <group name="ProcessorGroup" n="10">
-            <task>Processor</task>
-        </group>
-    </main>
-
-</topology>
--- a/examples/dds/ex-dds-topology.xml
+++ b/examples/dds/ex-dds-topology.xml
@@ -1,50 +1,47 @@
-<topology name="ExampleDDS">
+<topology id="ExampleDDS">

-    <property name="data1" />
-    <property name="data2" />
+    <property id="data1" />
+    <property id="data2" />

-    <declrequirement name="SamplerWorker" type="wnname" value="sampler"/>
-    <declrequirement name="ProcessorWorker" type="wnname" value="processor"/>
-    <declrequirement name="SinkWorker" type="wnname" value="sink"/>
+    <declrequirement id="SamplerWorker" type="wnname" value="sampler"/>
+    <declrequirement id="ProcessorWorker" type="wnname" value="processor"/>
+    <declrequirement id="SinkWorker" type="wnname" value="sink"/>

-    <decltask name="Sampler">
-        <exe>fairmq-ex-dds-sampler --color false --channel-config name=data1,type=push,method=bind -P dds --iterations 10</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
+    <decltask id="Sampler">
+        <exe reachable="true">@EX_BIN_DIR@/fairmq-ex-dds-sampler --id sampler --color false --channel-config name=data1,type=push,method=bind -S "&lt;@DDS_PLUGIN_LIB_DIR@/" -P dds</exe>
        <requirements>
-            <name>SamplerWorker</name>
+            <id>SamplerWorker</id>
        </requirements>
        <properties>
-            <name access="write">data1</name>
+            <id access="write">data1</id>
        </properties>
    </decltask>

-    <decltask name="Processor">
-        <exe>fairmq-ex-dds-processor --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -P dds</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
+    <decltask id="Processor">
+        <exe reachable="true">@EX_BIN_DIR@/fairmq-ex-dds-processor --id processor_%taskIndex% --config-key processor --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -S "&lt;@DDS_PLUGIN_LIB_DIR@/" -P dds</exe>
        <requirements>
-            <name>ProcessorWorker</name>
+            <id>ProcessorWorker</id>
        </requirements>
        <properties>
-            <name access="read">data1</name>
-            <name access="read">data2</name>
+            <id access="read">data1</id>
+            <id access="read">data2</id>
        </properties>
    </decltask>

-    <decltask name="Sink">
-        <exe>fairmq-ex-dds-sink --color false --channel-config name=data2,type=pull,method=bind -P dds --iterations 10</exe>
-        <env reachable="false">fairmq-ex-dds-env.sh</env>
+    <decltask id="Sink">
+        <exe reachable="true">@EX_BIN_DIR@/fairmq-ex-dds-sink --id sink --color false --channel-config name=data2,type=pull,method=bind -S "&lt;@DDS_PLUGIN_LIB_DIR@/" -P dds</exe>
        <requirements>
-            <name>SinkWorker</name>
+            <id>SinkWorker</id>
        </requirements>
        <properties>
-            <name access="write">data2</name>
+            <id access="write">data2</id>
        </properties>
    </decltask>

-    <main name="main">
+    <main id="main">
        <task>Sampler</task>
        <task>Sink</task>
-        <group name="ProcessorGroup" n="10">
+        <group id="ProcessorGroup" n="10">
            <task>Processor</task>
        </group>
    </main>
--- a/examples/dds/fairmq-start-ex-dds.sh.in
+++ b/examples/dds/fairmq-start-ex-dds.sh.in
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
-#                                                                              #
-#              This software is distributed under the terms of the             #
-#              GNU Lesser General Public Licence (LGPL) version 3,             #
-#                  copied verbatim in the file "LICENSE"                       #
-################################################################################
-
-# fairmq-start-ex-dds.sh [localhost]   -> submit agents with localhost plugin
-# fairmq-start-ex-dds.sh ssh           -> submit agents with ssh plugin
-
-set -e
-
-cleanup() {
-  dds-session stop $1
-  echo "CLEANUP PERFORMED"
-}
-
-source @DDS_INSTALL_PREFIX@/DDS_env.sh
-export PATH=@BIN_DIR@:$PATH
-
-plugin=${1:-localhost}
-
-exec 5>&1
-output=$(dds-session start | tee >(cat - >&5))
-export DDS_SESSION_ID=$(echo ${output} | grep "DDS session ID: " | cut -d' ' -f4)
-echo "SESSION ID: ${DDS_SESSION_ID}"
-
-trap "cleanup ${DDS_SESSION_ID}" EXIT
-
-requiredNofAgents=12
-if [[ "$plugin" == "ssh" ]]; then
-  dds-submit -r ${plugin} -c @DATA_DIR@/ex-dds-hosts.cfg
-else
-  dds-submit -r ${plugin} -n ${requiredNofAgents}
-fi
-echo "...waiting for ${requiredNofAgents} idle agents..."
-dds-info --wait-for-idle-agents ${requiredNofAgents}
-
-topologyFile=@DATA_DIR@/ex-dds-topology.xml
-echo "TOPOLOGY FILE: ${topologyFile}"
-# TODO Uncomment once DDS 2.6 is released
-# echo "TOPOLOGY NAME: $(dds-topology --disable-validation --topology-name ${topologyFile})"
-
-# TODO Uncomment once DDS 2.6 is released
-# dds-info --active-topology
-dds-topology --activate ${topologyFile}
-# dds-info --active-topology
-# dds-info --wait-for-executing-agents ${requiredNofAgents}
-sleep 1
-
-echo "------------------------"
-echo "...waiting for Topology to finish..."
-# TODO Retrieve number of devices from DDS topology API instead of having the user pass it explicitely
-fairmq-dds-command-ui -w "IDLE" -n ${requiredNofAgents}
-fairmq-dds-command-ui -c i -w "INITIALIZING DEVICE" -n ${requiredNofAgents}
-fairmq-dds-command-ui -c k -w "INITIALIZED" -n ${requiredNofAgents}
-fairmq-dds-command-ui -c b -w "BOUND" -n ${requiredNofAgents}
-fairmq-dds-command-ui -c x -w "DEVICE READY" -n ${requiredNofAgents}
-fairmq-dds-command-ui -c j -w "READY" -n ${requiredNofAgents}
-fairmq-dds-command-ui -c r
-sampler_and_sink="main/(Sampler|Sink)"
-fairmq-dds-command-ui -p $sampler_and_sink -w "RUNNING->READY" -n 2
-echo "...$sampler_and_sink are READY, sending shutdown..."
-fairmq-dds-command-ui -c s -w "RUNNING->READY" -n ${requiredNofAgents}
-fairmq-dds-command-ui -c t -w "DEVICE READY" -n ${requiredNofAgents}
-fairmq-dds-command-ui -c d -w "IDLE" -n ${requiredNofAgents}
-fairmq-dds-command-ui -c q
-echo "...waiting for ${requiredNofAgents} idle agents..."
-dds-info --wait-for-idle-agents ${requiredNofAgents}
-echo "------------------------"
-
-# TODO Uncomment once DDS 2.6 is released
-# dds-info --active-topology
-dds-topology --stop
-# dds-info --active-topology
-
-dds-agent-cmd getlog -a
-logDir="${wrkDir}/logs"
-for file in $(find "${logDir}" -name "*.tar.gz"); do tar -xf ${file} -C "${logDir}" ; done
-echo "AGENT LOG FILES IN: ${logDir}"
-
-# This string is used by ctest to detect success
-echo "Example successful :)"
-
-# Cleanup function is called by EXIT trap
--- a/examples/dds/runProcessor.cxx
+++ b/examples/dds/runProcessor.cxx
@@ -15,7 +15,7 @@ void addCustomOptions(bpo::options_description& /*options*/)
 {
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_dds::Processor();
 }
--- a/examples/dds/runSampler.cxx
+++ b/examples/dds/runSampler.cxx
@@ -11,15 +11,11 @@

 namespace bpo = boost::program_options;

-void addCustomOptions(bpo::options_description& options)
+void addCustomOptions(bpo::options_description& /*options*/)
 {
-    options.add_options()(
-        "iterations,i",
-        bpo::value<uint64_t>()->default_value(1000),
-        "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_dds::Sampler();
 }
--- a/examples/dds/runSink.cxx
+++ b/examples/dds/runSink.cxx
@@ -11,15 +11,11 @@

 namespace bpo = boost::program_options;

-void addCustomOptions(bpo::options_description& options)
+void addCustomOptions(bpo::options_description& /*options*/)
 {
-    options.add_options()(
-        "iterations,i",
-        bpo::value<uint64_t>()->default_value(1000),
-        "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_dds::Sink();
 }
--- a/examples/multipart/CMakeLists.txt
+++ b/examples/multipart/CMakeLists.txt
@@ -31,21 +31,16 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-multipart.sh.in ${CMA

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-ex-multipart.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh)

-add_test(NAME Example.Multipart.zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh zeromq)
-set_tests_properties(Example.Multipart.zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 5 parts")
+add_test(NAME Example-Multipart-zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh zeromq)
+set_tests_properties(Example-Multipart-zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 2 parts")

 if(BUILD_NANOMSG_TRANSPORT)
-  add_test(NAME Example.Multipart.nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh nanomsg)
-  set_tests_properties(Example.Multipart.nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 5 parts")
+  add_test(NAME Example-Multipart-nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh nanomsg)
+  set_tests_properties(Example-Multipart-nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 2 parts")
 endif()

-add_test(NAME Example.Multipart.shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh shmem)
-set_tests_properties(Example.Multipart.shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 5 parts")
-
-if(BUILD_OFI_TRANSPORT)
-  add_test(NAME Example.Multipart.ofi COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh ofi)
-  set_tests_properties(Example.Multipart.ofi PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 5 parts")
-endif()
+add_test(NAME Example-Multipart-shmem COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multipart.sh shmem)
+set_tests_properties(Example-Multipart-shmem PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received message with 2 parts")

 # install

--- a/examples/multipart/Sampler.cxx
+++ b/examples/multipart/Sampler.cxx
@@ -31,7 +31,7 @@ Sampler::Sampler()

 void Sampler::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler::ConditionalRun()
@@ -53,13 +53,6 @@ bool Sampler::ConditionalRun()
    parts.AddPart(NewSimpleMessage(header));
    parts.AddPart(NewMessage(1000));

-    // create more data parts, testing the FairMQParts in-place constructor
-    FairMQParts auxData{ NewMessage(500), NewMessage(600), NewMessage(700) };
-    assert(auxData.Size() == 3);
-    parts.AddPart(std::move(auxData));
-    assert(auxData.Size() == 0);
-    assert(parts.Size() == 5);
-
    LOG(info) << "Sending body of size: " << parts.At(1)->GetSize();

    Send(parts, "data");
@@ -81,4 +74,4 @@ Sampler::~Sampler()
 {
 }

-} // namespace example_multipart
+} // namespace example_multipart
--- a/examples/multipart/runSampler.cxx
+++ b/examples/multipart/runSampler.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(5), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multipart::Sampler();
 }
--- a/examples/multipart/runSink.cxx
+++ b/examples/multipart/runSink.cxx
@@ -15,7 +15,7 @@ void addCustomOptions(bpo::options_description& /*options*/)
 {
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multipart::Sink();
 }
--- a/examples/multipart/test-ex-multipart.sh.in
+++ b/examples/multipart/test-ex-multipart.sh.in
@@ -8,8 +8,6 @@ if [[ $1 =~ ^[a-z]+$ ]]; then
    transport=$1
 fi

-SESSION="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"
-
 # setup a trap to kill everything if the test fails/timeouts
 trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SINK_PID;' TERM

@@ -17,10 +15,9 @@ SAMPLER="fairmq-ex-multipart-sampler"
 SAMPLER+=" --id sampler1"
 SAMPLER+=" --transport $transport"
 SAMPLER+=" --verbosity veryhigh"
-SAMPLER+=" --session $SESSION"
 SAMPLER+=" --max-iterations 1"
 SAMPLER+=" --control static --color false"
-SAMPLER+=" --channel-config name=data,type=pair,method=connect,rateLogging=0,address=tcp://127.0.0.1:5555"
+SAMPLER+=" --channel-config name=data,type=push,method=connect,rateLogging=0,address=tcp://127.0.0.1:5555"
@CMAKE_CURRENT_BINARY_DIR@/$SAMPLER &
 SAMPLER_PID=$!

@@ -28,9 +25,8 @@ SINK="fairmq-ex-multipart-sink"
 SINK+=" --id sink1"
 SINK+=" --transport $transport"
 SINK+=" --verbosity veryhigh"
-SINK+=" --session $SESSION"
 SINK+=" --control static --color false"
-SINK+=" --channel-config name=data,type=pair,method=bind,rateLogging=0,address=tcp://127.0.0.1:5555"
+SINK+=" --channel-config name=data,type=pull,method=bind,rateLogging=0,address=tcp://127.0.0.1:5555"
@CMAKE_CURRENT_BINARY_DIR@/$SINK &
 SINK_PID=$!

--- a/examples/multiple-channels/CMakeLists.txt
+++ b/examples/multiple-channels/CMakeLists.txt
@@ -36,12 +36,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-multiple-channels.sh.

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-ex-multiple-channels.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multiple-channels.sh)

-add_test(NAME Example.MultipleChannels.zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multiple-channels.sh zeromq)
-set_tests_properties(Example.MultipleChannels.zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received messages from both sources.")
+add_test(NAME Example-Multiple-Channels-zeromq COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multiple-channels.sh zeromq)
+set_tests_properties(Example-Multiple-Channels-zeromq PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received messages from both sources.")

 if(BUILD_NANOMSG_TRANSPORT)
-  add_test(NAME Example.MultipleChannels.nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multiple-channels.sh nanomsg)
-  set_tests_properties(Example.MultipleChannels.nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received messages from both sources.")
+  add_test(NAME Example-Multiple-Channels-nanomsg COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multiple-channels.sh nanomsg)
+  set_tests_properties(Example-Multiple-Channels-nanomsg PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received messages from both sources.")
 endif()

 # install
--- a/examples/multiple-channels/Sampler.cxx
+++ b/examples/multiple-channels/Sampler.cxx
@@ -33,15 +33,15 @@ Sampler::Sampler()

 void Sampler::InitTask()
 {
-    fText = fConfig->GetProperty<string>("text");
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fText = fConfig->GetValue<string>("text");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 void Sampler::Run()
 {
    FairMQPollerPtr poller(NewPoller("data", "broadcast"));

-    while (!NewStatePending())
+    while (CheckCurrentState(RUNNING))
    {
        poller->Poll(100);

--- a/examples/multiple-channels/Sink.cxx
+++ b/examples/multiple-channels/Sink.cxx
@@ -31,7 +31,7 @@ Sink::Sink()

 void Sink::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sink::HandleBroadcast(FairMQMessagePtr& msg, int /*index*/)
--- a/examples/multiple-channels/runBroadcaster.cxx
+++ b/examples/multiple-channels/runBroadcaster.cxx
@@ -15,7 +15,7 @@ void addCustomOptions(bpo::options_description& /*options*/)
 {
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_channels::Broadcaster();
 }
--- a/examples/multiple-channels/runSampler.cxx
+++ b/examples/multiple-channels/runSampler.cxx
@@ -18,7 +18,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_channels::Sampler();
 }
--- a/examples/multiple-channels/runSink.cxx
+++ b/examples/multiple-channels/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_channels::Sink();
 }
--- a/examples/multiple-transports/CMakeLists.txt
+++ b/examples/multiple-transports/CMakeLists.txt
@@ -35,8 +35,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-multiple-transports.s
 # test

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test-ex-multiple-transports.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multiple-transports.sh)
-add_test(NAME Example.MultipleTransports COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multiple-transports.sh)
-set_tests_properties(Example.MultipleTransports PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received messages from both sources.")
+add_test(NAME Example-Multiple-Transports COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test-ex-multiple-transports.sh)
+set_tests_properties(Example-Multiple-Transports PROPERTIES TIMEOUT "30" RUN_SERIAL true PASS_REGULAR_EXPRESSION "Received messages from both sources.")

 # install

--- a/examples/multiple-transports/Sampler1.cxx
+++ b/examples/multiple-transports/Sampler1.cxx
@@ -22,7 +22,7 @@ Sampler1::Sampler1()

 void Sampler1::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 void Sampler1::PreRun()
@@ -60,7 +60,7 @@ void Sampler1::ListenForAcks()
 {
    uint64_t numAcks = 0;

-    while (!NewStatePending())
+    while (CheckCurrentState(RUNNING))
    {
        FairMQMessagePtr ack(NewMessageFor("ack", 0));
        if (Receive(ack, "ack") < 0)
--- a/examples/multiple-transports/Sampler2.cxx
+++ b/examples/multiple-transports/Sampler2.cxx
@@ -21,7 +21,7 @@ Sampler2::Sampler2()

 void Sampler2::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 bool Sampler2::ConditionalRun()
--- a/examples/multiple-transports/Sink.cxx
+++ b/examples/multiple-transports/Sink.cxx
@@ -31,7 +31,7 @@ Sink::Sink()

 void Sink::InitTask()
 {
-    fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
 }

 // handler is called whenever a message arrives on "data", with a reference to the message and a sub-channel index (here 0)
--- a/examples/multiple-transports/runSampler1.cxx
+++ b/examples/multiple-transports/runSampler1.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_transports::Sampler1();
 }
--- a/examples/multiple-transports/runSampler2.cxx
+++ b/examples/multiple-transports/runSampler2.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_transports::Sampler2();
 }
--- a/examples/multiple-transports/runSink.cxx
+++ b/examples/multiple-transports/runSink.cxx
@@ -17,7 +17,7 @@ void addCustomOptions(bpo::options_description& options)
        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
 }

-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
 {
    return new example_multiple_transports::Sink();
 }
--- a/examples/readout/Builder.h
+++ b/examples/readout/Builder.h
@@ -1,46 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREGIONBUILDER_H
-#define FAIRMQEXAMPLEREGIONBUILDER_H
-
-#include "FairMQDevice.h"
-
-#include <string>
-
-namespace example_readout
-{
-
-class Builder : public FairMQDevice
-{
-  public:
-    Builder()
-        : fOutputChannelName()
-    {}
-
-    void Init() override
-    {
-        fOutputChannelName = fConfig->GetProperty<std::string>("output-name");
-        OnData("rb", &Builder::HandleData);
-    }
-
-    bool HandleData(FairMQMessagePtr& msg, int /*index*/)
-    {
-        if (Send(msg, fOutputChannelName) < 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-  private:
-    std::string fOutputChannelName;
-};
-
-} // namespace example_readout
-
-#endif /* FAIRMQEXAMPLEREGIONBUILDER_H */
--- a/examples/readout/CMakeLists.txt
+++ b/examples/readout/CMakeLists.txt
@@ -1,59 +0,0 @@
- ################################################################################
- #    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
- #                                                                              #
- #              This software is distributed under the terms of the             #
- #              GNU Lesser General Public Licence (LGPL) version 3,             #
- #                  copied verbatim in the file "LICENSE"                       #
- ################################################################################
-
-add_executable(fairmq-ex-readout-readout runReadout.cxx)
-target_link_libraries(fairmq-ex-readout-readout PRIVATE FairMQ)
-
-add_executable(fairmq-ex-readout-builder runBuilder.cxx)
-target_link_libraries(fairmq-ex-readout-builder PRIVATE FairMQ)
-
-add_executable(fairmq-ex-readout-processor runProcessor.cxx)
-target_link_libraries(fairmq-ex-readout-processor PRIVATE FairMQ)
-
-add_executable(fairmq-ex-readout-sender runSender.cxx)
-target_link_libraries(fairmq-ex-readout-sender PRIVATE FairMQ)
-
-add_executable(fairmq-ex-readout-receiver runReceiver.cxx)
-target_link_libraries(fairmq-ex-readout-receiver PRIVATE FairMQ)
-
-set(EX_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
-set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout.sh)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout-processing.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout-processing.sh)
-
-# install
-
-install(
-    TARGETS
-    fairmq-ex-readout-readout
-    fairmq-ex-readout-builder
-    fairmq-ex-readout-processor
-    fairmq-ex-readout-sender
-    fairmq-ex-readout-receiver
-
-    LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
-)
-
-# configure run script with different executable paths for build and for install directories
-set(EX_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR})
-set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout.sh_install)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-readout-processing.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout-processing.sh_install)
-
-install(
-    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout.sh_install
-    DESTINATION ${PROJECT_INSTALL_BINDIR}
-    RENAME fairmq-start-ex-readout.sh
-)
-
-install(
-    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-readout-processing.sh_install
-    DESTINATION ${PROJECT_INSTALL_BINDIR}
-    RENAME fairmq-start-ex-readout-processing.sh
-)
--- a/examples/readout/Processor.h
+++ b/examples/readout/Processor.h
@@ -1,37 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREGIONPROCESSOR_H
-#define FAIRMQEXAMPLEREGIONPROCESSOR_H
-
-#include "FairMQDevice.h"
-
-namespace example_readout
-{
-
-class Processor : public FairMQDevice
-{
-  public:
-    Processor() {
-        OnData("bp", &Processor::HandleData);
-    }
-
-  protected:
-    bool HandleData(FairMQMessagePtr& msg, int /*index*/)
-    {
-        FairMQMessagePtr msg2(NewMessageFor("ps", 0, msg->GetSize()));
-        if (Send(msg2, "ps") < 0) {
-            return false;
-        }
-
-        return true;
-    }
-};
-
-} // namespace example_readout
-
-#endif /* FAIRMQEXAMPLEREGIONPROCESSOR_H */
--- a/examples/readout/README.md
+++ b/examples/readout/README.md
@@ -1,27 +0,0 @@
-# Readout example
-
-This examples shows two possible topologies (out of many) for a node connected to a detector readout (followed by a processing node).
-
-## Setup without new data generation
-
-```
-|------------------------------- Readout Node ---------------------------|     |- Processing Node -|
-| Readout            -->            Builder          -->          Sender | --> |     Receiver      |
-| [# shared memory segment (unused in this topology) ##################] | ofi |                   |
-| [# shmem unmanaged region (readout writes here, others read) ########] |     |                   |
-|------------------------------------------------------------------------|     |-------------------|
-```
-
-The devices one the Readout Node communicate via shared memory transport. Readout device writes into shared memory unmanaged region. The data is then forwarded through Builder to Sender process, which sends it out via OFI transport.
-
-## Setup with generating new data on the Readout node
-
-```
-|------------------------------- Readout Node ---------------------------|     |- Processing Node -|
-| Readout     -->     Builder      -->      Processor     -->     Sender | --> |     Receiver      |
-| [# shared memory segment (used between Proccessor and Sender) #######] | ofi |                   |
-| [# shmem unmanaged region (readout writes here, builder & proc read) ] |     |                   |
-|------------------------------------------------------------------------|     |-------------------|
-```
-
-In this topology one more device is added - Processor. It examines the arriving data and creates new data in shared memory. This data is not part of the unmanaged region, but lives in the general shared memory segment (unused in the previous setup). This new data is then forwarded to Sender and the Readout device is notified that the corresponding data piece in the unmanaged region is no longer used.
--- a/examples/readout/Readout.h
+++ b/examples/readout/Readout.h
@@ -1,91 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREADOUTREADOUT_H
-#define FAIRMQEXAMPLEREADOUTREADOUT_H
-
-#include <atomic>
-#include <thread>
-#include <chrono>
-
-#include "FairMQDevice.h"
-
-namespace example_readout
-{
-
-class Readout : public FairMQDevice
-{
-  public:
-    Readout()
-        : fMsgSize(10000)
-        , fMaxIterations(0)
-        , fNumIterations(0)
-        , fRegion(nullptr)
-        , fNumUnackedMsgs(0)
-    {}
-
-  protected:
-    void InitTask() override
-    {
-        fMsgSize = fConfig->GetProperty<int>("msg-size");
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-
-        fRegion = FairMQUnmanagedRegionPtr(NewUnmanagedRegionFor("rb",
-                                                                0,
-                                                                10000000,
-                                                                [this](void* /*data*/, size_t /*size*/, void* /*hint*/) { // callback to be called when message buffers no longer needed by transport
-                                                                    --fNumUnackedMsgs;
-                                                                    if (fMaxIterations > 0) {
-                                                                        LOG(debug) << "Received ack";
-                                                                    }
-                                                                }
-                                                                ));
-    }
-
-    bool ConditionalRun() override
-    {
-        FairMQMessagePtr msg(NewMessageFor("rb", // channel
-                                            0, // sub-channel
-                                            fRegion, // region
-                                            fRegion->GetData(), // ptr within region
-                                            fMsgSize, // offset from ptr
-                                            nullptr // hint
-                                            ));
-
-        if (Send(msg, "rb", 0) > 0) {
-            ++fNumUnackedMsgs;
-
-            if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-                LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-                return false;
-            }
-        }
-
-        return true;
-    }
-    void ResetTask() override
-    {
-        // if not all messages acknowledged, wait for a bit. But only once, since receiver could be already dead.
-        if (fNumUnackedMsgs != 0) {
-            LOG(debug) << "waiting for all acknowledgements... (" << fNumUnackedMsgs << ")";
-            std::this_thread::sleep_for(std::chrono::milliseconds(500));
-            LOG(debug) << "done, still unacked: " << fNumUnackedMsgs;
-        }
-        fRegion.reset();
-    }
-
-  private:
-    int fMsgSize;
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
-    FairMQUnmanagedRegionPtr fRegion;
-    std::atomic<uint64_t> fNumUnackedMsgs;
-};
-
-} // namespace example_readout
-
-#endif /* FAIRMQEXAMPLEREADOUTREADOUT_H */
--- a/examples/readout/Receiver.h
+++ b/examples/readout/Receiver.h
@@ -1,54 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREGIONRECEIVER_H
-#define FAIRMQEXAMPLEREGIONRECEIVER_H
-
-#include "FairMQDevice.h"
-
-namespace example_readout
-{
-
-class Receiver : public FairMQDevice
-{
-  public:
-    Receiver()
-        : fMaxIterations(0)
-        , fNumIterations(0)
-    {}
-
-  protected:
-    void InitTask() override
-    {
-        // Get the fMaxIterations value from the command line options (via fConfig)
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-    }
-
-    void Run() override
-    {
-        FairMQChannel& dataInChannel = fChannels.at("sr").at(0);
-
-        while (!NewStatePending()) {
-            FairMQMessagePtr msg(dataInChannel.Transport()->CreateMessage());
-            dataInChannel.Receive(msg);
-            // void* ptr = msg->GetData();
-
-            if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-                LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-                break;
-            }
-        }
-    }
-
-  private:
-    uint64_t fMaxIterations;
-    uint64_t fNumIterations;
-};
-
-} // namespace example_readout
-
-#endif /* FAIRMQEXAMPLEREGIONRECEIVER_H */
--- a/examples/readout/Sender.h
+++ b/examples/readout/Sender.h
@@ -1,46 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-#ifndef FAIRMQEXAMPLEREGIONSENDER_H
-#define FAIRMQEXAMPLEREGIONSENDER_H
-
-#include "FairMQDevice.h"
-
-#include <string>
-
-namespace example_readout
-{
-
-class Sender : public FairMQDevice
-{
-  public:
-    Sender()
-        : fInputChannelName()
-    {}
-
-    void Init() override
-    {
-        fInputChannelName = fConfig->GetProperty<std::string>("input-name");
-        OnData(fInputChannelName, &Sender::HandleData);
-    }
-
-    bool HandleData(FairMQMessagePtr& msg, int /*index*/)
-    {
-        if (Send(msg, "sr") < 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-  private:
-    std::string fInputChannelName;
-};
-
-} // namespace example_readout
-
-#endif /* FAIRMQEXAMPLEREGIONSENDER_H */
--- a/examples/readout/fairmq-start-ex-readout-processing.sh.in
+++ b/examples/readout/fairmq-start-ex-readout-processing.sh.in
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@
-
-msgSize="1000000"
-
-if [[ $1 =~ ^[0-9]+$ ]]; then
-    msgSize=$1
-fi
-
-READOUT="fairmq-ex-readout-readout"
-READOUT+=" --id readout1"
-READOUT+=" --msg-size $msgSize"
-READOUT+=" --channel-config name=rb,type=pair,method=bind,address=tcp://localhost:7777,transport=shmem"
-xterm -geometry 80x23+0+0 -hold -e @EX_BIN_DIR@/$READOUT &
-
-BUILDER="fairmq-ex-readout-builder"
-BUILDER+=" --id builder1"
-BUILDER+=" --output-name bp"
-BUILDER+=" --channel-config name=rb,type=pair,method=connect,address=tcp://localhost:7777,transport=shmem"
-BUILDER+="                  name=bp,type=pair,method=connect,address=tcp://localhost:7778,transport=shmem"
-xterm -geometry 80x23+500+0 -hold -e @EX_BIN_DIR@/$BUILDER &
-
-PROCESSOR="fairmq-ex-readout-processor"
-PROCESSOR+=" --id processor1"
-PROCESSOR+=" --channel-config name=bp,type=pair,method=bind,address=tcp://localhost:7778,transport=shmem"
-PROCESSOR+="                  name=ps,type=pair,method=connect,address=tcp://localhost:7779,transport=shmem"
-xterm -geometry 80x23+750+500 -hold -e @EX_BIN_DIR@/$PROCESSOR &
-
-SENDER="fairmq-ex-readout-sender"
-SENDER+=" --id sender1"
-SENDER+=" --input-name ps"
-SENDER+=" --channel-config name=ps,type=pair,method=bind,address=tcp://localhost:7779,transport=shmem"
-SENDER+="                  name=sr,type=pair,method=connect,address=tcp://localhost:7780,transport=ofi"
-xterm -geometry 80x23+1000+0 -hold -e @EX_BIN_DIR@/$SENDER &
-
-RECEIVER="fairmq-ex-readout-receiver"
-RECEIVER+=" --id receiver1"
-RECEIVER+=" --channel-config name=sr,type=pair,method=bind,address=tcp://localhost:7780,transport=ofi"
-xterm -geometry 80x23+1500+0 -hold -e @EX_BIN_DIR@/$RECEIVER &
--- a/examples/readout/fairmq-start-ex-readout.sh.in
+++ b/examples/readout/fairmq-start-ex-readout.sh.in
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@
-
-msgSize="1000000"
-
-if [[ $1 =~ ^[0-9]+$ ]]; then
-    msgSize=$1
-fi
-
-READOUT="fairmq-ex-readout-readout"
-READOUT+=" --id readout1"
-READOUT+=" --msg-size $msgSize"
-READOUT+=" --channel-config name=rb,type=pair,method=bind,address=tcp://localhost:7777,transport=shmem"
-xterm -geometry 80x23+0+0 -hold -e @EX_BIN_DIR@/$READOUT &
-
-BUILDER="fairmq-ex-readout-builder"
-BUILDER+=" --id builder1"
-BUILDER+=" --output-name bs"
-BUILDER+=" --channel-config name=rb,type=pair,method=connect,address=tcp://localhost:7777,transport=shmem"
-BUILDER+="                  name=bs,type=pair,method=connect,address=tcp://localhost:7778,transport=shmem"
-xterm -geometry 80x23+500+0 -hold -e @EX_BIN_DIR@/$BUILDER &
-
-SENDER="fairmq-ex-readout-sender"
-SENDER+=" --id sender1"
-SENDER+=" --input-name bs"
-SENDER+=" --channel-config name=bs,type=pair,method=bind,address=tcp://localhost:7778,transport=shmem"
-SENDER+="                  name=sr,type=pair,method=connect,address=tcp://localhost:7779,transport=ofi"
-xterm -geometry 80x23+1000+0 -hold -e @EX_BIN_DIR@/$SENDER &
-
-RECEIVER="fairmq-ex-readout-receiver"
-RECEIVER+=" --id receiver1"
-RECEIVER+=" --channel-config name=sr,type=pair,method=bind,address=tcp://localhost:7779,transport=ofi"
-xterm -geometry 80x23+1500+0 -hold -e @EX_BIN_DIR@/$RECEIVER &
--- a/examples/readout/runBuilder.cxx
+++ b/examples/readout/runBuilder.cxx
@@ -1,23 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-
-#include "runFairMQDevice.h"
-#include "Builder.h"
-
-namespace bpo = boost::program_options;
-
-void addCustomOptions(bpo::options_description& options)
-{
-    options.add_options()
-        ("output-name", bpo::value<std::string>()->default_value("bs"), "Output channel name");
-}
-
-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
-{
-    return new example_readout::Builder();
-}
--- a/examples/readout/runReceiver.cxx
+++ b/examples/readout/runReceiver.cxx
@@ -1,23 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
- *                                                                              *
- *              This software is distributed under the terms of the             *
- *              GNU Lesser General Public Licence (LGPL) version 3,             *
- *                  copied verbatim in the file "LICENSE"                       *
- ********************************************************************************/
-
-#include "runFairMQDevice.h"
-#include "Receiver.h"
-
-namespace bpo = boost::program_options;
-
-void addCustomOptions(bpo::options_description& options)
-{
-    options.add_options()
-        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
-}
-
-FairMQDevicePtr getDevice(const fair::mq::ProgOptions& /*config*/)
-{
-    return new example_readout::Receiver();
-}
--- a/Show More
+++ b/Show More