2025-10-13 16:46:47 +00:00
491 changed files with 28411 additions and 25759 deletions
--- a/.clang-tidy
+++ b/.clang-tidy
@ -1,3 +0,0 @@
---
-Checks:            'cppcoreguidelines-*,misc-unused-alias-decls,misc-unused-parameters,modernize-pass-by-value,modernize-deprecated-headers,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-emplace,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-override,modernize-use-using,performance-faster-string-find,performance-for-range-copy,performance-unnecessary-copy-initialization,readability-avoid-const-params-in-decls,readability-braces-around-statements,readability-container-size-empty,readability-delete-null-pointer,readability-redundant-member-init,readability-redundant-string-init,readability-static-accessed-through-instance,readability-string-compare'
-HeaderFilterRegex: '/(fairmq/)'
--- a/.codecov.yml
+++ b/.codecov.yml
@ -0,0 +1,2 @@
+comment:
+  layout: "diff, files"
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -1,5 +0,0 @@
-{
-  "image": "ghcr.io/fairrootgroup/fairmq-dev/fedora-38:latest",
-  "features": {
-  }
-}
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,6 +1,6 @@
 Describe your proposal.

-Mention any issue this PR resolves or is related to.
+Mention any issue this PR is resolves or is related to.

 ---

--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,12 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "dev"
-    schedule:
-      interval: "monthly"
-  - package-ecosystem: "gitsubmodule"
-    directory: "/"
-    target-branch: "dev"
-    schedule:
-      interval: "monthly"
--- a/.github/workflows/check_metadata.yaml
+++ b/.github/workflows/check_metadata.yaml
@ -1,29 +0,0 @@
-# SPDX-FileCopyrightText: 2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH, Darmstadt, Germany
-#
-# SPDX-License-Identifier: CC0-1.0
-
-name: Check AUTHORS and CONTRIBUTORS in metadata
-
-on:
-  push:
-    paths:
-    - AUTHORS
-    - CONTRIBUTORS
-    - codemeta.json
-    - .zenodo.json
-  pull_request:
-    paths:
-    - AUTHORS
-    - CONTRIBUTORS
-    - codemeta.json
-    - .zenodo.json
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Try updating metadata
-        run: python meta_update.py
-      - name: Check for Updates
-        run: git diff --exit-code
--- a/.github/workflows/codemeta_validate.yaml
+++ b/.github/workflows/codemeta_validate.yaml
@ -1,21 +0,0 @@
-name: validate codemeta
-
-on:
-  push:
-    paths:
-    - codemeta.json
-    - .github/workflows/codemeta_validate.yaml
-  pull_request:
-    paths:
-    - codemeta.json
-    - .github/workflows/codemeta_validate.yaml
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: gitlab-registry.in2p3.fr/escape2020/wp3/eossr:v1.0
-    steps:
-      - uses: actions/checkout@v4
-      - name: validate codemeta
-        run: eossr-metadata-validator codemeta.json
--- a/.github/workflows/fair-software.yml
+++ b/.github/workflows/fair-software.yml
@ -1,16 +0,0 @@
-name: fair-software
-
-on: push
-
-jobs:
-  verify:
-    name: "fair-software"
-    runs-on: ubuntu-latest
-    if: github.repository == 'FairRootGroup/FairMQ'
-    steps:
-      - uses: fair-software/howfairis-github-action@0.2.1
-        name: Measure compliance with fair-software.eu recommendations
-        env:
-          PYCHARM_HOSTED: "Trick colorama into displaying colored output"
-        with:
-          MY_REPO_URL: "https://github.com/${{ github.repository }}"
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,5 @@
 build
-install
+
 .DS_Store
+
 .vscode
-/compile_commands.json
-.cache
-.spack-env
-spack.lock
--- a/.gitlint
+++ b/.gitlint
@ -1,14 +0,0 @@
-[general]
-ignore=body-is-missing
-contrib=contrib-title-conventional-commits
-
-ignore-merge-commits=false
-ignore-revert-commits=false
-ignore-fixup-commits=false
-ignore-squash-commits=false
-
-[title-max-length]
-line-length=75
-
-[contrib-title-conventional-commits]
-types=fix,feat,build,ci,docs,style,refactor,perf,test
--- a/.gitmodules
+++ b/.gitmodules
@ -1,9 +0,0 @@
-[submodule "extern/googletest"]
-	path = extern/googletest
-	url = https://github.com/google/googletest
-[submodule "extern/PicoSHA2"]
-	path = extern/PicoSHA2
-	url = https://github.com/okdshin/PicoSHA2
-[submodule "extern/FairCMakeModules"]
-	path = extern/FairCMakeModules
-	url = https://github.com/FairRootGroup/FairCMakeModules
--- a/.zenodo.json
+++ b/.zenodo.json
@ -1,88 +0,0 @@
-{
-    "creators": [
-        {
-            "orcid": "0000-0002-8071-4497",
-            "name": "Al-Turany, Mohammad"
-        },
-        {
-            "orcid": "0000-0003-3787-1910",
-            "name": "Klein, Dennis"
-        },
-        {
-            "name": "Kollegger, Thorsten"
-        },
-        {
-            "orcid": "0000-0002-6249-155X",
-            "name": "Rybalchenko, Alexey"
-        },
-        {
-            "name": "Winckler, Nicolas"
-        }
-    ],
-    "contributors": [
-        {
-            "type": "Other",
-            "name": "Aphecetche, Laurent"
-        },
-        {
-            "type": "Other",
-            "name": "Binet, Sebastien"
-        },
-        {
-            "type": "Other",
-            "name": "Eulisse, Giulio"
-        },
-        {
-            "type": "Other",
-            "name": "Karabowicz, Radoslaw"
-        },
-        {
-            "type": "Other",
-            "name": "Kretz, Matthias"
-        },
-        {
-            "type": "Other",
-            "name": "Krzewicki, Mikolaj"
-        },
-        {
-            "type": "Other",
-            "name": "Lebedev, Andrey"
-        },
-        {
-            "type": "Other",
-            "name": "Mrnjavac, Teo"
-        },
-        {
-            "type": "Other",
-            "name": "Neskovic, Gvozden"
-        },
-        {
-            "type": "Other",
-            "name": "Richter, Matthias"
-        },
-        {
-            "type": "Other",
-            "orcid": "0000-0002-5321-8404",
-            "name": "Tacke, Christian"
-        },
-        {
-            "type": "Other",
-            "name": "Uhlig, Florian"
-        },
-        {
-            "type": "Other",
-            "name": "Wenzel, Sandro"
-        }
-    ],
-    "description": "<p>C++ Message Queuing Library and Framework</p>",
-    "related_identifiers": [
-        {
-            "identifier": "https://github.com/FairRootGroup/FairMQ/",
-            "relation": "isSupplementTo",
-            "resource_type": "software",
-            "scheme": "url"
-        }
-    ],
-    "title": "FairMQ",
-    "license": "LGPL-3.0-only"
-}
--- a/6
+++ b/6
@ -1,5 +1,5 @@
-Al-Turany, Mohammad [https://orcid.org/0000-0002-8071-4497]
-Klein, Dennis [https://orcid.org/0000-0003-3787-1910]
+Al-Turany, Mohammad
+Klein, Dennis
 Kollegger, Thorsten
-Rybalchenko, Alexey [https://orcid.org/0000-0002-6249-155X]
+Rybalchenko, Alexey
 Winckler, Nicolas
--- a/CMakeGraphVizOptions.cmake
+++ b/CMakeGraphVizOptions.cmake
@ -1,14 +0,0 @@
-set(GRAPHVIZ_GRAPH_TYPE digraph)
-set(GRAPHVIZ_GRAPH_NAME FairMQ)
-set(GRAPHVIZ_EXECUTABLES ON)
-set(GRAPHVIZ_STATIC_LIBS OFF)
-set(GRAPHVIZ_SHARED_LIBS ON)
-set(GRAPHVIZ_MODULE_LIBS OFF)
-set(GRAPHVIZ_GENERATE_PER_TARGET OFF)
-set(GRAPHVIZ_GENERATE_DEPENDERS OFF)
-set(GRAPHVIZ_IGNORE_TARGETS
-  "fairmq-ex.*"
-  "testsuite_.*"
-  "testhelper_.*"
-  "FairMQPlugin_test_dummy"
-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,52 +1,92 @@
 ################################################################################
-# Copyright (C) 2018-2024 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+#    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"                       #
 ################################################################################

+cmake_minimum_required(VERSION 3.9.4 FATAL_ERROR)
+

 # Project ######################################################################
-cmake_minimum_required(VERSION 3.15...3.30 FATAL_ERROR)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+include(FairMQLib)

-list(PREPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-include(GitHelper)
+set_fairmq_cmake_policies()
 get_git_version()

 project(FairMQ VERSION ${PROJECT_VERSION} LANGUAGES CXX)
-include(FairMQProjectSettings)
+message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")
+
+set_fairmq_defaults()
+
+include(CTest)
 ################################################################################


 # Build options ################################################################
-include(FairMQBuildOption)
-
-fairmq_build_option(BUILD_FAIRMQ        "Build FairMQ library and devices."
-                                         DEFAULT ON)
-fairmq_build_option(BUILD_TESTING       "Build tests."
-                                         DEFAULT OFF REQUIRES "BUILD_FAIRMQ")
-fairmq_build_option(BUILD_EXAMPLES      "Build FairMQ examples."
-                                         DEFAULT ON  REQUIRES "BUILD_FAIRMQ")
-fairmq_build_option(BUILD_TIDY_TOOL     "Build the fairmq-tidy tool."
-                                         DEFAULT OFF)
-fairmq_build_option(BUILD_DOCS          "Build FairMQ documentation."
-                                         DEFAULT OFF)
-fairmq_build_option(USE_EXTERNAL_GTEST  "Do not use bundled GTest. Not recommended."
-                                         DEFAULT OFF)
-fairmq_build_option(FAIRMQ_DEBUG_MODE   "Compile in debug mode (may decrease performance)."
-                                         DEFAULT OFF)
+include(CMakeDependentOption)
+option(BUILD_FAIRMQ "Build FairMQ library and devices." ON)
+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_EXAMPLES "Build FairMQ examples." ON "BUILD_FAIRMQ" OFF)
+option(BUILD_DOCS "Build FairMQ documentation." OFF)
+option(FAST_BUILD "Fast production build. Not recommended for development." OFF)
 ################################################################################


 # Dependencies #################################################################
-include(CTest)
-include(FairMQDependencies)
+if(FAST_BUILD)
+  include(cotire)
+endif()
+
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+find_package(Threads REQUIRED)
+
+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()
+
+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 msgpack VERSION 3.1.0 REQUIRED)
+endif()
+
+if(BUILD_OFI_TRANSPORT)
+  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_DDS_PLUGIN)
+  find_package2(PRIVATE DDS VERSION 2.0 REQUIRED)
+endif()
+
+if(BUILD_TESTING)
+  find_package2(PRIVATE GTest VERSION 1.7.0 REQUIRED)
+endif()
+
+if(BUILD_DOCS)
+  find_package2(PRIVATE Doxygen VERSION 1.8.8 REQUIRED COMPONENTS dot OPTIONAL_COMPONENTS mscgen dia)
+endif()
 ################################################################################


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

@ -61,16 +101,12 @@ 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)
  add_custom_target(docs ALL DEPENDS doxygen)
 endif()
-
-if(BUILD_TIDY_TOOL)
-  add_subdirectory(fairmq/tidy)
-endif()
 ################################################################################


@ -81,51 +117,168 @@ endif()
 if(BUILD_TESTING)
  list(APPEND PROJECT_PACKAGE_COMPONENTS tests)
 endif()
+if(BUILD_DDS_PLUGIN)
+  list(APPEND PROJECT_PACKAGE_COMPONENTS dds_plugin)
+endif()
+if(BUILD_NANOMSG_TRANSPORT)
+  list(APPEND PROJECT_PACKAGE_COMPONENTS nanomsg_transport)
+endif()
+if(BUILD_OFI_TRANSPORT)
+  list(APPEND PROJECT_PACKAGE_COMPONENTS ofi_transport)
+endif()
 if(BUILD_EXAMPLES)
  list(APPEND PROJECT_PACKAGE_COMPONENTS examples)
 endif()
 if(BUILD_DOCS)
  list(APPEND PROJECT_PACKAGE_COMPONENTS docs)
 endif()
-if(BUILD_TIDY_TOOL)
-  list(APPEND PROJECT_PACKAGE_COMPONENTS tidy_tool)
-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_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
  )
 endif()
-if(BUILD_TIDY_TOOL)
-  install(FILES cmake/FairMQTidy.cmake
-    DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
-  )
-endif()

-include(FairMQPackage)
 install_cmake_package()
 ################################################################################


 # Summary ######################################################################
-include(FairMQSummary)
-
-message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")
-fair_summary_global_cxx_flags_standard()
-fair_summary_build_types()
-fair_summary_package_dependencies()
-fairmq_summary_components()
-fairmq_summary_static_analysis()
-fairmq_summary_install_prefix()
-fairmq_summary_debug_mode()
-fairmq_summary_compile_definitions()
+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)
+        set(version_str "${BGreen}${${dep}_MAJOR_VERSION}.${${dep}_MINOR_VERSION}${CR}")
+      else()
+        set(version_str "${BGreen}${${dep}_VERSION}${CR}")
+      endif()
+    else()
+      set(version_str "${BYellow}unknown${CR}")
+    endif()
+    if(PROJECT_${dep}_VERSION)
+      set(version_req_str " (>= ${PROJECT_${dep}_VERSION})")
+    endif()
+    pad(${dep} 20 " " dep_padded)
+    if(DISABLE_COLOR)
+      pad("${version_str}${version_req_str}" 25 " " version_padded)
+    else()
+      pad("${version_str}${version_req_str}" 25 " " version_padded COLOR 1)
+    endif()
+    if(${dep} STREQUAL FairLogger)
+      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 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 Doxygen)
+      get_target_property(doxygen_bin Doxygen::doxygen INTERFACE_LOCATION)
+      get_filename_component(prefix ${doxygen_bin} DIRECTORY)
+      get_filename_component(prefix ${prefix}/.. ABSOLUTE)
+    else()
+      get_filename_component(prefix ${${dep}_INCLUDE_DIR}/.. ABSOLUTE)
+    endif()
+    message(STATUS "  ${BWhite}${dep_padded}${CR}${version_padded}${prefix}")
+    unset(version_str)
+    unset(version_padded)
+    unset(version_req_str)
+  endforeach()
+endif()
+message(STATUS "  ")
+message(STATUS "  ${Cyan}COMPONENT         BUILT?  INFO${CR}")
+if(BUILD_FAIRMQ)
+  set(fairmq_summary "${BGreen}YES${CR}    (default, disable with ${BMagenta}-DBUILD_FAIRMQ=OFF${CR})")
+else()
+  set(fairmq_summary "${BRed} NO${CR}    (enable with ${BMagenta}-DBUILD_FAIRMQ=ON${CR})")
+endif()
+message(STATUS "  ${BWhite}fairmq${CR}             ${fairmq_summary}")
+if(BUILD_TESTING)
+  set(tests_summary "${BGreen}YES${CR}    (default, disable with ${BMagenta}-DBUILD_TESTING=OFF${CR})")
+else()
+  set(tests_summary "${BRed} NO${CR}    (enable with ${BMagenta}-DBUILD_TESTING=ON${CR})")
+endif()
+message(STATUS "  ${BWhite}tests${CR}              ${tests_summary}")
+if(BUILD_NANOMSG_TRANSPORT)
+  set(nn_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_NANOMSG_TRANSPORT=OFF${CR})")
+else()
+  set(nn_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_NANOMSG_TRANSPORT=ON${CR})")
+endif()
+message(STATUS "  ${BWhite}nanomsg_transport${CR}  ${nn_summary}")
+if(BUILD_OFI_TRANSPORT)
+  set(ofi_summary "${BGreen}YES${CR}    EXPERIMENTAL (disable with ${BMagenta}-DBUILD_OFI_TRANSPORT=OFF${CR})")
+else()
+  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)
+  set(dds_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_DDS_PLUGIN=OFF${CR})")
+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_EXAMPLES)
+  set(examples_summary "${BGreen}YES${CR}    (default, disable with ${BMagenta}-DBUILD_EXAMPLES=OFF${CR})")
+else()
+  set(examples_summary "${BRed} NO${CR}    (enable with ${BMagenta}-DBUILD_EXAMPLES=ON${CR})")
+endif()
+message(STATUS "  ${BWhite}examples${CR}           ${examples_summary}")
+if(BUILD_DOCS)
+  set(docs_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_DOCS=OFF${CR})")
+else()
+  set(docs_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_DOCS=ON${CR})")
+endif()
+message(STATUS "  ${BWhite}docs${CR}               ${docs_summary}")
 message(STATUS "  ")
 ################################################################################
--- a/3
+++ b/3
@ -4,10 +4,7 @@ Eulisse, Giulio
 Karabowicz, Radoslaw
 Kretz, Matthias <kretz@kde.org>
 Krzewicki, Mikolaj 
-Lebedev, Andrey
-Mrnjavac, Teo <teo.m@cern.ch>
 Neskovic, Gvozden
 Richter, Matthias
-Tacke, Christian [https://orcid.org/0000-0002-5321-8404]
 Uhlig, Florian
 Wenzel, Sandro
--- a/110
+++ b/110
@ -4,98 +4,38 @@ Upstream-Contact: Mohammad Al-Turany <m.al-turany@gsi.de>
 Source: https://github.com/FairRootGroup/FairMQ

 Files: *
-Copyright: 2012-2022, GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
-Copyright: 2012-2022, [see AUTHORS file]
-Copyright: 2012-2022, [see CONTRIBUTORS file]
+Copyright: 2012-2018, GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
+Copyright: 2012-2018, [see AUTHORS file]
+Copyright: 2012-2018, [see CONTRIBUTORS file]
 Comment: The copyright of individual contributors is documented in the
  Git history.
 License: LGPL-3.0-only

-Files: extern/googletest
-Copyright: 2008-2022, Google Inc.
-License: GOOGLE
-
-Files: extern/asio
-Copyright: 2003-2022, Christopher M. Kohlhoff (chris at kohlhoff dot com)
-License: BSL-1.0
-
-Files: extern/PicoSHA2
-Copyright: 2017 okdshin
-License: MIT
+Files: cmake/cotire.cmake
+Copyright: 2012-2018 Sascha Kratky
+License: COTIRE

 License: LGPL-3.0-only
  [see LICENSE file]

-License: GOOGLE
-  Copyright 2008, Google Inc.
-  All rights reserved.
+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:

-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.

-      * Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the following disclaimer
-  in the documentation and/or other materials provided with the
-  distribution.
-      * Neither the name of Google Inc. nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: BSL-1.0
-  Boost Software License - Version 1.0 - August 17th, 2003
-
-  Permission is hereby granted, free of charge, to any person or organization
-  obtaining a copy of the software and accompanying documentation covered by
-  this license (the "Software") to use, reproduce, display, distribute,
-  execute, and transmit the Software, and to prepare derivative works of the
-  Software, and to permit third-parties to whom the Software is furnished to
-  do so, all subject to the following:
-
-  The copyright notices in the Software and this entire statement, including
-  the above license grant, this restriction and the following disclaimer,
-  must be included in all copies of the Software, in whole or in part, and
-  all derivative works of the Software, unless such copies or derivative
-  works are solely in the form of machine-executable object code generated by
-  a source language processor.
-
-  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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-  SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  DEALINGS IN THE SOFTWARE.
-
-License: MIT
-  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.
+  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/CTestConfig.cmake
+++ b/CTestConfig.cmake
@ -1,3 +1,9 @@
 set(CTEST_PROJECT_NAME "FairMQ")
 set(CTEST_NIGHTLY_START_TIME "00:00:00 CEST")
-set(CTEST_SUBMIT_URL "https://cdash.gsi.de/submit.php?project=FairMQ")
+
+set(CTEST_DROP_METHOD "https")
+set(CTEST_DROP_SITE "cdash.gsi.de")
+set(CTEST_DROP_LOCATION "/submit.php?project=FairMQ")
+set(CTEST_DROP_SITE_CDASH TRUE)
+
+set(CTEST_TESTING_TIMEOUT 60)
--- a/Dart.sh
+++ b/Dart.sh
@ -0,0 +1,145 @@
+#!/bin/bash
+
+
+function print_example(){
+echo "##################################################################"
+echo "# To set the required parameters as source and the build         #"
+echo "# directory for ctest, the linux flavour and the SIMPATH         #"
+echo "# put the export commands below to a separate file which is read #"
+echo "# during execution and which is defined on the command line.     #"
+echo "# Set all parameters according to your needs.                    #"
+echo "# LINUX_FLAVOUR should be set to the distribution you are using  #"
+echo "# eg Debian, SuSe etc.                                           #"
+echo "# An additional varibale NCPU can overwrite the default number   #"
+echo "# of parallel processes used to compile the project.             #"
+echo "# This can be usefull if one can use a distributed build system  #"
+echo "# like icecream.                                                 #"
+echo "# For example                                                    #"
+echo "#!/bin/bash                                                      #"
+echo "export LINUX_FLAVOUR=<your linux flavour>                        #"
+echo "export FAIRSOFT_VERSION=<version of FairSoft>                    #"
+echo "export SIMPATH=<path to your FairSoft version>                   #"
+echo "export GIT_BRANCH=< master or dev>                               #"
+echo "export BUILDDIR=<dir where the build files go>                   #"
+echo "export SOURCEDIR=<location of the FairRoot sources>              #"
+echo "#export NCPU=100                                                 #"
+echo "##################################################################"
+}
+
+if [ "$#" -lt "2" ]; then
+  echo ""
+  echo "-- Error -- Please start script with two parameters"
+  echo "-- Error -- The first parameter is the ctest model."
+  echo "-- Error -- Possible arguments are Nightly, Experimental, "
+  echo "-- Error -- Continuous or Profile."
+  echo "-- Error -- The second parameter is the file containg the"
+  echo "-- Error -- Information about the setup at the client"
+  echo "-- Error -- installation (see example below)."
+  echo ""
+  print_example
+  exit 1
+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
+
+# test if the input file exists and execute it
+if [ -e "$2" ];then
+  source $2
+else
+  echo "-- Error -- Input file does not exist."
+  echo "-- Error -- Please choose existing input file."
+  exit 1
+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
+
+
+# test for architecture
+arch=$(uname -s | tr '[A-Z]' '[a-z]')
+chip=$(uname -m | tr '[A-Z]' '[a-z]')
+
+# extract information about the system and the machine and set
+# environment variables used by ctest
+SYSTEM=$arch-$chip
+if test -z $CXX ; then
+  if [ "$arch" == "darwin" ]; then
+    COMPILER=$(clang --version | head -n 1 | cut -d' ' -f1,2,4 | tr -d ' ')
+  else
+    COMPILER=gcc$(gcc -dumpversion)
+  fi
+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
+
+# get the number of processors
+# and information about the host
+if [ "$arch" = "linux" ];
+then
+  if [ "$NCPU" != "" ];
+  then
+    export number_of_processors=$NCPU
+  else
+    export number_of_processors=$(cat /proc/cpuinfo | grep processor | wc -l)
+  fi
+  if [ -z "$SITE" ]; then
+    export SITE=$(hostname -f)
+    if [ -z "$SITE" ]; then
+      export SITE=$(uname -n)
+    fi
+  fi
+elif [ "$arch" = "darwin" ];
+then
+  if [ "$NCPU" != "" ];
+  then
+    export number_of_processors=$NCPU
+  else
+    export number_of_processors=$(sysctl -n hw.ncpu)
+  fi
+  if [ -z "$SITE" ]; then
+    export SITE=$(hostname -s)
+  fi
+fi
+
+echo "************************"
+date
+echo "LABEL: " $LABEL
+echo "SITE: " $SITE
+echo "Model: " ${ctest_model}
+echo "Nr. of processes: " $number_of_processors
+echo "************************"
+
+cd $SOURCEDIR
+
+ctest -S FairMQTest.cmake -V --VV
--- a/FairMQTest.cmake
+++ b/FairMQTest.cmake
@ -1,93 +1,89 @@
 ################################################################################
-# Copyright (C) 2021-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+#    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"                       #
 ################################################################################
+Set(CTEST_SOURCE_DIRECTORY $ENV{SOURCEDIR})
+Set(CTEST_BINARY_DIRECTORY $ENV{BUILDDIR})
+Set(CTEST_SITE $ENV{SITE})
+Set(CTEST_BUILD_NAME $ENV{LABEL})
+Set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
+Set(CTEST_PROJECT_NAME "FairMQ")

-cmake_host_system_information(RESULT fqdn QUERY FQDN)
+Find_Program(CTEST_GIT_COMMAND NAMES git)
+Set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")

-set(CTEST_SOURCE_DIRECTORY .)
-set(CTEST_BINARY_DIRECTORY build)
-set(CTEST_CMAKE_GENERATOR "Ninja")
-set(CTEST_USE_LAUNCHERS ON)
-set(CTEST_CONFIGURATION_TYPE "RelWithDebInfo")
-set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 102400)
+Set(BUILD_COMMAND "make")
+Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -j$ENV{number_of_processors}")

-if(NOT NCPUS)
-  if(ENV{SLURM_CPUS_PER_TASK})
-    set(NCPUS $ENV{SLURM_CPUS_PER_TASK})
-  else()
-    include(ProcessorCount)
-    ProcessorCount(NCPUS)
-    if(NCPUS EQUAL 0)
-      set(NCPUS 1)
-    endif()
-  endif()
-endif()
+String(TOUPPER $ENV{ctest_model} _Model)
+Set(configure_options "-DCMAKE_BUILD_TYPE=${_Model}")

-if ("$ENV{CTEST_SITE}" STREQUAL "")
-  set(CTEST_SITE "${fqdn}")
-else()
-  set(CTEST_SITE $ENV{CTEST_SITE})
-endif()
+Set(CTEST_USE_LAUNCHERS 1)
+Set(configure_options "${configure_options};-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}")

-if ("$ENV{LABEL}" STREQUAL "")
-  set(CTEST_BUILD_NAME "build")
-else()
-  set(CTEST_BUILD_NAME $ENV{LABEL})
-endif()
+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_DDS_PLUGIN=ON")
+Set(configure_options "${configure_options};-DFAST_BUILD=ON")
+Set(configure_options "${configure_options};-DCOTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES=-j$ENV{number_of_processors}")

-ctest_start(Continuous)
+Set(EXTRA_FLAGS $ENV{EXTRA_FLAGS})
+If(EXTRA_FLAGS)
+  Set(configure_options "${configure_options};${EXTRA_FLAGS}") 
+EndIf()

-list(APPEND options "-DDISABLE_COLOR=ON" "-DBUILD_EXAMPLES=ON" "-DBUILD_TESTING=ON")
-if(RUN_STATIC_ANALYSIS)
-  list(APPEND options "-DRUN_STATIC_ANALYSIS=ON")
-endif()
-if(CMAKE_BUILD_TYPE)
-  set(CTEST_CONFIGURATION_TYPE ${CMAKE_BUILD_TYPE})
-endif()
-if(ENABLE_SANITIZER_ADDRESS)
-  list(APPEND options "-DENABLE_SANITIZER_ADDRESS=ON")
-endif()
-if(ENABLE_SANITIZER_LEAK)
-  list(APPEND options "-DENABLE_SANITIZER_LEAK=ON")
-endif()
-if(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR)
-  list(APPEND options "-DENABLE_SANITIZER_UNDEFINED_BEHAVIOR=ON")
-endif()
-if(ENABLE_SANITIZER_MEMORY)
-  list(APPEND options "-DENABLE_SANITIZER_MEMORY=ON")
-endif()
-if(ENABLE_SANITIZER_THREAD)
-  list(APPEND options "-DENABLE_SANITIZER_THREAD=ON")
-endif()
-if(CMAKE_CXX_COMPILER)
-  list(APPEND options "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
-endif()
-if(CMAKE_CXX_FLAGS)
-  list(APPEND options "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
-endif()
-list(REMOVE_DUPLICATES options)
-list(JOIN options ";" optionsstr)
-ctest_configure(OPTIONS "${optionsstr}")
+If($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()

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

-ctest_build(FLAGS "-j${NCPUS}")
+Ctest_Start($ENV{ctest_model})

-ctest_submit()
+Ctest_Configure(BUILD "${CTEST_BINARY_DIRECTORY}"
+                OPTIONS "${configure_options}"
+               )

-if(NOT RUN_STATIC_ANALYSIS)
-  ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}"
-             PARALLEL_LEVEL ${NCPUS}
-             SCHEDULE_RANDOM ON
-             RETURN_VALUE _ctest_test_ret_val)
+Ctest_Build(BUILD "${CTEST_BINARY_DIRECTORY}")

-  ctest_submit()
-endif()
+Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}" 
+           PARALLEL_LEVEL $ENV{number_of_processors}
+           RETURN_VALUE _ctest_test_ret_val
+          )
+If("$ENV{do_codecov_upload}")
+  ForEach(i RANGE 4)
+    # Gather statistics to catch time sensitive branches
+    Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}" 
+               PARALLEL_LEVEL $ENV{number_of_processors}
+              )
+  EndForEach()
+EndIf()

-if(_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)
+EndIf()
+
+Ctest_Submit()
+ 
+if (_ctest_test_ret_val)
  Message(FATAL_ERROR "Some tests failed.")
 endif()
--- a/118
+++ b/118
@ -1,75 +1,34 @@
 #!groovy

-def jobMatrix(String type, List specs) {
+def specToLabel(Map spec) {
+  return "${spec.os}-${spec.arch}-${spec.compiler}-FairSoft_${spec.fairsoft}"
+}
+
+def jobMatrix(String prefix, List specs, Closure callback) {
  def nodes = [:]
  for (spec in specs) {
-    def job = ""
-    def selector = "slurm"
-    def os = ""
-    def ver = ""
-
-    if (type == 'build') {
-      job = "${spec.os}-${spec.ver}-${spec.arch}-${spec.compiler}"
-      if (spec.os =~ /^macos/) {
-        selector = "${spec.os}-${spec.ver}-${spec.arch}"
-      }
-      os = spec.os
-      ver = spec.ver
-    } else { // == 'check'
-      job = "${spec.name}"
-      os = 'fedora'
-      ver = '36'
-    }
-
-    def label = "${job}"
-    def extra = spec.extra
-
-    nodes[label] = {
-      node(selector) {
-        githubNotify(context: "${label}", description: 'Building ...', status: 'PENDING')
+    def label = specToLabel(spec)
+    nodes["${prefix}/${label}"] = {
+      node(label) {
+        githubNotify(context: "${prefix}/${label}", description: 'Building ...', status: 'PENDING')
        try {
          deleteDir()
          checkout scm

-          def jobscript = 'job.sh'
-          def ctestcmd = "ctest ${extra} -S FairMQTest.cmake -V --output-on-failure"
-          sh "echo \"set -e\" >> ${jobscript}"
-          sh "echo \"export LABEL=\\\"\${JOB_BASE_NAME} ${label}\\\"\" >> ${jobscript}"
-          if (selector =~ /^macos/) {
-            sh """\
-              echo \"${ctestcmd}\" >> ${jobscript}
-            """
-            sh "cat ${jobscript}"
-            sh "bash ${jobscript}"
-          } else { // selector == "slurm"
-            def imageurl = "oras://ghcr.io/fairrootgroup/fairmq-dev/${os}-${ver}-sif:latest"
-            def execopts = "--ipc --uts --pid -B/shared"
-            def containercmd = "singularity exec ${execopts} ${imageurl} bash -l -c \\\"${ctestcmd} ${extra}\\\""
-            sh """\
-              echo \"echo \\\"*** Job started at .......: \\\$(date -R)\\\"\" >> ${jobscript}
-              echo \"echo \\\"*** Job ID ...............: \\\${SLURM_JOB_ID}\\\"\" >> ${jobscript}
-              echo \"echo \\\"*** Compute node .........: \\\$(hostname -f)\\\"\" >> ${jobscript}
-              echo \"unset http_proxy\" >> ${jobscript}
-              echo \"unset HTTP_PROXY\" >> ${jobscript}
-              echo \"${containercmd}\" >> ${jobscript}
-            """
-            sh "cat ${jobscript}"
-            sh "test/ci/slurm-submit.sh \"FairMQ \${JOB_BASE_NAME} ${label}\" ${jobscript}"
+          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
+          '''

-            if (job == "static-analyzers") {
-              recordIssues(enabledForFailure: true,
-                           tools: [gcc(pattern: 'build/Testing/Temporary/*.log')],
-                           filters: [excludeFile('extern/*'), excludeFile('usr/*')],
-                           skipBlames: true,
-                           skipPublishingChecks: true)
-            }
-          }
+          callback.call(spec, label)

          deleteDir()
-          githubNotify(context: "${label}", description: 'Success', status: 'SUCCESS')
+          githubNotify(context: "${prefix}/${label}", description: 'Success', status: 'SUCCESS')
        } catch (e) {
          deleteDir()
-          githubNotify(context: "${label}", description: 'Error', status: 'ERROR')
+          githubNotify(context: "${prefix}/${label}", description: 'Error', status: 'ERROR')
          throw e
        }
      }
@ -81,36 +40,25 @@ def jobMatrix(String type, List specs) {
 pipeline{
  agent none
  stages {
-    stage("CI") {
+    stage("Run CI Matrix") {
      steps{
        script {
-          def builds = jobMatrix('build', [
-            [os: 'ubuntu', ver: '20.04', arch: 'x86_64', compiler: 'gcc-9'],
-            [os: 'ubuntu', ver: '22.04', arch: 'x86_64', compiler: 'gcc-11'],
-            [os: 'ubuntu', ver: '24.04', arch: 'x86_64', compiler: 'gcc-13'],
-            [os: 'fedora', ver: '33',    arch: 'x86_64', compiler: 'gcc-10'],
-            [os: 'fedora', ver: '34',    arch: 'x86_64', compiler: 'gcc-11'],
-            [os: 'fedora', ver: '35',    arch: 'x86_64', compiler: 'gcc-11'],
-            [os: 'fedora', ver: '36',    arch: 'x86_64', compiler: 'gcc-12'],
-            [os: 'fedora', ver: '37',    arch: 'x86_64', compiler: 'gcc-12'],
-            [os: 'fedora', ver: '38',    arch: 'x86_64', compiler: 'gcc-13'],
-            [os: 'fedora', ver: '39',    arch: 'x86_64', compiler: 'gcc-13'],
-            [os: 'fedora', ver: '40',    arch: 'x86_64', compiler: 'gcc-14'],
-            [os: 'macos',  ver: '14',    arch: 'x86_64', compiler: 'apple-clang-16'],
-            [os: 'macos',  ver: '15',    arch: 'x86_64', compiler: 'apple-clang-16'],
-            [os: 'macos',  ver: '15',    arch: 'arm64',  compiler: 'apple-clang-16'],
-          ])
+          def build_jobs = jobMatrix('alfa-ci/build', [
+            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc4.9',         fairsoft: 'may18'],
+            [os: 'MacOS10.13', arch: 'x86_64', compiler: 'AppleLLVM9.0.0', fairsoft: 'may18'],
+          ]) { spec, label ->
+            sh './Dart.sh alfa_ci Dart.cfg'
+          }

-          def all_debug = "-DCMAKE_BUILD_TYPE=Debug"
+          def profile_jobs = jobMatrix('alfa-ci/codecov', [
+            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc4.9',         fairsoft: 'may18'],
+          ]) { spec, label ->
+            withCredentials([string(credentialsId: 'fairmq_codecov_token', variable: 'CODECOV_TOKEN')]) {
+              sh './Dart.sh codecov Dart.cfg'
+            }
+          }

-          def checks = jobMatrix('check', [
-            [name: 'static-analyzers', extra: "${all_debug} -DRUN_STATIC_ANALYSIS=ON"],
-            [name: '{address,leak,ub}-sanitizers',
-             extra: "${all_debug} -DENABLE_SANITIZER_ADDRESS=ON -DENABLE_SANITIZER_LEAK=ON -DENABLE_SANITIZER_UNDEFINED_BEHAVIOUR=ON -DCMAKE_CXX_FLAGS='-O1 -fno-omit-frame-pointer'"],
-            [name: 'thread-sanitizer', extra: "${all_debug} -DENABLE_SANITIZER_THREAD=ON -DCMAKE_CXX_COMPILER=clang++"],
-          ])
-
-          parallel(builds + checks)
+          parallel(build_jobs + profile_jobs)
        }
      }
    }
--- a/Jenkinsfile.nightly
+++ b/Jenkinsfile.nightly
@ -0,0 +1,55 @@
+#!groovy
+
+def specToLabel(Map spec) {
+  return "${spec.os}-${spec.arch}-${spec.compiler}-FairSoft_${spec.fairsoft}"
+}
+
+def buildMatrix(List specs, Closure callback) {
+  def nodes = [:]
+  for (spec in specs) {
+    def label = specToLabel(spec)
+    nodes[label] = {
+      node(label) {
+        try {
+          deleteDir()
+          checkout scm
+
+          callback.call(spec, label)
+
+          deleteDir()
+        } catch (e) {
+          deleteDir()
+          throw e
+        }
+      }
+    }
+  }
+  return nodes
+}
+
+pipeline{
+  agent none
+  triggers { cron('H 2 * * *') }
+  stages {
+    stage("Run Nightly Build/Test Matrix") {
+      steps{
+        script {
+          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=dev" >> Dart.cfg
+            '''
+            sh './Dart.sh Nightly Dart.cfg'
+            sh './Dart.sh Profile Dart.cfg'
+          })
+        }
+      }
+    }
+  }
+}
--- a/README.md
+++ b/README.md
@ -1,15 +1,12 @@
 <!-- {#mainpage} -->
-# FairMQ
-
-[![license](https://alfa-ci.gsi.de/shields/badge/license-LGPL--3.0-orange.svg)](COPYRIGHT)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1689985.svg)](https://doi.org/10.5281/zenodo.1689985)
-[![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/6915/badge)](https://bestpractices.coreinfrastructure.org/projects/6915)
-[![fair-software.eu](https://img.shields.io/badge/fair--software.eu-%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8B%20%20%E2%97%8F%20%20%E2%97%8F-yellow)](https://github.com/FairRootGroup/FairMQ/actions/workflows/fair-software.yml)
-[![Spack package](https://repology.org/badge/version-for-repo/spack/fairmq.svg)](https://repology.org/project/fairmq/versions)
+# 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) [![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)

 C++ Message Queuing Library and Framework

-Docs: [Book](https://github.com/FairRootGroup/FairMQ/blob/dev/README.md#documentation)
+| 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).

@ -24,89 +21,78 @@ FairMQ is designed to help implementing large-scale data processing workflows ne
 The core of FairMQ provides an abstract asynchronous message passing API with scalability protocols
 inspired by [ZeroMQ](https://github.com/zeromq/libzmq) (e.g. PUSH/PULL, PUB/SUB).
 FairMQ provides multiple implementations for its API (so-called "transports",
-e.g. `zeromq` and `shmem` (latest release of the `ofi` transport in v1.4.56, removed since v1.5+)) to cover
-a variety of use cases
+e.g. `zeromq`, `shmem`, `nanomsg`, and `ofi` (in development)) to cover a variety of use cases
 (e.g. inter-thread, inter-process, inter-node communication) and machines (e.g. Ethernet, Infiniband).
 In addition to this core functionality FairMQ provides a framework for creating "devices" - actors which
-are communicating through message passing. FairMQ does not only allow the user to use different transport
-but also to mix them; i.e: A Device can communicate using different transport on different channels at the
-same time. Device execution is modelled as a simple state machine that shapes the integration points for
-the user task. Devices also incorporate a plugin system for runtime configuration and control.
-Next to the provided [devices](https://github.com/FairRootGroup/FairMQ/tree/master/fairmq/devices) and
-[plugins](https://github.com/FairRootGroup/FairMQ/tree/master/fairmq/plugins) the user can extend FairMQ
-by developing his own plugins to integrate his devices with external configuration and control services.
+are communicating through message passing. FairMQ does not only allow the user to use different transport but also to mix them; i.e: A Device can communicate using different transport on different channels at the same time. Device execution is modelled as a simple state machine that
+shapes the integration points for the user task. Devices also incorporate a plugin system for runtime configuration and control.
+Next to the provided devices and plugins (e.g. [DDS](https://github.com/FairRootGroup/DDS))
+the user can extend FairMQ by developing his own plugins to integrate his devices with external
+configuration and control services.

 FairMQ has been developed in the context of its mother project [FairRoot](https://github.com/FairRootGroup/FairRoot) -
 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/),
+[OFI](https://ofiwg.github.io/libfabric/), [Protobuf](https://developers.google.com/protocol-buffers/), [DDS](http://dds.gsi.de)
+
+  Supported platforms: Linux and MacOS.
+
 ## Installation from Source

-Recommended:
-
 ```bash
-git clone https://github.com/FairRootGroup/FairMQ fairmq_source
-cmake -S fairmq_source -B fairmq_build -GNinja -DCMAKE_BUILD_TYPE=Release [-DBUILD_TESTING=ON]
-cmake --build fairmq_build
-[ctest --test-dir fairmq_build --output-on-failure --schedule-random -j<ncpus>] # needs -DBUILD_TESTING=ON
-cmake --install fairmq_build --prefix $(pwd)/fairmq_install
+git clone https://github.com/FairRootGroup/FairMQ fairmq
+mkdir fairmq_build && cd fairmq_build
+cmake -DCMAKE_INSTALL_PREFIX=./fairmq_install ../fairmq
+cmake --build . --target install
 ```

-Please consult the [manpages of your CMake version](https://cmake.org/cmake/help/latest/manual/cmake.1.html) for more options.
-
-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=...` (`*_ROOT` variables can also be environment variables).
-
-## Installation via Spack
-
-Prerequisite: [Spack](https://spack.readthedocs.io/en/latest/getting_started.html)
-
-```bash
-spack info fairmq # inspect build options
-spack install fairmq # build latest packaged version with default options
-```
-
-Build FairMQ's dependencies via Spack for development:
-```bash
-git clone -b dev https://github.com/FairRootGroup/FairMQ fairmq_source
-spack --env fairmq_source install # installs deps declared in fairmq_source/spack.yaml
-spack env activate fairmq_source # sets $CMAKE_PREFIX_PATH which is used by CMake to find FairMQ's deps
-cmake -S fairmq_source -B fairmq_build -GNinja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON
-# develop, compile, test
-spack env deactivate # at end of dev session, or simply close the shell
-```
+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

 FairMQ ships as a CMake package, so in your `CMakeLists.txt` you can discover it like this:

 ```cmake
-find_package(FairCMakeModules 1.0 REQUIRED)
-include(FairFindPackage2)
-find_package2(FairMQ)
-find_package2_implicit_dependencies()
+find_package(FairMQ)
 ```

-The [`FairFindPackage2` module](https://fairrootgroup.github.io/FairCMakeModules/latest/module/FairFindPackage2.html) is part of the [`FairCMakeModules` package](https://fairrootgroup.github.io/FairCMakeModules).
-
 If FairMQ is not installed in system directories, you can hint the installation:

 ```cmake
-list(PREPEND CMAKE_PREFIX_PATH /path/to/fairmq_install)
+set(CMAKE_PREFIX_PATH /path/to/FairMQ_install_prefix ${CMAKE_PREFIX_PATH})
+find_package(FairMQ)
 ```

-## Dependencies
+`find_package(FairMQ)` will define an imported target `FairMQ::FairMQ`.

-  * [Boost](https://www.boost.org/)
-  * [CMake](https://cmake.org/)
-  * [Doxygen](http://www.doxygen.org/)
-  * [FairCMakeModules](https://github.com/FairRootGroup/FairCMakeModules) (optionally bundled)
-  * [FairLogger](https://github.com/FairRootGroup/FairLogger)
-  * [GTest](https://github.com/google/googletest) (optionally bundled)
-  * [ZeroMQ](http://zeromq.org/)
+In order to succesfully compile and link against the `FairMQ::FairMQ` target, you need to discover its public package dependencies, too.

-  Which dependencies are required depends on which components are built.
+```cmake
+find_package(FairMQ)
+if(FairMQ_FOUND)
+  find_package(FairLogger ${FairMQ_FairLogger_VERSION})
+  find_package(Boost ${FairMQ_Boost_VERSION} COMPONENTS ${FairMQ_Boost_COMPONENTS})
+endif()
+```

-  Supported platform is Linux. macOS is supported on a best-effort basis.
+Of course, feel free to customize the above commands to your needs.
+
+Optionally, you can require certain FairMQ package components and a minimum version:
+
+```cmake
+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})
+endif()
+```
+
+When building FairMQ, CMake will print a summary table of all available package components.

 ## CMake options

@ -115,29 +101,33 @@ On command line:
  * `-DDISABLE_COLOR=ON` disables coloured console output.
  * `-DBUILD_TESTING=OFF` disables building of tests.
  * `-DBUILD_EXAMPLES=OFF` disables building of examples.
+  * `-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_DOCS=ON` enables building of API docs.
-  * `-DFAIRMQ_CHANNEL_DEFAULT_AUTOBIND=OFF` disable channel `autoBind` by default
-  * You can hint non-system installations for dependent packages, see the #installation-from-source section above
+  * You can hint non-system installations for dependent packages, see the #Installation section above

 After the `find_package(FairMQ)` call the following CMake variables are defined:

 | Variable | Info |
 | --- | --- |
 | `${FairMQ_PACKAGE_DEPENDENCIES}` | the list of public package dependencies |
-| `${FairMQ_<dep>_VERSION}` | the minimum `<dep>` version FairMQ requires |
-| `${FairMQ_<dep>_COMPONENTS}` | the list of `<dep>` components FairMQ depends on |
+| `${FairMQ_Boost_VERSION}` | the minimum Boost version FairMQ requires |
+| `${FairMQ_Boost_COMPONENTS}` | the list of Boost components FairMQ depends on |
+| `${FairMQ_FairLogger_VERSION}` | the minimum FairLogger version FairMQ requires |
 | `${FairMQ_PACKAGE_COMPONENTS}` | the list of components FairMQ consists of |
 | `${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_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,9 +149,6 @@ After the `find_package(FairMQ)` call the following CMake variables are defined:
    3. [Introspection](docs/Configuration.md#33-introspection)
 4. [Development](docs/Development.md#4-development)
   1. [Testing](docs/Development.md#41-testing)
-   2. [Static Analysis](docs/Development.md#42-static-analysis)
-      1. [CMake Integration](docs/Development.md#421-cmake-integration)
-      2. [Extra Compiler Arguments](docs/Development.md#422-extra-compiler-arguments)
 5. [Logging](docs/Logging.md#5-logging)
   1. [Log severity](docs/Logging.md#51-log-severity)
   2. [Log verbosity](docs/Logging.md#52-log-verbosity)
@ -169,8 +156,3 @@ 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. [PMIx](docs/Plugins.md#731-pmix)
--- a/cmake/FairCMakeModules.cmake
+++ b/cmake/FairCMakeModules.cmake
@ -1,19 +0,0 @@
-################################################################################
-#    Copyright (C) 2021 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_guard(GLOBAL)
-
-include(FairMQBundlePackageHelper)
-
-set(PROJECT_FairCMakeModules_VERSION 0.2)
-find_package(FairCMakeModules ${PROJECT_FairCMakeModules_VERSION} QUIET)
-
-if(NOT FairCMakeModules_FOUND AND NOT FairCMakeModules_BUNDLED)
-  build_bundled(FairCMakeModules extern/FairCMakeModules)
-  find_package(FairCMakeModules REQUIRED)
-endif()
--- a/cmake/FairMQBuildOption.cmake
+++ b/cmake/FairMQBuildOption.cmake
@ -1,50 +0,0 @@
-################################################################################
-# Copyright (C) 2018-2021 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_guard(GLOBAL)
-
-include(CMakeDependentOption)
-
-macro(fairmq_build_option option description)
-  cmake_parse_arguments(ARGS "" "DEFAULT" "REQUIRES" ${ARGN})
-
-  if(ARGS_DEFAULT)
-    set(__default__ ON)
-  else()
-    set(__default__ OFF)
-  endif()
-
-  if(ARGS_REQUIRES)
-    set(__requires__ ${ARGS_REQUIRES})
-    foreach(d ${__requires__})
-      string(REGEX REPLACE " +" ";" __requires_condition__ "${d}")
-      if(${__requires_condition__})
-      else()
-        if(${option})
-          message(FATAL_ERROR "Cannot enable build option ${option}, depending option is not set: ${__requires_condition__}")
-        endif()
-      endif()
-    endforeach()
-  else()
-    set(__requires__)
-  endif()
-
-  if(__requires__)
-    cmake_dependent_option(${option} ${description} ${__default__} "${__requires__}" OFF)
-  else()
-    option(${option} ${description} ${__default__})
-  endif()
-
-  set(__default__)
-  set(__requires__)
-  set(__requires_condition__)
-  set(ARGS_DEFAULT)
-  set(ARGS_REQUIRES)
-  set(option)
-  set(description)
-endmacro()
--- a/cmake/FairMQBundlePackageHelper.cmake
+++ b/cmake/FairMQBundlePackageHelper.cmake
@ -1,92 +0,0 @@
-################################################################################
-# Copyright (C) 2018-2021 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_guard(GLOBAL)
-
-if(NOT DEFINED ${GIT_EXECUTABLE})
-  find_program(GIT_EXECUTABLE NAMES git)
-endif()
-
-# TODO Deduplicate code
-
-macro(exec cmd)
-  list(JOIN ARGN " " args)
-  file(APPEND ${${package}_BUILD_LOGFILE} ">>> ${cmd} ${args}\n")
-
-  execute_process(COMMAND ${cmd} ${ARGN}
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    OUTPUT_VARIABLE log
-    ERROR_VARIABLE log
-    RESULT_VARIABLE res
-  )
-  file(APPEND ${${package}_BUILD_LOGFILE} ${log})
-
-  if(res)
-    message(FATAL_ERROR "${res} \nSee also \"${${package}_BUILD_LOGFILE}\"")
-  endif()
-endmacro()
-
-macro(exec_source cmd)
-  list(JOIN ARGN " " args)
-  file(APPEND ${${package}_BUILD_LOGFILE} ">>> ${cmd} ${args}\n")
-
-  execute_process(COMMAND ${cmd} ${ARGN}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE log
-    ERROR_VARIABLE log
-    RESULT_VARIABLE res
-  )
-  file(APPEND ${${package}_BUILD_LOGFILE} ${log})
-
-  if(res)
-    message(FATAL_ERROR "${res} \nSee also \"${${package}_BUILD_LOGFILE}\"")
-  endif()
-endmacro()
-
-function(build_bundled package bundle)
-  message(STATUS "Building bundled ${package}")
-
-  set(${package}_SOURCE_DIR ${CMAKE_SOURCE_DIR}/${bundle})
-  set(${package}_BINARY_DIR ${CMAKE_BINARY_DIR}/${bundle})
-  file(MAKE_DIRECTORY ${${package}_BINARY_DIR})
-  set(${package}_BUILD_LOGFILE ${${package}_BINARY_DIR}/build.log)
-  file(REMOVE ${${package}_BUILD_LOGFILE})
-
-  if(GIT_EXECUTABLE)
-    exec_source(${GIT_EXECUTABLE} submodule update --init -- ${${package}_SOURCE_DIR})
-  endif()
-
-  if(${package} STREQUAL GTest)
-    set(${package}_INSTALL_DIR ${CMAKE_BINARY_DIR}/${bundle}_install)
-    file(MAKE_DIRECTORY ${${package}_INSTALL_DIR})
-    set(${package}_PREFIX ${${package}_INSTALL_DIR})
-
-    exec(${CMAKE_COMMAND} -S ${${package}_SOURCE_DIR} -B ${${package}_BINARY_DIR} -G ${CMAKE_GENERATOR}
-      -DCMAKE_INSTALL_PREFIX=${${package}_INSTALL_DIR} -DBUILD_GMOCK=OFF
-    )
-    exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR})
-    exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR} --target install)
-  elseif(${package} STREQUAL FairCMakeModules)
-    set(${package}_INSTALL_DIR ${CMAKE_BINARY_DIR}/${bundle}_install)
-    file(MAKE_DIRECTORY ${${package}_INSTALL_DIR})
-    set(${package}_PREFIX ${${package}_INSTALL_DIR})
-
-    exec(${CMAKE_COMMAND} -S ${${package}_SOURCE_DIR} -B ${${package}_BINARY_DIR} -G ${CMAKE_GENERATOR}
-      -DCMAKE_INSTALL_PREFIX=${${package}_INSTALL_DIR}
-    )
-    exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR})
-    exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR} --target install)
-  elseif(${package} STREQUAL PicoSHA2)
-    set(${package}_PREFIX ${${package}_SOURCE_DIR})
-  endif()
-
-  set(${package}_ROOT ${${package}_PREFIX} CACHE PATH "Location of bundle package ${package}")
-  set(${package}_BUNDLED ON CACHE BOOL "Whether bundled ${package} was used")
-
-  message(STATUS "Building bundled ${package} - done")
-endfunction()
--- a/cmake/FairMQConfig.cmake.in
+++ b/cmake/FairMQConfig.cmake.in
@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+#    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,             #
@ -13,17 +13,17 @@ 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/FairMQDependencies.cmake
+++ b/cmake/FairMQDependencies.cmake
@ -1,107 +0,0 @@
-################################################################################
-# Copyright (C) 2018-2025 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_guard(GLOBAL)
-
-include(FairCMakeModules)
-include(FairFindPackage2)
-include(FairMQBundlePackageHelper)
-
-if(BUILD_FAIRMQ)
-  set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-  find_package2(PUBLIC Threads REQUIRED)
-  set(Threads_PREFIX "<system>")
-endif()
-
-if(BUILD_FAIRMQ OR BUILD_TIDY_TOOL)
-  find_package2(PUBLIC FairLogger REQUIRED VERSION 1.6.0)
-  find_package2(PUBLIC Boost REQUIRED VERSION 1.66
-    COMPONENTS container program_options filesystem date_time regex
-  )
-endif()
-
-if(BUILD_FAIRMQ)
-  find_package2(PRIVATE ZeroMQ REQUIRED VERSION 4.1.4)
-  if(NOT PicoSHA2_BUNDLED)
-    build_bundled(PicoSHA2 extern/PicoSHA2)
-  endif()
-  find_package2(BUNDLED PicoSHA2 REQUIRED)
-  set(PicoSHA2_VERSION "1.0.0")
-  set(PicoSHA2_PREFIX "<bundled>")
-endif()
-
-if(BUILD_TESTING)
-  if(NOT GTest_FOUND AND NOT GTest_BUNDLED AND NOT USE_EXTERNAL_GTEST)
-    build_bundled(GTest extern/googletest)
-  endif()
-  find_package2(BUNDLED GTest REQUIRED)
-  if(GTest_BUNDLED)
-    set(GTest_VERSION "Dec 26 2024 @7d76a23")
-    set(GTest_PREFIX "<bundled>")
-  endif()
-endif()
-
-if(BUILD_DOCS)
-  find_package2(PRIVATE Doxygen REQUIRED VERSION 1.8.8
-    COMPONENTS dot
-  )
-endif()
-
-if(BUILD_TIDY_TOOL)
-  find_package2(PRIVATE LLVM REQUIRED)
-  find_package2(PRIVATE Clang REQUIRED)
-  set(Clang_VERSION ${LLVM_VERSION})
-  find_package2(PRIVATE CLI11 REQUIRED)
-endif()
-
-find_package2_implicit_dependencies() # Always call last after latest find_package2
-
-if(PROJECT_PACKAGE_DEPENDENCIES)
-  foreach(dep IN LISTS PROJECT_PACKAGE_DEPENDENCIES)
-    string(TOUPPER ${dep} dep_upper)
-    if(${dep}_BUNDLED)
-      set(${dep}_PREFIX "<bundled>")
-    elseif(${dep} STREQUAL FairLogger)
-      if(NOT FairLogger_PREFIX AND FairLogger_ROOT)
-        set(FairLogger_PREFIX ${FairLogger_ROOT})
-      endif()
-    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(Boost_PREFIX ${boost_include}/.. ABSOLUTE)
-      unset(boost_include)
-    elseif(${dep} STREQUAL Doxygen)
-      get_target_property(doxygen_bin Doxygen::doxygen INTERFACE_LOCATION)
-      get_filename_component(Doxygen_PREFIX ${doxygen_bin} DIRECTORY)
-      get_filename_component(Doxygen_PREFIX ${Doxygen_PREFIX}/.. ABSOLUTE)
-      unset(doxygen_bin)
-    elseif(NOT ${dep}_PREFIX)
-      # try to guess
-      if(TARGET ${dep}::${dep})
-        get_target_property(${dep}_include ${dep}::${dep} INTERFACE_INCLUDE_DIRECTORIES)
-        get_filename_component(${dep}_PREFIX ${${dep}_include}/.. ABSOLUTE)
-        unset(${dep}_include)
-      elseif(${dep}_INCLUDE_DIR)
-        get_filename_component(${dep}_PREFIX ${${dep}_INCLUDE_DIR}/.. ABSOLUTE)
-      elseif(${dep_upper}_INCLUDE_DIR)
-        get_filename_component(${dep}_PREFIX ${${dep_upper}_INCLUDE_DIR}/.. ABSOLUTE)
-      elseif(${dep}_INCLUDE_DIRS)
-        list(GET ${dep}_INCLUDE_DIRS 0 ${dep}_include)
-        get_filename_component(${dep}_PREFIX ${${dep}_include}/.. ABSOLUTE)
-        unset(${dep}_include)
-      elseif(${dep_upper}_INCLUDE_DIRS)
-        list(GET ${dep_upper}_INCLUDE_DIRS 0 ${dep}_include)
-        get_filename_component(${dep}_PREFIX ${${dep}_include}/.. ABSOLUTE)
-        unset(${dep}_include)
-      endif()
-    endif()
-  endforeach()
-endif()
--- a/cmake/FairMQLib.cmake
+++ b/cmake/FairMQLib.cmake
@ -0,0 +1,326 @@
+################################################################################
+#    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"                       #
+################################################################################
+
+### PUBLIC
+
+# Defines some variables with console color escape sequences
+if(NOT WIN32 AND NOT DISABLE_COLOR)
+  string(ASCII 27 Esc)
+  set(CR       "${Esc}[m")
+  set(CB       "${Esc}[1m")
+  set(Red      "${Esc}[31m")
+  set(Green    "${Esc}[32m")
+  set(Yellow   "${Esc}[33m")
+  set(Blue     "${Esc}[34m")
+  set(Magenta  "${Esc}[35m")
+  set(Cyan     "${Esc}[36m")
+  set(White    "${Esc}[37m")
+  set(BRed     "${Esc}[1;31m")
+  set(BGreen   "${Esc}[1;32m")
+  set(BYellow  "${Esc}[1;33m")
+  set(BBlue    "${Esc}[1;34m")
+  set(BMagenta "${Esc}[1;35m")
+  set(BCyan    "${Esc}[1;36m")
+  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])
+#
+# Sets variables #prefix#_VERSION, #prefix#_GIT_VERSION, #prefix#_DATE, #prefix#_GIT_DATE
+function(get_git_version)
+  cmake_parse_arguments(ARGS "" "DEFAULT_VERSION;DEFAULT_DATE;OUTVAR_PREFIX" "" ${ARGN})
+
+  if(NOT ARGS_OUTVAR_PREFIX)
+    set(ARGS_OUTVAR_PREFIX PROJECT)
+  endif()
+
+  if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+    execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --dirty --match "v*"
+      OUTPUT_VARIABLE ${ARGS_OUTVAR_PREFIX}_GIT_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )
+    if(${ARGS_OUTVAR_PREFIX}_GIT_VERSION)
+      # cut first two characters "v-"
+      string(SUBSTRING ${${ARGS_OUTVAR_PREFIX}_GIT_VERSION} 1 -1 ${ARGS_OUTVAR_PREFIX}_GIT_VERSION)
+    endif()
+    execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%cd
+      OUTPUT_VARIABLE ${ARGS_OUTVAR_PREFIX}_GIT_DATE
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )
+  endif()
+
+  if(NOT ${ARGS_OUTVAR_PREFIX}_GIT_VERSION)
+    if(ARGS_DEFAULT_VERSION)
+      set(${ARGS_OUTVAR_PREFIX}_GIT_VERSION ${ARGS_DEFAULT_VERSION})
+    else()
+      set(${ARGS_OUTVAR_PREFIX}_GIT_VERSION 0.0.0.0)
+    endif()
+  endif()
+
+  if(NOT ${ARGS_OUTVAR_PREFIX}_GIT_DATE)
+    if(ARGS_DEFAULT_DATE)
+      set(${ARGS_OUTVAR_PREFIX}_GIT_DATE ${ARGS_DEFAULT_DATE})
+    else()
+      set(${ARGS_OUTVAR_PREFIX}_GIT_DATE "Thu Jan 1 00:00:00 1970 +0000")
+    endif()
+  endif()
+
+  string(REGEX MATCH "^([^-]*)" blubb ${${ARGS_OUTVAR_PREFIX}_GIT_VERSION})
+
+  # return values
+  set(${ARGS_OUTVAR_PREFIX}_VERSION ${CMAKE_MATCH_0} PARENT_SCOPE)
+  set(${ARGS_OUTVAR_PREFIX}_DATE ${${ARGS_OUTVAR_PREFIX}_GIT_DATE} PARENT_SCOPE)
+  set(${ARGS_OUTVAR_PREFIX}_GIT_VERSION ${${ARGS_OUTVAR_PREFIX}_GIT_VERSION} PARENT_SCOPE)
+  set(${ARGS_OUTVAR_PREFIX}_GIT_DATE ${${ARGS_OUTVAR_PREFIX}_GIT_DATE} PARENT_SCOPE)
+endfunction()
+
+
+# Set defaults
+macro(set_fairmq_defaults)
+  string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+  string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
+
+  # Set a default build type
+  if(NOT CMAKE_BUILD_TYPE)
+    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 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()
+
+  # Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+  # Define CMAKE_INSTALL_*DIR family of variables
+  include(GNUInstallDirs)
+
+  # Define install dirs
+  set(PROJECT_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
+  set(PROJECT_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
+  set(PROJECT_INSTALL_INCDIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME_LOWER})
+  set(PROJECT_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER})
+  set(PROJECT_INSTALL_CMAKEMODDIR ${PROJECT_INSTALL_DATADIR}/cmake)
+
+  # https://cmake.org/Wiki/CMake_RPATH_handling
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}" isSystemDir)
+  if("${isSystemDir}" STREQUAL "-1")
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+      set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-Wl,--enable-new-dtags")
+      set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-Wl,--enable-new-dtags")
+      set(CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+      set(CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
+    else()
+      set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}")
+    endif()
+  endif()
+
+  # 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" "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_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()
+endmacro()
+
+function(join VALUES GLUE OUTPUT)
+  string(REGEX REPLACE "([^\\]|^);" "\\1${GLUE}" _TMP_STR "${VALUES}")
+  string(REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping
+  set(${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
+endfunction()
+
+function(pad str width char out)
+  cmake_parse_arguments(ARGS "" "COLOR" "" ${ARGN})
+  string(LENGTH ${str} length)
+  if(ARGS_COLOR)
+    math(EXPR padding "${width}-(${length}-10*${ARGS_COLOR})")
+  else()
+    math(EXPR padding "${width}-${length}")
+  endif()
+  if(padding GREATER 0)
+    foreach(i RANGE ${padding})
+      set(str "${str}${char}")
+    endforeach()
+  endif()
+  set(${out} ${str} PARENT_SCOPE)
+endfunction()
+
+function(generate_package_dependencies)
+  join("${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES}" " " DEPS)
+  set(PACKAGE_DEPENDENCIES "\
+####### Expanded from @PACKAGE_DEPENDENCIES@ by configure_package_config_file() #######
+
+set(${PROJECT_NAME}_PACKAGE_DEPENDENCIES ${DEPS})
+
+")
+  foreach(dep IN LISTS PROJECT_INTERFACE_PACKAGE_DEPENDENCIES)
+    join("${PROJECT_INTERFACE_${dep}_COMPONENTS}" " " COMPS)
+    if(COMPS)
+      string(CONCAT PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} "\
+set(${PROJECT_NAME}_${dep}_COMPONENTS ${COMPS})
+")
+    endif()
+    if(PROJECT_INTERFACE_${dep}_VERSION)
+      string(CONCAT PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} "\
+set(${PROJECT_NAME}_${dep}_VERSION ${PROJECT_INTERFACE_${dep}_VERSION})
+")
+    endif()
+  endforeach()
+  string(CONCAT PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} "\
+
+#######################################################################################
+")
+set(PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} PARENT_SCOPE)
+endfunction()
+
+function(generate_package_components)
+  join("${PROJECT_PACKAGE_COMPONENTS}" " " COMPS)
+  set(PACKAGE_COMPONENTS "\
+####### Expanded from @PACKAGE_COMPONENTS@ by configure_package_config_file() #########
+
+set(${PROJECT_NAME}_PACKAGE_COMPONENTS ${COMPS})
+
+")
+  foreach(comp IN LISTS PROJECT_PACKAGE_COMPONENTS)
+    string(CONCAT PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} "\
+set(${PROJECT_NAME}_${comp}_FOUND TRUE)
+")
+  endforeach()
+  string(CONCAT PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} "\
+
+check_required_components(${PROJECT_NAME})
+")
+set(PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} PARENT_SCOPE)
+endfunction()
+
+# Configure/Install CMake package
+macro(install_cmake_package)
+  include(CMakePackageConfigHelpers)
+  set(PACKAGE_INSTALL_DESTINATION
+    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_GIT_VERSION}
+  )
+  if(BUILD_FAIRMQ)
+    install(EXPORT ${PROJECT_EXPORT_SET}
+      NAMESPACE ${PROJECT_NAME}::
+      DESTINATION ${PACKAGE_INSTALL_DESTINATION}
+      EXPORT_LINK_INTERFACE_LIBRARIES
+    )
+  endif()
+  write_basic_package_version_file(
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+    VERSION ${PROJECT_VERSION}
+    COMPATIBILITY AnyNewerVersion
+  )
+  generate_package_dependencies() # fills ${PACKAGE_DEPENDENCIES}
+  generate_package_components() # fills ${PACKAGE_COMPONENTS}
+  configure_package_config_file(
+    ${CMAKE_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+    INSTALL_DESTINATION ${PACKAGE_INSTALL_DESTINATION}
+    PATH_VARS CMAKE_INSTALL_PREFIX
+  )
+  install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+    DESTINATION ${PACKAGE_INSTALL_DESTINATION}
+  )
+endmacro()
+
+macro(find_package2 qualifier pkgname)
+  cmake_parse_arguments(ARGS "" "VERSION" "COMPONENTS" ${ARGN})
+
+  string(TOUPPER ${pkgname} pkgname_upper)
+  set(old_CPP ${CMAKE_PREFIX_PATH})
+  set(CMAKE_PREFIX_PATH ${${pkgname_upper}_ROOT} $ENV{${pkgname_upper}_ROOT} ${CMAKE_PREFIX_PATH})
+  if(ARGS_COMPONENTS)
+    find_package(${pkgname} ${ARGS_VERSION} QUIET COMPONENTS ${ARGS_COMPONENTS} ${ARGS_UNPARSED_ARGUMENTS})
+  else()
+    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 ${ARGS_VERSION})
+      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
+    elseif(${qualifier} STREQUAL PUBLIC)
+      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 ${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 ${ARGS_VERSION})
+      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
+    endif()
+  endif()
+endmacro()
--- a/cmake/FairMQPackage.cmake
+++ b/cmake/FairMQPackage.cmake
@ -1,68 +0,0 @@
-################################################################################
-# Copyright (C) 2018-2023 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_guard(GLOBAL)
-
-include(FairCMakeModules)
-include(FairFindPackage2)
-include(FairMQBundlePackageHelper)
-
-function(generate_package_components)
-  list(JOIN PROJECT_PACKAGE_COMPONENTS} " " COMPS)
-  set(PACKAGE_COMPONENTS "\
-####### Expanded from @PACKAGE_COMPONENTS@ by configure_package_config_file() #########
-
-set(${PROJECT_NAME}_PACKAGE_COMPONENTS ${COMPS})
-
-")
-  foreach(comp IN LISTS PROJECT_PACKAGE_COMPONENTS)
-    string(CONCAT PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} "\
-set(${PROJECT_NAME}_${comp}_FOUND TRUE)
-")
-  endforeach()
-  string(CONCAT PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} "\
-
-check_required_components(${PROJECT_NAME})
-")
-set(PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} PARENT_SCOPE)
-endfunction()
-
-# Configure/Install CMake package
-macro(install_cmake_package)
-  include(CMakePackageConfigHelpers)
-  set(PACKAGE_INSTALL_DESTINATION
-    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
-  )
-  if(BUILD_FAIRMQ)
-    install(EXPORT ${PROJECT_EXPORT_SET}
-      NAMESPACE ${PROJECT_NAME}::
-      DESTINATION ${PACKAGE_INSTALL_DESTINATION}
-      EXPORT_LINK_INTERFACE_LIBRARIES
-    )
-  endif()
-  write_basic_package_version_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-    VERSION ${PROJECT_VERSION}
-    COMPATIBILITY AnyNewerVersion
-  )
-  fair_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
-    INSTALL_DESTINATION ${PACKAGE_INSTALL_DESTINATION}
-    PATH_VARS CMAKE_INSTALL_PREFIX
-  )
-  install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-    DESTINATION ${PACKAGE_INSTALL_DESTINATION}
-  )
-endmacro()
--- a/cmake/FairMQProjectSettings.cmake
+++ b/cmake/FairMQProjectSettings.cmake
@ -1,189 +0,0 @@
-################################################################################
-# Copyright (C) 2018-2023 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_guard(GLOBAL)
-
-include(GNUInstallDirs)
-
-string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
-
-# Set a default build type
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo)
-endif()
-
-set(PROJECT_MIN_CXX_STANDARD 17)
-
-# Handle C++ standard level
-if(CMAKE_CXX_STANDARD AND CMAKE_CXX_STANDARD VERSION_LESS PROJECT_MIN_CXX_STANDARD)
-  message(FATAL_ERROR "A minimum CMAKE_CXX_STANDARD of ${PROJECT_MIN_CXX_STANDARD} is required.")
-endif()
-if(NOT DEFINED CMAKE_CXX_EXTENSIONS)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-endif()
-
-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()
-
-# Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
-set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
-
-# Define install dirs
-set(PROJECT_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
-set(PROJECT_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
-set(PROJECT_INSTALL_INCDIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME_LOWER})
-set(PROJECT_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER})
-set(PROJECT_INSTALL_CMAKEMODDIR ${PROJECT_INSTALL_DATADIR}/cmake)
-
-# https://cmake.org/Wiki/CMake_RPATH_handling
-if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
-endif()
-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}" isSystemDir)
-if("${isSystemDir}" STREQUAL "-1")
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    list(APPEND CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
-    list(APPEND CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags")
-    list(PREPEND CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    list(PREPEND CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
-  else()
-    list(PREPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}")
-  endif()
-endif()
-
-# Define export set, only one for now
-set(PROJECT_EXPORT_SET ${PROJECT_NAME}Targets)
-
-# Sanitizers
-set(_sanitizers "")
-
-option(ENABLE_SANITIZER_ADDRESS "Enable address sanitizer" FALSE)
-if(ENABLE_SANITIZER_ADDRESS)
-  list(APPEND _sanitizers "address")
-endif()
-
-option(ENABLE_SANITIZER_LEAK "Enable leak sanitizer" FALSE)
-if(ENABLE_SANITIZER_LEAK)
-  list(APPEND _sanitizers "leak")
-endif()
-
-option(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR "Enable undefined behavior sanitizer" FALSE)
-if(ENABLE_SANITIZER_UNDEFINED_BEHAVIOR)
-  list(APPEND _sanitizers "undefined")
-endif()
-
-option(ENABLE_SANITIZER_THREAD "Enable thread sanitizer" FALSE)
-if(ENABLE_SANITIZER_THREAD)
-  if("address" IN_LIST _sanitizers OR "leak" IN_LIST _sanitizers)
-    message(WARNING "Thread sanitizer does not work with Address and Leak sanitizer enabled")
-  else()
-    list(APPEND _sanitizers "thread")
-  endif()
-endif()
-
-option(ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" FALSE)
-if(ENABLE_SANITIZER_MEMORY AND CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
-  if("address" IN_LIST _sanitizers
-     OR "thread" IN_LIST _sanitizers
-     OR "leak" IN_LIST _sanitizers)
-    message(WARNING "Memory sanitizer does not work with Address, Thread and Leak sanitizer enabled")
-  else()
-    list(APPEND _sanitizers "memory")
-  endif()
-endif()
-
-list(JOIN _sanitizers "," _sanitizers)
-if(_sanitizers)
-  set(_sanitizers "-fsanitize=${_sanitizers}")
-endif()
-
-# Configure build types
-set(CMAKE_CONFIGURATION_TYPES "Debug" "Release" "RelWithDebInfo")
-set(_warnings "-Wshadow -Wall -Wextra -Wpedantic")
-set(CMAKE_CXX_FLAGS_DEBUG          "-Og -g ${_warnings} ${_sanitizers}")
-set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG")
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g ${_warnings} -DNDEBUG ${_sanitizers}")
-unset(_warnings)
-unset(_sanitizers)
-
-if(DISABLE_COLOR)
-  set(CMAKE_COLOR_MAKEFILE OFF)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=never")
-else()
-  set(CMAKE_COLOR_MAKEFILE ON)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
-endif()
-
-if(NOT DEFINED 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} "--extra-arg=-std=c++17")
-  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()
-
-if(CMAKE_GENERATOR STREQUAL Ninja AND ENABLE_CCACHE)
-  find_program(CCACHE ccache)
-  if(CCACHE)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
-  endif()
-endif()
-
-if(NOT DEFINED FAIRMQ_HAS_STD_FILESYSTEM)
-  if(   (    CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-         AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
-     OR (    CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
-         AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9))
-    set(FAIRMQ_HAS_STD_FILESYSTEM 0)
-  else()
-    set(FAIRMQ_HAS_STD_FILESYSTEM 1)
-  endif()
-endif()
-
-if(NOT DEFINED FAIRMQ_HAS_STD_PMR)
-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # Clang (to be more precise: libc++) currently does not implement <memory_resource>
-    set(FAIRMQ_HAS_STD_PMR 0)
-  else()
-    set(FAIRMQ_HAS_STD_PMR 1)
-  endif()
-endif()
--- a/cmake/FairMQSummary.cmake
+++ b/cmake/FairMQSummary.cmake
@ -1,105 +0,0 @@
-################################################################################
-# Copyright (C) 2018-2023 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_guard(GLOBAL)
-
-include(FairCMakeModules)
-include(FairFormattedOutput)
-include(FairSummary)
-
-macro(fairmq_summary_components)
-  message(STATUS "  ")
-  message(STATUS "  ${Cyan}COMPONENT         BUILT?  INFO${CR}")
-  if(BUILD_FAIRMQ)
-    set(fairmq_summary "${BGreen}YES${CR}    (default, disable with ${BMagenta}-DBUILD_FAIRMQ=OFF${CR})")
-  else()
-    set(fairmq_summary "${BRed} NO${CR}    (enable with ${BMagenta}-DBUILD_FAIRMQ=ON${CR})")
-  endif()
-  message(STATUS "  ${BWhite}fairmq${CR}             ${fairmq_summary}")
-  if(BUILD_TESTING)
-    set(tests_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_TESTING=OFF${CR})")
-  else()
-    set(tests_summary "${BRed} NO${CR}    (default, enable with ${BMagenta}-DBUILD_TESTING=ON${CR})")
-  endif()
-  message(STATUS "  ${BWhite}tests${CR}              ${tests_summary}")
-  if(BUILD_EXAMPLES)
-    set(examples_summary "${BGreen}YES${CR}    (default, disable with ${BMagenta}-DBUILD_EXAMPLES=OFF${CR})")
-  else()
-    set(examples_summary "${BRed} NO${CR}    (enable with ${BMagenta}-DBUILD_EXAMPLES=ON${CR})")
-  endif()
-  message(STATUS "  ${BWhite}examples${CR}           ${examples_summary}")
-  if(BUILD_DOCS)
-    set(docs_summary "${BGreen}YES${CR}    (disable with ${BMagenta}-DBUILD_DOCS=OFF${CR})")
-  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_TIDY_TOOL)
-    set(sdk_tidy_summary "${BGreen}YES${CR}    EXPERIMENTAL (disable with ${BMagenta}-DBUILD_TIDY_TOOL=OFF${CR})")
-  else()
-    set(sdk_tidy_summary "${BRed} NO${CR}    EXPERIMENTAL (default, enable with ${BMagenta}-DBUILD_TIDY_TOOL=ON${CR})")
-  endif()
-  message(STATUS "  ${BWhite}tidy_tool${CR}          ${sdk_tidy_summary}")
-endmacro()
-
-macro(fairmq_summary_static_analysis)
-  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} NO${CR}  (default, enable with ${BMagenta}-DRUN_STATIC_ANALYSIS=ON${CR})")
-  endif()
-  message(STATUS "  ${Cyan}RUN STATIC ANALYSIS  ${static_ana_summary}")
-  if(BUILD_TIDY_TOOL)
-    if(RUN_FAIRMQ_TIDY)
-      set(tidy_summary "${BGreen}YES${CR}  (disable with ${BMagenta}-DRUN_FAIRMQ_TIDY=OFF${CR})")
-    else()
-      set(tidy_summary "${BRed} NO${CR}  (default, enable with ${BMagenta}-DRUN_FAIRMQ_TIDY=ON${CR})")
-    endif()
-    message(STATUS "  ${Cyan}RUN fairmq-tidy      ${tidy_summary}")
-  endif()
-endmacro()
-
-macro(fairmq_summary_install_prefix)
-  message(STATUS "  ")
-  message(STATUS "  ${Cyan}INSTALL PREFIX${CR}     ${BGreen}${CMAKE_INSTALL_PREFIX}${CR} (change with ${BMagenta}-DCMAKE_INSTALL_PREFIX=...${CR})")
-endmacro()
-
-macro(fairmq_summary_debug_mode)
-  message(STATUS "  ")
-  if(FAIRMQ_DEBUG_MODE)
-    message(STATUS "  ${Cyan}DEBUG MODE${CR}         ${BGreen}${FAIRMQ_DEBUG_MODE}${CR} (disable with ${BMagenta}-DFAIRMQ_DEBUG_MODE=OFF${CR})")
-  else()
-    message(STATUS "  ${Cyan}DEBUG MODE${CR}         ${BRed}${FAIRMQ_DEBUG_MODE}${CR} (enable with ${BMagenta}-DFAIRMQ_DEBUG_MODE=ON${CR})")
-  endif()
-endmacro()
-
-macro(fairmq_summary_compile_definitions)
-  message(STATUS "  ")
-  message(STATUS "  ${Cyan}COMPILE DEFINITION               VALUE${CR}")
-  message(STATUS "  ${BWhite}FAIRMQ_HAS_STD_FILESYSTEM${CR}        ${FAIRMQ_HAS_STD_FILESYSTEM}  (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_FILESYSTEM=0|1${CR})")
-  message(STATUS "  ${BWhite}FAIRMQ_HAS_STD_PMR${CR}               ${FAIRMQ_HAS_STD_PMR}  (overridable with ${BMagenta}-DFAIRMQ_HAS_STD_PMR=0|1${CR})")
-  if(DEFINED FAIRMQ_CHANNEL_DEFAULT_AUTOBIND)
-    message(STATUS "  ${BWhite}FAIRMQ_CHANNEL_DEFAULT_AUTOBIND${CR}  ${FAIRMQ_CHANNEL_DEFAULT_AUTOBIND}")
-  endif()
-endmacro()
--- a/cmake/FairMQTidy.cmake
+++ b/cmake/FairMQTidy.cmake
@ -1,103 +0,0 @@
-################################################################################
-#    Copyright (C) 2021 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_guard(GLOBAL)
-
-#[=======================================================================[.rst:
-
-``fairmq_target_tidy()``
-========================
-
-Runs the FairMQ static analyzer ``fairmq-tidy`` on source files in given
-target.
-
-.. code-block:: cmake
-
-  fairmq_target_tidy(TARGET <target> [EXTRA_ARGS <args>]
-                    [CLANG_EXECUTABLE <clang>])
-
-Registers a custom command that depends on ``<target>`` which runs ``fairmq-tidy``
-on the source files that belong to ``<target>``. Optional extra arguments
-``<args>`` are passed to the ``fairmq-tidy`` command-line.
-
-Requires ``CMAKE_EXPORT_COMPILE_COMMANDS`` to be enabled.
-
-#]=======================================================================]
-
-function(fairmq_target_tidy)
-  cmake_parse_arguments(PARSE_ARGV 0 ARG "" "TARGET;EXTRA_ARGS;CLANG_EXECUTABLE" "")
-
-  if(NOT CMAKE_EXPORT_COMPILE_COMMANDS)
-    message(AUTHOR_WARNING "CMAKE_EXPORT_COMPILE_COMMANDS is not enabled. Skipping.")
-    return()
-  endif()
-
-  if(NOT ARG_TARGET)
-    message(AUTHOR_WARNING "TARGET argument is required. Skipping.")
-    return()
-  endif()
-
-  if(NOT TARGET ${ARG_TARGET})
-    message(AUTHOR_WARNING "Given TARGET argument `${ARG_TARGET}` is not a target. Skipping.")
-    return()
-  endif()
-
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    if(NOT fairmq_tidy_clang_resource_dir)
-      if(ARG_CLANG_EXECUTABLE)
-        set(clang_exe ${ARG_CLANG_EXECUTABLE})
-      else()
-        if(TARGET clang)
-          get_property(clang_exe TARGET clang PROPERTY LOCATION)
-        else()
-          set(clang_exe "clang")
-        endif()
-      endif()
-      execute_process(
-        COMMAND ${clang_exe} -print-resource-dir
-        OUTPUT_VARIABLE clang_resource_dir
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-      set(fairmq_tidy_clang_resource_dir ${clang_resource_dir}
-        CACHE PATH "fairmq_target_tidy() internal state" FORCE)
-    endif()
-    list(APPEND ARG_EXTRA_ARGS
-      "--extra-arg-before=-I${fairmq_tidy_clang_resource_dir}/include")
-  endif()
-
-  if(ARG_EXTRA_ARGS)
-    set(extra 1)
-  else()
-    set(extra 0)
-  endif()
-
-  get_target_property(sources ${ARG_TARGET} SOURCES)
-  list(FILTER sources INCLUDE REGEX "\.(cpp|cxx)$")
-  string(REPLACE ":" "-" target_nocolon "${ARG_TARGET}")
-
-  set(src_deps)
-  foreach(source IN LISTS sources)
-    string(REPLACE "\/" "-" source_noslash "${source}")
-    set(src_stamp "${CMAKE_CURRENT_BINARY_DIR}/${target_nocolon}-${source_noslash}.fairmq-tidy")
-    add_custom_command(
-      OUTPUT ${src_stamp}
-      COMMAND $<TARGET_FILE:FairMQ::fairmq-tidy> -p=${CMAKE_BINARY_DIR}
-              $<${extra}:${ARG_EXTRA_ARGS}> ${source}
-      COMMAND ${CMAKE_COMMAND} -E touch ${src_stamp}
-      COMMENT "fairmq-tidy: Analyzing source file '${source}' of target '${ARG_TARGET}'"
-      DEPENDS ${ARG_TARGET}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      COMMAND_EXPAND_LISTS VERBATIM
-    )
-    list(APPEND src_deps ${src_stamp})
-  endforeach()
-
-  if(src_deps)
-    add_custom_target("fairmq-tidy-${target_nocolon}" ALL DEPENDS ${src_deps})
-  endif()
-endfunction()
--- 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/FindPicoSHA2.cmake
+++ b/cmake/FindPicoSHA2.cmake
@ -1,21 +0,0 @@
-################################################################################
-#    Copyright (C) 2020 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(PicoSHA2_INCLUDE_DIR NAMES picosha2.h)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PicoSHA2
-  REQUIRED_VARS PicoSHA2_INCLUDE_DIR
-)
-
-if(PicoSHA2_FOUND)
-  add_library(PicoSHA2 INTERFACE IMPORTED)
-  set_target_properties(PicoSHA2 PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${PicoSHA2_INCLUDE_DIR}"
-  )
-endif()
--- a/cmake/Findasio.cmake
+++ b/cmake/Findasio.cmake
@ -1,46 +0,0 @@
-################################################################################
-# Copyright (C) 2019-2021 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(asio_INCLUDE_DIR
-  NAMES asio.hpp
-  PATH_SUFFIXES include
-)
-
-if(asio_INCLUDE_DIR)
-  find_file(asio_VERSION_HEADER "asio/version.hpp"
-    ${asio_INCLUDE_DIR}
-    NO_DEFAULT_PATH
-  )
-endif()
-
-if(asio_VERSION_HEADER)
-  file(READ "${asio_VERSION_HEADER}" _asio_VERSION_HEADER_CONTENT)
-  string(REGEX MATCH "#define ASIO_VERSION ([0-9]+)" _MATCH "${_asio_VERSION_HEADER_CONTENT}")
-  set(asio_VERSION_MACRO ${CMAKE_MATCH_1})
-  math(EXPR asio_VERSION_MAJOR "${asio_VERSION_MACRO} / 100000")
-  math(EXPR asio_VERSION_MINOR "${asio_VERSION_MACRO} / 100 % 1000")
-  math(EXPR asio_VERSION_PATCH "${asio_VERSION_MACRO} % 100")
-  set(asio_VERSION "${asio_VERSION_MAJOR}.${asio_VERSION_MINOR}.${asio_VERSION_PATCH}")
-endif()
-
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(asio
-  REQUIRED_VARS asio_INCLUDE_DIR
-  VERSION_VAR asio_VERSION
-  HANDLE_COMPONENTS
-)
-
-if(asio_FOUND AND NOT TARGET asio::asio)
-  add_library(asio::asio INTERFACE IMPORTED)
-  set_target_properties(asio::asio PROPERTIES
-    INTERFACE_COMPILE_DEFINITIONS "ASIO_STANDALONE"
-    INTERFACE_INCLUDE_DIRECTORIES "${asio_INCLUDE_DIR}"
-  )
-endif()
-
--- a/cmake/GTestHelper.cmake
+++ b/cmake/GTestHelper.cmake
@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2017-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2017-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@ -20,7 +20,6 @@
 #                        [DEPENDS dep1 [dep2 ...]]
 #                        [LINKS linklib1 [linklib2 ...]
 #                        [INCLUDES dir1 [dir2 ...]
-#                        [ENVIRONMENT var1=op:val1[;var2=op:val2 ...]]
 #                        [TIMEOUT seconds]
 #                        [RUN_SERIAL ON/OFF])
 #
@ -48,16 +47,11 @@
 #
 #

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

@ -78,31 +72,14 @@ function(add_testsuite suitename)
    if(testsuite_DEFINITIONS)
        target_compile_definitions("${target}" PUBLIC ${testsuite_DEFINITIONS})
    endif()
-    if(testsuite_ENVIRONMENT AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
-        set(env "ENVIRONMENT_MODIFICATION" ${testsuite_ENVIRONMENT})
-    endif()
-    if(BUILD_TIDY_TOOL AND RUN_FAIRMQ_TIDY)
-      fairmq_target_tidy(TARGET ${target})
-    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}
-                 ${env}
-    )

    list(APPEND ALL_TEST_TARGETS ${target})
    set(ALL_TEST_TARGETS ${ALL_TEST_TARGETS} PARENT_SCOPE)
@ -131,9 +108,6 @@ function(add_testhelper helpername)
    if(testhelper_DEFINITIONS)
        target_compile_definitions(${target} PUBLIC ${testhelper_DEFINITIONS})
    endif()
-    if(BUILD_TIDY_TOOL AND RUN_FAIRMQ_TIDY)
-      fairmq_target_tidy(TARGET ${target})
-    endif()

    list(APPEND ALL_TEST_TARGETS ${target})
    set(ALL_TEST_TARGETS ${ALL_TEST_TARGETS} PARENT_SCOPE)
@ -168,9 +142,6 @@ function(add_testlib libname)
    if(testlib_DEFINITIONS)
        target_compile_definitions(${target} PUBLIC ${testlib_DEFINITIONS})
    endif()
-    if(BUILD_TIDY_TOOL AND RUN_FAIRMQ_TIDY)
-      fairmq_target_tidy(TARGET ${target})
-    endif()

    list(APPEND ALL_TEST_TARGETS ${target})
    set(ALL_TEST_TARGETS ${ALL_TEST_TARGETS} PARENT_SCOPE)
--- a/cmake/GitHelper.cmake
+++ b/cmake/GitHelper.cmake
@ -1,65 +0,0 @@
-################################################################################
-# Copyright (C) 2018-2021 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_guard(GLOBAL)
-
-if(NOT DEFINED ${GIT_EXECUTABLE})
-  find_program(GIT_EXECUTABLE NAMES git)
-endif()
-
-# get_git_version([DEFAULT_VERSION version] [DEFAULT_DATE date] [OUTVAR_PREFIX prefix])
-#
-# Sets variables #prefix#_VERSION, #prefix#_GIT_VERSION, #prefix#_DATE, #prefix#_GIT_DATE
-function(get_git_version)
-  cmake_parse_arguments(ARGS "" "DEFAULT_VERSION;DEFAULT_DATE;OUTVAR_PREFIX" "" ${ARGN})
-
-  if(NOT ARGS_OUTVAR_PREFIX)
-    set(ARGS_OUTVAR_PREFIX PROJECT)
-  endif()
-
-  if(GIT_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
-    execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --dirty --match "v*"
-      OUTPUT_VARIABLE ${ARGS_OUTVAR_PREFIX}_GIT_VERSION
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    )
-    if(${ARGS_OUTVAR_PREFIX}_GIT_VERSION)
-      # cut first two characters "v-"
-      string(SUBSTRING ${${ARGS_OUTVAR_PREFIX}_GIT_VERSION} 1 -1 ${ARGS_OUTVAR_PREFIX}_GIT_VERSION)
-    endif()
-    execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%cd
-      OUTPUT_VARIABLE ${ARGS_OUTVAR_PREFIX}_GIT_DATE
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    )
-  endif()
-
-  if(NOT ${ARGS_OUTVAR_PREFIX}_GIT_VERSION)
-    if(ARGS_DEFAULT_VERSION)
-      set(${ARGS_OUTVAR_PREFIX}_GIT_VERSION ${ARGS_DEFAULT_VERSION})
-    else()
-      set(${ARGS_OUTVAR_PREFIX}_GIT_VERSION 0.0.0.0)
-    endif()
-  endif()
-
-  if(NOT ${ARGS_OUTVAR_PREFIX}_GIT_DATE)
-    if(ARGS_DEFAULT_DATE)
-      set(${ARGS_OUTVAR_PREFIX}_GIT_DATE ${ARGS_DEFAULT_DATE})
-    else()
-      set(${ARGS_OUTVAR_PREFIX}_GIT_DATE "Thu Jan 1 00:00:00 1970 +0000")
-    endif()
-  endif()
-
-  string(REGEX MATCH "^([^-]*)" blubb ${${ARGS_OUTVAR_PREFIX}_GIT_VERSION})
-
-  # return values
-  set(${ARGS_OUTVAR_PREFIX}_VERSION ${CMAKE_MATCH_0} PARENT_SCOPE)
-  set(${ARGS_OUTVAR_PREFIX}_DATE ${${ARGS_OUTVAR_PREFIX}_GIT_DATE} PARENT_SCOPE)
-  set(${ARGS_OUTVAR_PREFIX}_GIT_VERSION ${${ARGS_OUTVAR_PREFIX}_GIT_VERSION} PARENT_SCOPE)
-  set(${ARGS_OUTVAR_PREFIX}_GIT_DATE ${${ARGS_OUTVAR_PREFIX}_GIT_DATE} PARENT_SCOPE)
-endfunction()
--- a/cmake/cotire.cmake
+++ b/cmake/cotire.cmake
--- a/codemeta.json
+++ b/codemeta.json
@ -1,122 +0,0 @@
-{
-  "@context": "https://doi.org/10.5063/schema/codemeta-2.0",
-  "@type": "SoftwareSourceCode",
-  "name": "FairMQ",
-  "description": "C++ Message Queuing Library and Framework",
-  "license": "./COPYRIGHT",
-  "datePublished": "2018-04-15",
-  "developmentStatus": "active",
-  "softwareVersion": "master",
-  "releaseNotes": "https://github.com/FairRootGroup/FairMQ/releases",
-  "codeRepository": "https://github.com/FairRootGroup/FairMQ/",
-  "readme": "https://github.com/FairRootGroup/FairMQ/#readme",
-  "issueTracker": "https://github.com/FairRootGroup/FairMQ/issues",
-  "identifier": "https://doi.org/10.5281/zenodo.1689985",
-  "maintainer": [
-    {
-      "@type": "ResearchOrganisation",
-      "@id": "https://ror.org/02k8cbn47",
-      "name": "GSI Helmholtz Centre for Heavy Ion Research"
-    }
-  ],
-  "author": [
-    {
-      "@type": "Person",
-      "@id": "https://orcid.org/0000-0002-8071-4497",
-      "givenName": "Mohammad",
-      "familyName": "Al-Turany"
-    },
-    {
-      "@type": "Person",
-      "@id": "https://orcid.org/0000-0003-3787-1910",
-      "givenName": "Dennis",
-      "familyName": "Klein"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Thorsten",
-      "familyName": "Kollegger"
-    },
-    {
-      "@type": "Person",
-      "@id": "https://orcid.org/0000-0002-6249-155X",
-      "givenName": "Alexey",
-      "familyName": "Rybalchenko"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Nicolas",
-      "familyName": "Winckler"
-    }
-  ],
-  "contributor": [
-    {
-      "@type": "Person",
-      "givenName": "Laurent",
-      "familyName": "Aphecetche"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Sebastien",
-      "familyName": "Binet"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Giulio",
-      "familyName": "Eulisse"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Radoslaw",
-      "familyName": "Karabowicz"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Matthias",
-      "familyName": "Kretz",
-      "email": "kretz@kde.org"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Mikolaj",
-      "familyName": "Krzewicki"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Andrey",
-      "familyName": "Lebedev"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Teo",
-      "familyName": "Mrnjavac",
-      "email": "teo.m@cern.ch"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Gvozden",
-      "familyName": "Neskovic"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Matthias",
-      "familyName": "Richter"
-    },
-    {
-      "@type": "Person",
-      "@id": "https://orcid.org/0000-0002-5321-8404",
-      "givenName": "Christian",
-      "familyName": "Tacke"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Florian",
-      "familyName": "Uhlig"
-    },
-    {
-      "@type": "Person",
-      "givenName": "Sandro",
-      "familyName": "Wenzel"
-    }
-  ]
-}
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@ -4,35 +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 `<fairmq/runDevice.h>`)) |
-| `file-severity` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<fairmq/runDevice.h>`)) |
-| `verbosity` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<fairmq/runDevice.h>`)) |
-| `color` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<fairmq/runDevice.h>`)) |
-| `log-to-file` | immidiately (if `fair::mq::DeviceRunner` is used (also the case when using `<fairmq/runDevice.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` |
-| `shm-segment-size` | at the end of `fair::mq::State::InitializingDevice` |
-| `shm-monitor` | 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

@ -60,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
                            }
                        ]
@ -84,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/Development.md
+++ b/docs/Development.md
@ -6,53 +6,8 @@

 For unit testing it is often not feasible to boot up a full-blown distributed system with dozens of processes.

-In some scenarios it is useful to not even instantiate a `fair::mq::Device` at all. Please see [this example](../test/protocols/_push_pull_multipart.cxx) for single and multi threaded unit test without a device instance. If you store your transport factories and channels on the heap, pls make sure, you destroy the channels before you destroy the related transport factory for proper shutdown. Channels provide all the `Send/Receive` and `New*Message/New*Poller` APIs provided by the device too.
+In some scenarios it is useful to not even instantiate a `FairMQDevice` at all. Please see [this example](../test/protocols/_push_pull_multipart.cxx) for single and multi threaded unit test without a device instance. If you store your transport factories and channels on the heap, pls make sure, you destroy the channels before you destroy the related transport factory for proper shutdown. Channels provide all the `Send/Receive` and `New*Message/New*Poller` APIs provided by the device too.

-## 4.2 Static Analysis
-
-With `-DBUILD_TIDY_TOOL=ON` you can build the `fairmq-tidy` tool that implements static checks on your source code. To use it, enable the generation of a [compilation database](https://clang.llvm.org/docs/JSONCompilationDatabase.html) in your project via `-DCMAKE_EXPORT_COMPILE_COMMANDS=ON` (generates a file `<builddir>/compile_commands.json`):
-
-```
-fairmq-tidy -p <builddir> mysourcefile.cpp
-```
-
-If you find any issue (e.g. false positives) with this tool, please tell us by opening an issue on github.
-
-### 4.2.1 CMake Integration
-
-When discovering a FairMQ installation in your project, explicitely state, that you want one with the `fairmq-tidy` tool included:
-
-```
-find_package(FairMQ COMPONENTS tidy_tool)
-```
-
-Now the CMake module [`FairMQTidy.cmake`](../cmake/FairMQTidy.cmake) is available for inclusion:
-
-```
-include(FairMQTidy)
-```
-
-It provides the CMake function `fairmq_target_tidy()` which attaches appropriate `fairmq-tidy` build rules to each source file contained in the passed library or executable target, e.g. if you have an executable that uses FairMQ:
-
-```
-add_executable(myexe mysource1.cpp mysource2.cpp)
-target_link_libraries(myexe PRIVATE FairMQ::FairMQ)
-fairmq_target_tidy(TARGET myexe)
-```
-
-### 4.2.2 Extra Compiler Arguments
-
-On most Linux distros you are likely to use GCC to compile your projects, so the resulting `compile_commands.json` contains the command-line tuned for GCC which might be missing options needed to successfully invoke the Clang frontend which is used internally by `fairmq-tidy`. In general, you can pass extra `clang` options via the following options:
-
-```
-  --extra-arg=<string>        - Additional argument to append to the compiler command line
-  --extra-arg-before=<string> - Additional argument to prepend to the compiler command line
-```
-
-E.g. if standard headers are not found, you can hint the location like this:
-
-```
-fairmq-top -p <builddir> --extra-arg-before=-I$(clang -print-resource-dir)/include mysourcefile.cpp
-```
+TODO Multiple devices in one process.

 ← [Back](../README.md)
--- a/docs/Device.md
+++ b/docs/Device.md
@ -2,7 +2,7 @@

 # 1. Device

-The components encapsulating the tasks are called **devices** and derive from the common base class `fair::mq::Device`. FairMQ provides ready to use devices to organize the dataflow between the components (without touching the contents of a message), providing functionality like merging and splitting of the data stream (see subdirectory `devices`).
+The components encapsulating the tasks are called **devices** and derive from the common base class `FairMQDevice`. FairMQ provides ready to use devices to organize the dataflow between the components (without touching the contents of a message), providing functionality like merging and splitting of the data stream (see subdirectory `devices`).

 ## 1.1 Topology

@ -18,28 +18,27 @@ Topology configuration is currently happening via setup scripts. This is very ru

 ## 1.2 Communication Patterns

-FairMQ devices communicate via the communication patterns offered by ZeroMQ: PUSH-PULL, PUB-SUB, REQ-REP, PAIR, [more info here](http://api.zeromq.org/4-0:zmq-socket). Each transport may provide further patterns.
+FairMQ devices communicate via the communication patterns offered by ZeroMQ (or nanomsg): PUSH-PULL, PUB-SUB, REQ-REP, PAIR, [more info here](http://api.zeromq.org/4-0:zmq-socket). Each transport may provide further patterns.

 ## 1.3 State Machine

 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,61 +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
-                                        'libfairmq-plugin-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 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 experimental plugin has been last released in v1.4.56 and is removed in v1.5+. For now there are no plans to pick up development of it again.
-
-← [Back](../README.md)
--- a/docs/Transport.md
+++ b/docs/Transport.md
@ -2,7 +2,7 @@

 # 2. Transport Interface

-The communication layer is available through the transport interface. Three interface implementations are currently available. Main implementation uses the [ZeroMQ](http://zeromq.org) library. Second transport implementation is using shared memory via boost::interprocess & ZeroMQ combination.
+The communication layer is available through the transport interface. Three interface implementations are currently available. Main implementation uses the [ZeroMQ](http://zeromq.org) library. Alternative implementation relies on the [nanomsg](http://nanomsg.org) library. Third transport implementation is using shared memory via boost::interprocess & ZeroMQ combination.

 Here is an overview to give an idea how the interface is implemented:

@ -10,51 +10,51 @@ Here is an overview to give an idea how the interface is implemented:

 Currently, the transports have been tested to work with these communication patterns:

-|               | zeromq | shmem |
-| ------------- |--------| ----- |
-| PAIR          | yes    | yes   |
-| PUSH/PULL     | yes    | yes   |
-| PUB/SUB       | yes    | no    |
-| REQ/REP       | yes    | yes   |
+|               | zeromq | nanomsg | shmem |
+| ------------- |--------| ------- | ----- |
+| PAIR          | yes    | yes     | yes   |
+| PUSH/PULL     | yes    | yes     | yes   |
+| PUB/SUB       | yes    | yes     | no    |
+| REQ/REP       | yes    | yes     | yes   |

 The next table shows the supported address types for each transport implementation:

-|             | zeromq | shmem | comment                                       |
-| ----------- | ------ | ----- | --------------------------------------------- |
-| `inproc://` | yes    | yes   | in process: useful for unit testing           |
-| `ipc://`    | yes    | yes   | inter process comm: useful on single machine  |
-| `tcp://`    | yes    | yes   | useful for any communication, local or remote |
+|             | zeromq | nanomsg | shmem | comment                                       |
+| ----------- | ------ | ------- | ----- | --------------------------------------------- |
+| `inproc://` | yes    | yes     | yes   | in process: useful for unit testing           |
+| `ipc://`    | yes    | yes     | yes   | inter process comm: useful on single machine  |
+| `tcp://`    | yes    | yes     | yes   | useful for any communication, local or remote |

 ## 2.1 Message

-Devices transport data between each other in form of `fair::mq::Message`s. These can be filled with arbitrary content. Message can be initialized in three different ways by calling `NewMessage()`:
+Devices transport data between each other in form of `FairMQMessage`s. These can be filled with arbitrary content. Message can be initialized in three different ways by calling `NewMessage()`:

 ```cpp
-fair::mq::MessagePtr NewMessage() const;
+FairMQMessagePtr NewMessage() const;
 ```
 **with no parameters**: Initializes an empty message (typically used for receiving).

 ```cpp
-fair::mq::MessagePtr NewMessage(const size_t size) const;
+FairMQMessagePtr NewMessage(const size_t size) const;
 ```
 **given message size**: Initializes message body with a given size. Fill the created contents via buffer pointer.

 ```cpp
 using fairmq_free_fn = void(void* data, void* hint);
-fair::mq::MessagePtr NewMessage(void* data, const size_t size, fairmq_free_fn* ffn, void* hint = nullptr) const;
+FairMQMessagePtr NewMessage(void* data, const size_t size, fairmq_free_fn* ffn, void* hint = nullptr) const;
 ```
 **given existing buffer and a size**: Initialize the message from an existing buffer. In case of ZeroMQ this is a zero-copy operation.

 Additionally, FairMQ provides two more message factories for convenience:
 ```cpp
 template<typename T>
-fair::mq::MessagePtr NewSimpleMessage(const T& data) const
+FairMQMessagePtr NewSimpleMessage(const T& data) const
 ```
 **copy and own**: Copy the `data` argument into the returned message and take ownership (free memory after message is sent). This interface is useful for small, [trivially copyable](http://en.cppreference.com/w/cpp/concept/TriviallyCopyable) data.

 ```cpp
 template<typename T>
-fair::mq::MessagePtr NewStaticMessage(const T& data) const
+FairMQMessagePtr NewStaticMessage(const T& data) const
 ```
 **point to existing memory**: The returned message will point to the `data` argument, but not take ownership (someone else must destruct this variable). Make sure that `data` lives long enough to be successfully sent. This interface is most useful for third party managed, contiguous memory (Be aware of shallow types with internal pointer references! These will not be sent.)

@ -65,19 +65,19 @@ The component of a program, that is reponsible for the allocation or destruction
 After queuing a message for sending in FairMQ, the transport takes ownership over the message body and will free it with `free()` after it is no longer used. A callback can be passed to the message object, to be called instead of the destruction with `free()` (for initialization via buffer+size).

 ```cpp
-static void fair::mq::NoCleanup(void* /*data*/, void* /*obj*/) {}
+static void FairMQNoCleanup(void* /*data*/, void* /*obj*/) {}

 template<typename T>
-static void fair::mq::SimpleMsgCleanup(void* /*data*/, void* obj) { delete static_cast<T*>(obj); }
+static void FairMQSimpleMsgCleanup(void* /*data*/, void* obj) { delete static_cast<T*>(obj); }
 ```
-For convenience, two common deleter callbacks are already defined in the `fair::mq::TransportFactory` class to aid the user in controlling ownership of the data.
+For convenience, two common deleter callbacks are already defined in the `FairMQTransportFactory` class to aid the user in controlling ownership of the data.

 ## 2.2 Channel

 A channel represents a communication endpoint in FairMQ. Usage is similar to a traditional Unix network socket. A device usually contains a number of channels that can either listen for incoming connections from channels of other devices or they can connect to other listening channels. Channels are organized by a channel name and a subchannel index.

 ```cpp
-const fair::mq::Channel& GetChannel(const std::string& channelName, const int index = 0) const;
+const FairMQChannel& GetChannel(const std::string& channelName, const int index = 0) const;
 ```

 All subchannels with a common channel name need to be of the same transport type.
@ -87,7 +87,7 @@ All subchannels with a common channel name need to be of the same transport type
 A poller allows to wait on multiple channels either to receive or send a message.

 ```cpp
-fair::mq::PollerPtr NewPoller(const std::vector<const fair::mq::Channel*>& channels)
+FairMQPollerPtr NewPoller(const std::vector<const FairMQChannel*>& channels)
 ```
 **list channels**: This poller waits on all supplied channels. Currently, it is limited to channels of the same transport type only.

--- 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
@ -1,9 +1,65 @@
 ################################################################################
-# Copyright (C) 2014-2023 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"                       #
 ################################################################################

-add_example(NAME 1-1 DEVICE sampler sink)
+add_library(Example11Lib STATIC
+    "Sampler.cxx"
+    "Sampler.h"
+    "Sink.cxx"
+    "Sink.h"
+)
+
+target_link_libraries(Example11Lib PUBLIC FairMQ)
+
+add_executable(fairmq-ex-1-1-sampler runSampler.cxx)
+target_link_libraries(fairmq-ex-1-1-sampler PRIVATE Example11Lib)
+
+add_executable(fairmq-ex-1-1-sink runSink.cxx)
+target_link_libraries(fairmq-ex-1-1-sink PRIVATE Example11Lib)
+
+add_custom_target(Example11 DEPENDS fairmq-ex-1-1-sampler fairmq-ex-1-1-sink)
+
+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-1-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-1.sh)
+
+# test
+
+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: ")
+
+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: ")
+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: ")
+
+# install
+
+install(
+    TARGETS
+    fairmq-ex-1-1-sampler
+    fairmq-ex-1-1-sink
+
+    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-1-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-1.sh_install)
+
+install(
+    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-1.sh_install
+    DESTINATION ${PROJECT_INSTALL_BINDIR}
+    RENAME fairmq-start-ex-1-1.sh
+)
--- a/examples/1-1/README.md
+++ b/examples/1-1/README.md
@ -3,7 +3,7 @@

 A simple topology of two devices - **Sampler** and **Sink**. **Sampler** sends data to **Sink** via the **PUSH-PULL** pattern.

-`sampler.cxx` and `sink.cxx` configure and run the devices.
+`runSampler.cxx` and `runSink.cxx` configure and run the devices.

 The executables take two command line parameters: `--id` and `--channel-config`. The value of `--id` should be a unique identifier and the value for `--channel-config` is the configuration of the communication channel. .

--- a/examples/1-1/Sampler.cxx
+++ b/examples/1-1/Sampler.cxx
@ -0,0 +1,68 @@
+/********************************************************************************
+ * 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"                       *
+ ********************************************************************************/
+
+#include <thread> // this_thread::sleep_for
+#include <chrono>
+
+#include "Sampler.h"
+
+using namespace std;
+
+namespace example_1_1
+{
+
+Sampler::Sampler()
+    : fText()
+    , fMaxIterations(0)
+    , fNumIterations(0)
+{
+}
+
+void Sampler::InitTask()
+{
+    // Get the fText and fMaxIterations values from the command line options (via fConfig)
+    fText = fConfig->GetValue<string>("text");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
+}
+
+bool Sampler::ConditionalRun()
+{
+    // create a copy of the data with new(), that will be deleted after the transfer is complete
+    string* text = new string(fText);
+
+    // create message object with a pointer to the data buffer,
+    // its size,
+    // custom deletion function (called when transfer is done),
+    // and pointer to the object managing the data buffer
+    FairMQMessagePtr msg(NewMessage(const_cast<char*>(text->c_str()),
+                                    text->length(),
+                                    [](void* /*data*/, void* object) { delete static_cast<string*>(object); },
+                                    text));
+
+    LOG(info) << "Sending \"" << fText << "\"";
+
+    // 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, "data") < 0)
+    {
+        return false;
+    }
+    else if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations)
+    {
+        LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
+        return false;
+    }
+
+    return true;
+}
+
+Sampler::~Sampler()
+{
+}
+
+} // namespace example_1_1
--- a/examples/1-1/Sampler.h
+++ b/examples/1-1/Sampler.h
@ -0,0 +1,42 @@
+/********************************************************************************
+ *    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.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLE11SAMPLER_H
+#define FAIRMQEXAMPLE11SAMPLER_H
+
+#include <string>
+
+#include "FairMQDevice.h"
+
+namespace example_1_1
+{
+
+class Sampler : public FairMQDevice
+{
+  public:
+    Sampler();
+    virtual ~Sampler();
+
+  protected:
+    std::string fText;
+    uint64_t fMaxIterations;
+    uint64_t fNumIterations;
+
+    void InitTask() override;
+    bool ConditionalRun() override;
+};
+
+} // namespace example_1_1
+
+#endif /* FAIRMQEXAMPLE11SAMPLER_H */
--- a/examples/1-1/Sink.cxx
+++ b/examples/1-1/Sink.cxx
@ -0,0 +1,55 @@
+/********************************************************************************
+ *    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"                       *
+ ********************************************************************************/
+/**
+ * Sink.cxx
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#include "Sink.h"
+
+using namespace std;
+
+namespace example_1_1
+{
+
+Sink::Sink()
+    : fMaxIterations(0)
+    , fNumIterations(0)
+{
+    // register a handler for data arriving on "data" channel
+    OnData("data", &Sink::HandleData);
+}
+
+void Sink::InitTask()
+{
+    // Get the fMaxIterations value from the command line options (via fConfig)
+    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)
+bool Sink::HandleData(FairMQMessagePtr& msg, int /*index*/)
+{
+    LOG(info) << "Received: \"" << string(static_cast<char*>(msg->GetData()), msg->GetSize()) << "\"";
+
+    if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations)
+    {
+        LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
+        return false;
+    }
+
+    // return true if want to be called again (otherwise return false go to IDLE state)
+    return true;
+}
+
+Sink::~Sink()
+{
+}
+
+} // namespace example_1_1
--- a/examples/1-1/Sink.h
+++ b/examples/1-1/Sink.h
@ -0,0 +1,40 @@
+/********************************************************************************
+ *    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"                       *
+ ********************************************************************************/
+/**
+ * Sink.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLE11SINK_H
+#define FAIRMQEXAMPLE11SINK_H
+
+#include "FairMQDevice.h"
+
+namespace example_1_1
+{
+
+class Sink : public FairMQDevice
+{
+  public:
+    Sink();
+    virtual ~Sink();
+
+  protected:
+    virtual void InitTask();
+    bool HandleData(FairMQMessagePtr&, int);
+
+  private:
+    uint64_t fMaxIterations;
+    uint64_t fNumIterations;
+};
+
+} // namespace example_1_1
+
+#endif /* FAIRMQEXAMPLE11SINK_H */
--- a/examples/1-1/runSampler.cxx
+++ b/examples/1-1/runSampler.cxx
@ -0,0 +1,24 @@
+/********************************************************************************
+ *    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 "Sampler.h"
+
+namespace bpo = boost::program_options;
+
+void addCustomOptions(bpo::options_description& options)
+{
+    options.add_options()
+        ("text", bpo::value<std::string>()->default_value("Hello"), "Text to send out")
+        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
+}
+
+FairMQDevicePtr getDevice(const FairMQProgOptions& /*config*/)
+{
+    return new example_1_1::Sampler();
+}
--- a/examples/1-1/runSink.cxx
+++ b/examples/1-1/runSink.cxx
@ -6,20 +6,18 @@
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/

-#include <fairmq/Device.h>
-#include <fairmq/runDevice.h>
-
-#include <string>
-
-struct Sink : fair::mq::Device
-{
-    Sink() { OnData("data2", &Sink::HandleData); }
-    bool HandleData(fair::mq::MessagePtr& /*msg*/, int /*index*/) { return true; }
-};
+#include "runFairMQDevice.h"
+#include "Sink.h"

 namespace bpo = boost::program_options;
-void addCustomOptions(bpo::options_description&) {}
-std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)
+
+void addCustomOptions(bpo::options_description& options)
 {
-  return std::make_unique<Sink>();
+    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 FairMQProgOptions& /*config*/)
+{
+    return new example_1_1::Sink();
 }
--- a/examples/1-1/sampler.cxx
+++ b/examples/1-1/sampler.cxx
@ -1,69 +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 <fairmq/Device.h>
-#include <fairmq/runDevice.h>
-
-#include <string>
-
-namespace bpo = boost::program_options;
-
-struct Sampler : fair::mq::Device
-{
-    void InitTask() override
-    {
-        // Get the fText and fMaxIterations values from the command line options (via fConfig)
-        fText = fConfig->GetProperty<std::string>("text");
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-    }
-
-    bool ConditionalRun() override
-    {
-        // create a copy of the data with new(), that will be deleted after the transfer is complete
-        std::string* text = new std::string(fText);
-
-        // create message object with a pointer to the data buffer, its size,
-        // custom deletion function (called when transfer is done),
-        // and pointer to the object managing the data buffer
-        fair::mq::MessagePtr msg(NewMessage(
-            const_cast<char*>(text->c_str()),
-            text->length(),
-            [](void* /*data*/, void* object) { delete static_cast<std::string*>(object); },
-            text));
-
-        LOG(info) << "Sending \"" << fText << "\"";
-
-        // in case of error or transfer interruption, return false to go to the Ready state
-        // successfull transfer will return number of bytes transfered (can be 0 if sending an empty message).
-        if (Send(msg, "data") < 0) {
-            return false;
-        } else if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-            LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-            return false;
-        }
-
-        return true;
-    }
-
-  private:
-    std::string fText;
-    uint64_t fMaxIterations = 0;
-    uint64_t fNumIterations = 0;
-};
-
-void addCustomOptions(bpo::options_description& options)
-{
-    options.add_options()
-        ("text", bpo::value<std::string>()->default_value("Hello"), "Text to send out")
-        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
-}
-
-std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)
-{
-    return std::make_unique<Sampler>();
-}
--- a/examples/1-1/sink.cxx
+++ b/examples/1-1/sink.cxx
@ -1,58 +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 <fairmq/Device.h>
-#include <fairmq/runDevice.h>
-
-#include <string>
-
-namespace bpo = boost::program_options;
-
-struct Sink : fair::mq::Device
-{
-    Sink()
-    {
-        // register a handler for data arriving on "data" channel
-        OnData("data", &Sink::HandleData);
-    }
-
-    void InitTask() override
-    {
-        // Get the fMaxIterations value from the command line options (via fConfig)
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-    }
-
-    bool HandleData(fair::mq::MessagePtr& msg, int)
-    {
-        LOG(info) << "Received: \"" << std::string(static_cast<char*>(msg->GetData()), msg->GetSize()) << "\"";
-
-        if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-            LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-            return false;
-        }
-
-        // return true if you want the handler to be called again (otherwise return false go to the
-        // Ready state)
-        return true;
-    }
-
-  private:
-    uint64_t fMaxIterations = 0;
-    uint64_t fNumIterations = 0;
-};
-
-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)");
-}
-
-std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)
-{
-    return std::make_unique<Sink>();
-}
--- a/examples/1-1/test-ex-1-1.sh.in
+++ b/examples/1-1/test-ex-1-1.sh.in
@ -1,7 +1,5 @@
 #!/bin/bash

-set -e
-
 export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@

 transport="zeromq"
@ -10,24 +8,17 @@ if [[ $1 =~ ^[a-z]+$ ]]; then
    transport=$1
 fi

-session="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"
-chan="data"
-chanAddr="/tmp/fmq_$session""_""$chan""_""$transport"
-
 # setup a trap to kill everything if the test fails/timeouts
-trap 'set +e; kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SINK_PID; rm $chanAddr; exit 0' TERM
+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+=" --shm-segment-size 100000000"
-SAMPLER+=" --shm-monitor true"
 SAMPLER+=" --control static --color false"
 SAMPLER+=" --max-iterations 1"
-SAMPLER+=" --channel-config name=$chan,type=push,method=bind,address=ipc://$chanAddr,rateLogging=0"
+SAMPLER+=" --channel-config name=data,type=push,method=bind,address=tcp://*:5555,rateLogging=0"
@CMAKE_CURRENT_BINARY_DIR@/$SAMPLER &
 SAMPLER_PID=$!

@ -35,19 +26,12 @@ SINK="fairmq-ex-1-1-sink"
 SINK+=" --id sink1"
 SINK+=" --transport $transport"
 SINK+=" --verbosity veryhigh"
-SINK+=" --session $session"
-SINK+=" --shm-segment-size 100000000"
-SINK+=" --shm-monitor true"
 SINK+=" --control static --color false"
 SINK+=" --max-iterations 1"
-SINK+=" --channel-config name=$chan,type=pull,method=connect,address=ipc://$chanAddr,rateLogging=0"
+SINK+=" --channel-config name=data,type=pull,method=connect,address=tcp://localhost:5555,rateLogging=0"
@CMAKE_CURRENT_BINARY_DIR@/$SINK &
 SINK_PID=$!

 # wait for sampler and sink to finish
 wait $SAMPLER_PID
 wait $SINK_PID
-
-set +e
-rm $chanAddr
-exit 0
--- a/examples/1-n-1/CMakeLists.txt
+++ b/examples/1-n-1/CMakeLists.txt
@ -1,9 +1,80 @@
 ################################################################################
-# Copyright (C) 2014-2023 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"                       #
 ################################################################################

-add_example(NAME 1-n-1 DEVICE sampler processor sink CONFIG)
+add_library(Example1N1Lib STATIC
+    "Sampler.cxx"
+    "Sampler.h"
+    "Processor.cxx"
+    "Processor.h"
+    "Sink.cxx"
+    "Sink.h"
+)
+
+target_link_libraries(Example1N1Lib PUBLIC FairMQ)
+
+add_executable(fairmq-ex-1-n-1-sampler runSampler.cxx)
+target_link_libraries(fairmq-ex-1-n-1-sampler PRIVATE Example1N1Lib)
+
+add_executable(fairmq-ex-1-n-1-processor runProcessor.cxx)
+target_link_libraries(fairmq-ex-1-n-1-processor PRIVATE Example1N1Lib)
+
+add_executable(fairmq-ex-1-n-1-sink runSink.cxx)
+target_link_libraries(fairmq-ex-1-n-1-sink PRIVATE Example1N1Lib)
+
+add_custom_target(Example1N1 DEPENDS fairmq-ex-1-n-1-sampler fairmq-ex-1-n-1-processor fairmq-ex-1-n-1-sink)
+
+set(EX_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(EX_CONF_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-1-n-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-n-1.sh)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-1-n-1.json ${CMAKE_CURRENT_BINARY_DIR}/ex-1-n-1.json)
+
+# test
+
+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: ")
+
+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: ")
+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: ")
+
+# install
+
+install(
+    TARGETS
+    fairmq-ex-1-n-1-sampler
+    fairmq-ex-1-n-1-processor
+    fairmq-ex-1-n-1-sink
+
+    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(EX_CONF_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_DATADIR})
+set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-1-n-1.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-n-1.sh_install)
+
+install(
+    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-1-n-1.sh_install
+    DESTINATION ${PROJECT_INSTALL_BINDIR}
+    RENAME fairmq-start-ex-1-n-1.sh
+)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-1-n-1.json
+    DESTINATION ${PROJECT_INSTALL_DATADIR}
+)
--- a/examples/1-n-1/Processor.cxx
+++ b/examples/1-n-1/Processor.cxx
@ -0,0 +1,53 @@
+/********************************************************************************
+ *    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 "Processor.h"
+
+#include <string>
+
+using namespace std;
+
+namespace example_1_n_1
+{
+
+Processor::Processor()
+{
+    OnData("data1", &Processor::HandleData);
+}
+
+bool Processor::HandleData(FairMQMessagePtr& msg, int /*index*/)
+{
+    LOG(info) << "Received data, processing...";
+
+    // Modify the received string
+    string* text = new std::string(static_cast<char*>(msg->GetData()), msg->GetSize());
+    *text += " (modified by " + fId + ")";
+
+    // create message object with a pointer to the data buffer,
+    // its size,
+    // custom deletion function (called when transfer is done),
+    // and pointer to the object managing the data buffer
+    FairMQMessagePtr msg2(NewMessage(const_cast<char*>(text->c_str()),
+                                     text->length(),
+                                     [](void* /*data*/, void* object) { delete static_cast<string*>(object); },
+                                     text));
+
+    // Send out the output message
+    if (Send(msg2, "data2") < 0)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+Processor::~Processor()
+{
+}
+
+} // namespace example_1_n_1
--- a/examples/1-n-1/Processor.h
+++ b/examples/1-n-1/Processor.h
@ -0,0 +1,29 @@
+/********************************************************************************
+ *    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 FAIRMQEXAMPLE1N1PROCESSOR_H_
+#define FAIRMQEXAMPLE1N1PROCESSOR_H_
+
+#include "FairMQDevice.h"
+
+namespace example_1_n_1
+{
+
+class Processor : public FairMQDevice
+{
+  public:
+    Processor();
+    virtual ~Processor();
+
+  protected:
+    bool HandleData(FairMQMessagePtr&, int);
+};
+
+} // namespace example_1_n_1
+
+#endif /* FAIRMQEXAMPLE1N1PROCESSOR_H_ */
--- a/examples/1-n-1/Sampler.cxx
+++ b/examples/1-n-1/Sampler.cxx
@ -0,0 +1,68 @@
+/********************************************************************************
+ *    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>
+
+#include "Sampler.h"
+
+using namespace std;
+
+namespace example_1_n_1
+{
+
+Sampler::Sampler()
+    : fText()
+    , fMaxIterations(0)
+    , fNumIterations(0)
+{
+}
+
+void Sampler::InitTask()
+{
+    // Get the fText and fMaxIterations values from the command line options (via fConfig)
+    fText = fConfig->GetValue<string>("text");
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
+}
+
+bool Sampler::ConditionalRun()
+{
+    // Initializing message with NewStaticMessage will avoid copy
+    // but won't delete the data after the sending is completed.
+    FairMQMessagePtr msg(NewStaticMessage(fText));
+
+    LOG(info) << "Sending \"" << fText << "\"";
+
+    // 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)
+    {
+        return false;
+    }
+    else if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations)
+    {
+        LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
+        return false;
+    }
+
+    this_thread::sleep_for(chrono::seconds(1));
+
+    return true;
+}
+
+Sampler::~Sampler()
+{
+}
+
+} // namespace example_1_n_1
--- a/examples/1-n-1/Sampler.h
+++ b/examples/1-n-1/Sampler.h
@ -0,0 +1,42 @@
+/********************************************************************************
+ *    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.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLE1N1SAMPLER_H_
+#define FAIRMQEXAMPLE1N1SAMPLER_H_
+
+#include <string>
+
+#include "FairMQDevice.h"
+
+namespace example_1_n_1
+{
+
+class Sampler : public FairMQDevice
+{
+  public:
+    Sampler();
+    virtual ~Sampler();
+
+  protected:
+    std::string fText;
+    uint64_t fMaxIterations;
+    uint64_t fNumIterations;
+
+    virtual void InitTask();
+    virtual bool ConditionalRun();
+};
+
+} // namespace example_1_n_1
+
+#endif /* FAIRMQEXAMPLE1N1SAMPLER_H_ */
--- a/examples/1-n-1/Sink.cxx
+++ b/examples/1-n-1/Sink.cxx
@ -0,0 +1,55 @@
+/********************************************************************************
+ *    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"                       *
+ ********************************************************************************/
+/**
+ * Sink.cxx
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#include "Sink.h"
+
+using namespace std;
+
+namespace example_1_n_1
+{
+
+Sink::Sink()
+    : fMaxIterations(0)
+    , fNumIterations(0)
+{
+    // register a handler for data arriving on "data2" channel
+    OnData("data2", &Sink::HandleData);
+}
+
+void Sink::InitTask()
+{
+    // Get the fMaxIterations value from the command line options (via fConfig)
+    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)
+bool Sink::HandleData(FairMQMessagePtr& msg, int /*index*/)
+{
+    LOG(info) << "Received: \"" << string(static_cast<char*>(msg->GetData()), msg->GetSize()) << "\"";
+
+    if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations)
+    {
+        LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
+        return false;
+    }
+
+    // return true if want to be called again (otherwise return false go to IDLE state)
+    return true;
+}
+
+Sink::~Sink()
+{
+}
+
+} // namespace example_1_n_1
--- a/examples/1-n-1/Sink.h
+++ b/examples/1-n-1/Sink.h
@ -0,0 +1,40 @@
+/********************************************************************************
+ *    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"                       *
+ ********************************************************************************/
+/**
+ * Sink.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLE1N1SINK_H
+#define FAIRMQEXAMPLE1N1SINK_H
+
+#include "FairMQDevice.h"
+
+namespace example_1_n_1
+{
+
+class Sink : public FairMQDevice
+{
+  public:
+    Sink();
+    virtual ~Sink();
+
+  protected:
+    virtual void InitTask();
+    bool HandleData(FairMQMessagePtr&, int);
+
+  private:
+    uint64_t fMaxIterations;
+    uint64_t fNumIterations;
+};
+
+} // namespace example_1_n_1
+
+#endif /* FAIRMQEXAMPLE1N1SINK_H */
--- a/examples/1-n-1/processor.cxx
+++ b/examples/1-n-1/processor.cxx
@ -1,56 +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 <fairmq/Device.h>
-#include <fairmq/runDevice.h>
-
-#include <string>
-
-namespace bpo = boost::program_options;
-
-struct Processor : fair::mq::Device
-{
-    Processor()
-    {
-        OnData("data1", &Processor::HandleData);
-    }
-
-    bool HandleData(fair::mq::MessagePtr& msg, int)
-    {
-        LOG(info) << "Received data, processing...";
-
-        // Modify the received string
-        std::string* text = new std::string(static_cast<char*>(msg->GetData()), msg->GetSize());
-        *text += " (modified by " + fId + ")";
-
-        // create message object with a pointer to the data buffer,
-        // its size,
-        // custom deletion function (called when transfer is done),
-        // and pointer to the object managing the data buffer
-        fair::mq::MessagePtr msg2(NewMessage(const_cast<char*>(text->c_str()),
-                                        text->length(),
-                                        [](void* /*data*/, void* object) { delete static_cast<std::string*>(object); },
-                                        text));
-
-        // Send out the output message
-        if (Send(msg2, "data2") < 0) {
-            return false;
-        }
-
-        return true;
-    }
-};
-
-void addCustomOptions(bpo::options_description& /*options*/)
-{
-}
-
-std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)
-{
-    return std::make_unique<Processor>();
-}
--- a/examples/1-n-1/runProcessor.cxx
+++ b/examples/1-n-1/runProcessor.cxx
@ -0,0 +1,21 @@
+/********************************************************************************
+ *    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 "Processor.h"
+
+namespace bpo = boost::program_options;
+
+void addCustomOptions(bpo::options_description& /*options*/)
+{
+}
+
+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
@ -0,0 +1,24 @@
+/********************************************************************************
+ *    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 "Sampler.h"
+
+namespace bpo = boost::program_options;
+
+void addCustomOptions(bpo::options_description& options)
+{
+    options.add_options()
+        ("text", bpo::value<std::string>()->default_value("Hello"), "Text to send out")
+        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
+}
+
+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
@ -6,24 +6,18 @@
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/

-#include <fairmq/Device.h>
-#include <fairmq/runDevice.h>
-
-class QCTask : public fair::mq::Device
-{
-  public:
-    QCTask()
-    {
-        OnData("qc", [](fair::mq::MessagePtr& /*msg*/, int) {
-            LOG(info) << "received data";
-            return false;
-        });
-    }
-};
+#include "runFairMQDevice.h"
+#include "Sink.h"

 namespace bpo = boost::program_options;
-void addCustomOptions(bpo::options_description& /*options*/) {}
-std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)
+
+void addCustomOptions(bpo::options_description& options)
 {
-    return std::make_unique<QCTask>();
+    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 FairMQProgOptions& /*config*/)
+{
+    return new example_1_n_1::Sink();
 }
--- a/examples/1-n-1/sampler.cxx
+++ b/examples/1-n-1/sampler.cxx
@ -1,65 +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 <fairmq/Device.h>
-#include <fairmq/runDevice.h>
-
-#include <string>
-#include <thread> // this_thread::sleep_for
-#include <chrono>
-
-namespace bpo = boost::program_options;
-
-struct Sampler : fair::mq::Device
-{
-    void InitTask() override
-    {
-        // Get the fText and fMaxIterations values from the command line options (via fConfig)
-        fText = fConfig->GetProperty<std::string>("text");
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-    }
-
-    bool ConditionalRun() override
-    {
-        // Initializing message with NewStaticMessage will avoid copy
-        // but won't delete the data after the sending is completed.
-        fair::mq::MessagePtr msg(NewStaticMessage(fText));
-
-        LOG(info) << "Sending \"" << fText << "\"";
-
-        // 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) {
-            return false;
-        } else if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-            LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-            return false;
-        }
-
-        std::this_thread::sleep_for(std::chrono::seconds(1));
-
-        return true;
-    }
-
-  private:
-    std::string fText;
-    uint64_t fMaxIterations = 0;
-    uint64_t fNumIterations = 0;
-};
-
-void addCustomOptions(bpo::options_description& options)
-{
-    options.add_options()
-        ("text", bpo::value<std::string>()->default_value("Hello"), "Text to send out")
-        ("max-iterations", bpo::value<uint64_t>()->default_value(0), "Maximum number of iterations of Run/ConditionalRun/OnData (0 - infinite)");
-}
-
-std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)
-{
-    return std::make_unique<Sampler>();
-}
--- a/examples/1-n-1/sink.cxx
+++ b/examples/1-n-1/sink.cxx
@ -1,57 +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 <fairmq/Device.h>
-#include <fairmq/runDevice.h>
-
-#include <string>
-
-namespace bpo = boost::program_options;
-
-struct Sink : fair::mq::Device
-{
-    Sink()
-    {
-        // register a handler for data arriving on "data2" channel
-        OnData("data2", &Sink::HandleData);
-    }
-
-    void InitTask() override
-    {
-        // Get the fMaxIterations value from the command line options (via fConfig)
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-    }
-
-    bool HandleData(fair::mq::MessagePtr& msg, int)
-    {
-        LOG(info) << "Received: \"" << std::string(static_cast<char*>(msg->GetData()), msg->GetSize()) << "\"";
-
-        if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-            LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-            return false;
-        }
-
-        // return true if want to be called again (otherwise return false go to IDLE state)
-        return true;
-    }
-
-  private:
-    uint64_t fMaxIterations = 0;
-    uint64_t fNumIterations = 0;
-};
-
-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)");
-}
-
-std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)
-{
-    return std::make_unique<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
@ -1,7 +1,5 @@
 #!/bin/bash

-set -e
-
 export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@

 transport="zeromq"
@ -10,26 +8,18 @@ if [[ $1 =~ ^[a-z]+$ ]]; then
    transport=$1
 fi

-session="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"
-chan1="data1"
-chan2="data2"
-chan1Addr="/tmp/fmq_$session""_""$chan1""_""$transport"
-chan2Addr="/tmp/fmq_$session""_""$chan2""_""$transport"
+ex2config="@CMAKE_CURRENT_BINARY_DIR@/ex-1-n-1.json"

 # setup a trap to kill everything if the test fails/timeouts
-trap 'set +e; 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; rm $chan1Addr; rm $chan2Addr; exit 0' TERM
+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

 SAMPLER="fairmq-ex-1-n-1-sampler"
 SAMPLER+=" --id sampler1"
 SAMPLER+=" --transport $transport"
 SAMPLER+=" --verbosity veryhigh"
-SAMPLER+=" --session $session"
-SAMPLER+=" --severity debug"
-SAMPLER+=" --shm-segment-size 100000000"
-SAMPLER+=" --shm-monitor true"
 SAMPLER+=" --control static --color false"
 SAMPLER+=" --max-iterations 2"
-SAMPLER+=" --channel-config name=$chan1,type=push,method=bind,address=ipc://$chan1Addr,rateLogging=0"
+SAMPLER+=" --mq-config $ex2config"
@CMAKE_CURRENT_BINARY_DIR@/$SAMPLER &
 SAMPLER_PID=$!

@ -37,13 +27,9 @@ PROCESSOR1="fairmq-ex-1-n-1-processor"
 PROCESSOR1+=" --id processor1"
 PROCESSOR1+=" --transport $transport"
 PROCESSOR1+=" --verbosity veryhigh"
-PROCESSOR1+=" --session $session"
-PROCESSOR1+=" --severity debug"
-PROCESSOR1+=" --shm-segment-size 100000000"
-PROCESSOR1+=" --shm-monitor true"
 PROCESSOR1+=" --control static --color false"
-PROCESSOR1+=" --channel-config name=$chan1,type=pull,method=connect,address=ipc://$chan1Addr,rateLogging=0"
-PROCESSOR1+="                  name=$chan2,type=push,method=connect,address=ipc://$chan2Addr,rateLogging=0"
+PROCESSOR1+=" --mq-config $ex2config"
+PROCESSOR1+=" --config-key processor"
@CMAKE_CURRENT_BINARY_DIR@/$PROCESSOR1 &
 PROCESSOR1_PID=$!

@ -51,13 +37,9 @@ PROCESSOR2="fairmq-ex-1-n-1-processor"
 PROCESSOR2+=" --id processor2"
 PROCESSOR2+=" --transport $transport"
 PROCESSOR2+=" --verbosity veryhigh"
-PROCESSOR2+=" --session $session"
-PROCESSOR2+=" --severity debug"
-PROCESSOR2+=" --shm-segment-size 100000000"
-PROCESSOR2+=" --shm-monitor true"
 PROCESSOR2+=" --control static --color false"
-PROCESSOR2+=" --channel-config name=$chan1,type=pull,method=connect,address=ipc://$chan1Addr,rateLogging=0"
-PROCESSOR2+="                  name=$chan2,type=push,method=connect,address=ipc://$chan2Addr,rateLogging=0"
+PROCESSOR2+=" --mq-config $ex2config"
+PROCESSOR2+=" --config-key processor"
@CMAKE_CURRENT_BINARY_DIR@/$PROCESSOR2 &
 PROCESSOR2_PID=$!

@ -65,13 +47,9 @@ SINK="fairmq-ex-1-n-1-sink"
 SINK+=" --id sink1"
 SINK+=" --transport $transport"
 SINK+=" --verbosity veryhigh"
-SINK+=" --session $session"
-SINK+=" --severity debug"
-SINK+=" --shm-segment-size 100000000"
-SINK+=" --shm-monitor true"
 SINK+=" --control static --color false"
 SINK+=" --max-iterations 2"
-SINK+=" --channel-config name=$chan2,type=pull,method=bind,address=ipc://$chan2Addr,rateLogging=0"
+SINK+=" --mq-config $ex2config"
@CMAKE_CURRENT_BINARY_DIR@/$SINK &
 SINK_PID=$!

@ -86,7 +64,3 @@ kill -SIGINT $PROCESSOR2_PID
 # wait for everything to finish
 wait $PROCESSOR1_PID
 wait $PROCESSOR2_PID
-
-set +e
-rm $chan1Addr; rm $chan2Addr
-exit 0
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@ -1,151 +1,19 @@
 ################################################################################
-# Copyright (C) 2018-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+#    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"                       #
 ################################################################################

-set(exe_prefix "fairmq-ex")
-set(script_prefix "fairmq-start-ex")
-set(test_script_prefix "test-ex")
-set(testsuite "Example")
-set(transports "zeromq" "shmem")
-
-function(add_example)
-  cmake_parse_arguments(PARSE_ARGV 0 ARG
-    "CONFIG;NO_TRANSPORT;NO_TEST"
-    "NAME"
-    "DEVICE;VARIANT;TRANSPORT;SCRIPT"
-  )
-
-  if(ARG_UNPARSED_ARGUMENTS)
-    message(FATAL_ERROR "Unexpected unparsed arguments: ${ARG_UNPARSED_ARGUMENTS}")
-  endif()
-
-  if(ARG_NAME)
-    set(name ${ARG_NAME})
-  else()
-    message(FATAL_ERROR "NAME arg is required")
-  endif()
-
-  if(ENABLE_SANITIZER_LEAK AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
-    get_filename_component(lsan_supps "${CMAKE_SOURCE_DIR}/test/leak_sanitizer_suppressions.txt" ABSOLUTE)
-    set(lsan_options "LSAN_OPTIONS=set:suppressions=${lsan_supps}")
-  endif()
-
-  if(ARG_DEVICE)
-    set(exe_targets)
-    foreach(device IN LISTS ARG_DEVICE)
-      set(exe "${exe_prefix}-${name}-${device}")
-      list(APPEND exe_targets ${exe})
-      add_executable(${exe} "${device}.cxx")
-      target_link_libraries(${exe} PRIVATE FairMQ)
-    endforeach()
-  endif()
-
-  if(ARG_TRANSPORT)
-    set(transports ${ARG_TRANSPORT})
-  endif()
-
-  if(ARG_SCRIPT)
-    set(scripts ${ARG_SCRIPT})
-  else()
-    set(scripts ${ARG_NAME})
-  endif()
-
-  set(EX_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
-  if(ARG_CONFIG)
-    set(EX_CONF_DIR ${CMAKE_CURRENT_BINARY_DIR})
-  endif()
-  set(FAIRMQ_BIN_DIR ${CMAKE_BINARY_DIR}/fairmq)
-  foreach(script IN LISTS scripts)
-    set(script_file "${script_prefix}-${script}.sh")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${script_file}.in" "${CMAKE_CURRENT_BINARY_DIR}/${script_file}" @ONLY)
-  endforeach()
-
-  if(ARG_CONFIG)
-    set(config "ex-${name}.json")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${config}" "${CMAKE_CURRENT_BINARY_DIR}/${config}")
-  endif()
-
-  # test
-  if(NOT ARG_NO_TEST)
-    set(test_script "${test_script_prefix}-${name}.sh")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${test_script}.in" "${CMAKE_CURRENT_BINARY_DIR}/${test_script}")
-
-    if(ARG_NO_TRANSPORT)
-      set(test "${testsuite}.${name}.${transport}")
-      add_test(NAME ${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test_script} ${transport})
-      set_tests_properties(${test} PROPERTIES TIMEOUT "30")
-      if(lsan_options)
-        set_tests_properties(${test} PROPERTIES ENVIRONMENT_MODIFICATION ${lsan_options})
-      endif()
-    else()
-      foreach(transport IN LISTS transports)
-        if(ARG_VARIANT)
-          foreach(variant IN LISTS ARG_VARIANT)
-            set(test "${testsuite}.${name}.${variant}.${transport}")
-            add_test(NAME ${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test_script} ${transport} ${variant})
-            set_tests_properties(${test} PROPERTIES TIMEOUT "30")
-            if(lsan_options)
-              set_tests_properties(${test} PROPERTIES ENVIRONMENT_MODIFICATION ${lsan_options})
-            endif()
-          endforeach()
-        else()
-          set(test "${testsuite}.${name}.${transport}")
-          add_test(NAME ${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test_script} ${transport})
-          set_tests_properties(${test} PROPERTIES TIMEOUT "30")
-          if(lsan_options)
-            set_tests_properties(${test} PROPERTIES ENVIRONMENT_MODIFICATION ${lsan_options})
-          endif()
-        endif()
-      endforeach()
-    endif()
-  endif()
-
-  # install
-  install(
-    TARGETS ${exe_targets}
-    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})
-  if(ARG_CONFIG)
-    set(EX_CONF_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_DATADIR})
-  endif()
-  set(FAIRMQ_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}/fairmq)
-  foreach(script IN LISTS scripts)
-    set(script_file "${script_prefix}-${script}.sh")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${script_file}.in" "${CMAKE_CURRENT_BINARY_DIR}/${script_file}_install" @ONLY)
-    install(
-      PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${script_file}_install"
-      DESTINATION ${PROJECT_INSTALL_BINDIR}
-      RENAME ${script_file}
-    )
-  endforeach()
-
-  if(ARG_CONFIG)
-    install(
-      FILES ${CMAKE_CURRENT_BINARY_DIR}/${config}
-      DESTINATION ${PROJECT_INSTALL_DATADIR}
-    )
-  endif()
-endfunction()
-
 add_subdirectory(1-1)
 add_subdirectory(1-n-1)
-add_subdirectory(builtin-devices)
 add_subdirectory(copypush)
-add_subdirectory(custom-controller)
 add_subdirectory(dds)
 add_subdirectory(multipart)
 add_subdirectory(multiple-channels)
-add_subdirectory(multiple-transports)
-add_subdirectory(n-m)
-add_subdirectory(qc)
-add_subdirectory(readout)
+if(BUILD_NANOMSG_TRANSPORT)
+  add_subdirectory(multiple-transports)
+endif()
 add_subdirectory(region)
 add_subdirectory(req-rep)
--- a/examples/README.md
+++ b/examples/README.md
@ -6,50 +6,41 @@ Set of FairMQ examples. More examples that combine FairMQ with FairRoot can be f

 A simple topology of two devices - **Sampler** and **Sink**. **Sampler** sends data to **Sink** with the **PUSH-PULL** pattern.

+
 ## 1-n-1

 A simple topology of three device types - **Sampler**, **Processor** and **Sink**. **Sampler** sends data to one or more **Processor**s, who modify the data and send it to one **Sink**. Transport with the **PUSH-PULL** pattern. The example also shows the configuration via JSON files, as oposed to `--channel-config` that is used by other examples.

-## Built-in devices
-
-Usage of generic devies provided with FairMQ.
-
-## Copy & Push
-
-A topology consisting of one **Sampler** and two **Sink**s. The **Sampler** uses the `Copy` method to send the same data to both sinks with the **PUSH-PULL** pattern. In countrary to the **PUB-SUB** pattern, this ensures that all receivers are connected and no data is lost, but requires additional channels to be configured.

 ## DDS

 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 reconfiguration of the devices.

-## Multipart

-This example shows how to send a multipart message from one device to the other. (two parts message parts - header and body).
+## Copy & Push
+
+A topology consisting of one **Sampler** and two **Sink**s. The **Sampler** uses the `Copy` method to send the same data to both sinks with the **PUSH-PULL** pattern. In countrary to the **PUB-SUB** pattern, this ensures that all receivers are connected and no data is lost, but requires additional channels to be configured.
+
+
+## Request & Reply
+
+This topology contains two devices that communicate with each other via the **REQ-REP** pettern. Bidirectional communication via a single socket.
+

 ## Multiple Channels

 This example demonstrates how to work with multiple channels and multiplex between them.

-## Multiple Transports

-This examples shows how to combine different channel transports (zeromq/shmem) inside of one device and/or topology.
+## Sending Multipart messages

-## n-m
+This example shows how to send a multipart message from one device to the other. (two parts message parts - header and body).

-A topology consisting of three layers of devices: synchronizer -> n * senders -> m * receivers.

-## QC
+## Multiple Transports example

-A topology consisting of 4 devices - Sampler, QCDispatcher, QCTask and Sink. The data flows from Sampler through QCDispatcher to Sink. On demand - by setting the corresponding configuration property - the QCDispatcher device will duplicate the data to the QCTask device. The property is set by the topology controller, in this example this is the `fairmq-dds-command-ui` utility.
+This examples shows how to combine different channel transports (zeromq/nanomsg/shmem) inside of one device and/or topology.

-## Readout
-
-Two example topologies of setups to be distributed to two kinds of nodes - detector readout node and processing node. Detector readout node contains readout process, data builder and data sender (and optionally an additional processor), while processing node contains data receiver devices. communication within readout nodes is done via unmanaged region through shared memory transport.
-
-## Region
+## Region example

 This example demonstrates the use of a more advanced feature - UnmanagedRegion, that can be used to create a buffer through one of FairMQ transports. The contents of this buffer are managed by the user, who can also create messages out of sub-buffers of the created buffer. Such feature can be interesting in environments that have special requirements by the hardware that writes the data, to keep the transfer efficient (e.g. shared memory).
-
-## Request & Reply
-
-This topology contains two devices that communicate with each other via the **REQ-REP** pettern. Bidirectional communication via a single socket.
--- a/examples/builtin-devices/CMakeLists.txt
+++ b/examples/builtin-devices/CMakeLists.txt
@ -1,11 +0,0 @@
-################################################################################
-# Copyright (C) 2014-2023 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_example(NAME builtin-devices
-  VARIANT single_msg multipart
-)
--- 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,176 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@
-
-transport="zeromq"
-multipart="false"
-numParts="1"
-
-if [[ $1 =~ ^[a-z]+$ ]]; then
-    transport=$1
-fi
-
-if [[ $2 =~ ^multipart$ ]]; then
-    multipart="true"
-    numParts=2
-fi
-
-session="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"
-chan1="data1"
-chan2="data2"
-chan3="data3"
-chan4="data4"
-chan5="data5"
-chan1Addr="/tmp/fmq_$session""_""$chan1""_""$transport"
-chan2Addr1="/tmp/fmq_$session""_""$chan2""_1""_""$transport"
-chan2Addr2="/tmp/fmq_$session""_""$chan2""_2""_""$transport"
-chan3Addr1="/tmp/fmq_$session""_""$chan3""_1""_""$transport"
-chan3Addr2="/tmp/fmq_$session""_""$chan3""_2""_""$transport"
-chan4Addr="/tmp/fmq_$session""_""$chan4""_""$transport"
-chan5Addr="/tmp/fmq_$session""_""$chan5""_""$transport"
-
-# setup a trap to kill everything if the test fails/timeouts
-trap 'set +e; 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; rm $chan1Addr; rm $chan2Addr1; rm $chan2Addr2; rm $chan3Addr1; rm $chan3Addr2; rm $chan4Addr; rm $chan5Addr; exit 0' TERM
-
-SAMPLER="fairmq-bsampler"
-SAMPLER+=" --id bsampler1"
-SAMPLER+=" --session $SESSION"
-SAMPLER+=" --transport $transport"
-SAMPLER+=" --color false"
-SAMPLER+=" --control static"
-SAMPLER+=" --verbosity veryhigh"
-SAMPLER+=" --shm-segment-size 100000000"
-SAMPLER+=" --shm-monitor true"
-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 $chan1"
-SAMPLER+=" --channel-config name=$chan1,type=push,method=bind,sndBufSize=50,rcvBufSize=50,address=ipc://$chan1Addr"
-@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+=" --shm-segment-size 100000000"
-SPLITTER+=" --shm-monitor true"
-SPLITTER+=" --multipart $multipart"
-SPLITTER+=" --in-channel $chan1"
-SPLITTER+=" --out-channel $chan2"
-SPLITTER+=" --channel-config name=$chan1,type=pull,method=connect,sndBufSize=50,rcvBufSize=50,address=ipc://$chan1Addr"
-SPLITTER+="                  name=$chan2,type=push,method=bind,sndBufSize=50,rcvBufSize=50,address=ipc://$chan2Addr1,address=ipc://$chan2Addr2"
-@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+=" --shm-segment-size 100000000"
-PROXY1+=" --shm-monitor true"
-PROXY1+=" --multipart $multipart"
-PROXY1+=" --in-channel $chan2"
-PROXY1+=" --out-channel $chan3"
-PROXY1+=" --channel-config name=$chan2,type=pull,method=connect,sndBufSize=50,rcvBufSize=50,address=ipc://$chan2Addr1"
-PROXY1+="                  name=$chan3,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=ipc://$chan3Addr1"
-@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+=" --shm-segment-size 100000000"
-PROXY2+=" --shm-monitor true"
-PROXY2+=" --multipart $multipart"
-PROXY2+=" --in-channel $chan2"
-PROXY2+=" --out-channel $chan3"
-PROXY2+=" --channel-config name=$chan2,type=pull,method=connect,sndBufSize=50,rcvBufSize=50,address=ipc://$chan2Addr2"
-PROXY2+="                  name=$chan3,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=ipc://$chan3Addr2"
-@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+=" --shm-segment-size 100000000"
-MERGER+=" --shm-monitor true"
-MERGER+=" --multipart $multipart"
-MERGER+=" --in-channel $chan3"
-MERGER+=" --out-channel $chan4"
-MERGER+=" --channel-config name=$chan3,type=pull,method=bind,sndBufSize=50,rcvBufSize=50,address=ipc://$chan3Addr1,address=ipc://$chan3Addr2"
-MERGER+="                  name=$chan4,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=ipc://$chan4Addr"
-@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+=" --shm-segment-size 100000000"
-MULTIPLIER+=" --shm-monitor true"
-MULTIPLIER+=" --multipart $multipart"
-MULTIPLIER+=" --in-channel $chan4"
-MULTIPLIER+=" --out-channel $chan5"
-MULTIPLIER+=" --channel-config name=$chan4,type=pull,method=bind,sndBufSize=50,rcvBufSize=50,address=ipc://$chan4Addr"
-MULTIPLIER+="                  name=$chan5,type=push,method=connect,sndBufSize=50,rcvBufSize=50,address=ipc://$chan5Addr,address=ipc://$chan5Addr"
-@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+=" --shm-monitor true"
-SINK+=" --max-iterations 2"
-SINK+=" --in-channel $chan5"
-SINK+=" --channel-config name=$chan5,type=pull,method=bind,sndBufSize=50,rcvBufSize=50,address=ipc://$chan5Addr"
-@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
-
-set +e
-rm $chan1Addr; rm $chan2Addr1; rm $chan2Addr2; rm $chan3Addr1; rm $chan3Addr2; rm $chan4Addr; rm $chan5Addr
-exit 0
--- a/examples/copypush/CMakeLists.txt
+++ b/examples/copypush/CMakeLists.txt
@ -1,11 +1,66 @@
 ################################################################################
-# Copyright (C) 2014-2023 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"                       #
 ################################################################################

-add_example(NAME copypush
-  DEVICE sampler sink
+add_library(ExampleCopyPushLib STATIC
+    "Sampler.cxx"
+    "Sampler.h"
+    "Sink.cxx"
+    "Sink.h"
+)
+
+target_link_libraries(ExampleCopyPushLib PUBLIC FairMQ)
+
+add_executable(fairmq-ex-copypush-sampler runSampler.cxx)
+target_link_libraries(fairmq-ex-copypush-sampler PRIVATE ExampleCopyPushLib)
+
+
+add_executable(fairmq-ex-copypush-sink runSink.cxx)
+target_link_libraries(fairmq-ex-copypush-sink PRIVATE ExampleCopyPushLib)
+
+add_custom_target(ExampleCopyPush DEPENDS fairmq-ex-copypush-sampler fairmq-ex-copypush-sink)
+
+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-copypush.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-copypush.sh)
+
+# test
+
+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: ")
+
+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: ")
+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: ")
+
+# install
+
+install(
+    TARGETS
+    fairmq-ex-copypush-sampler
+    fairmq-ex-copypush-sink
+
+    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-copypush.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-copypush.sh_install)
+
+install(
+    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-copypush.sh_install
+    DESTINATION ${PROJECT_INSTALL_BINDIR}
+    RENAME fairmq-start-ex-copypush.sh
 )
--- a/examples/copypush/Sampler.cxx
+++ b/examples/copypush/Sampler.cxx
@ -0,0 +1,69 @@
+/********************************************************************************
+ *    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>
+
+#include "Sampler.h"
+
+using namespace std;
+
+namespace example_copypush
+{
+
+Sampler::Sampler()
+    : fNumDataChannels(0)
+    , fCounter(0)
+    , fMaxIterations(0)
+    , fNumIterations(0)
+{
+}
+
+void Sampler::InitTask()
+{
+    fNumDataChannels = fChannels.at("data").size();
+    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++));
+
+    for (int i = 0; i < fNumDataChannels - 1; ++i)
+    {
+        FairMQMessagePtr msgCopy(NewMessage());
+        msgCopy->Copy(*msg);
+        Send(msgCopy, "data", i);
+    }
+    Send(msg, "data", fNumDataChannels - 1);
+
+    if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations)
+    {
+        LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
+        return false;
+    }
+
+    this_thread::sleep_for(chrono::seconds(1));
+
+    return true;
+}
+
+Sampler::~Sampler()
+{
+}
+
+} // namespace example_copypush
--- a/examples/copypush/Sampler.h
+++ b/examples/copypush/Sampler.h
@ -0,0 +1,43 @@
+/********************************************************************************
+ *    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.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLECOPYPUSHSAMPLER_H
+#define FAIRMQEXAMPLECOPYPUSHSAMPLER_H
+
+#include "FairMQDevice.h"
+
+#include <stdint.h> // uint64_t
+
+namespace example_copypush
+{
+
+class Sampler : public FairMQDevice
+{
+  public:
+    Sampler();
+    virtual ~Sampler();
+
+  protected:
+    virtual void InitTask();
+    virtual bool ConditionalRun();
+
+    int fNumDataChannels;
+    uint64_t fCounter;
+    uint64_t fMaxIterations;
+    uint64_t fNumIterations;
+};
+
+} // namespace example_copypush
+
+#endif /* FAIRMQEXAMPLECOPYPUSHSAMPLER_H */
--- a/examples/copypush/Sink.cxx
+++ b/examples/copypush/Sink.cxx
@ -0,0 +1,51 @@
+/********************************************************************************
+ *    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"                       *
+ ********************************************************************************/
+/**
+ * Sink.cxx
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#include "Sink.h"
+
+namespace example_copypush
+{
+
+Sink::Sink()
+    : fMaxIterations(0)
+    , fNumIterations(0)
+{
+    OnData("data", &Sink::HandleData);
+}
+
+void Sink::InitTask()
+{
+    // Get the fMaxIterations value from the command line options (via fConfig)
+    fMaxIterations = fConfig->GetValue<uint64_t>("max-iterations");
+}
+
+bool Sink::HandleData(FairMQMessagePtr& msg, int /*index*/)
+{
+    LOG(info) << "Received message: \"" << *(static_cast<uint64_t*>(msg->GetData())) << "\"";
+
+    if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations)
+    {
+        LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
+        return false;
+    }
+
+    // return true if want to be called again (otherwise go to IDLE state)
+    return true;
+}
+
+Sink::~Sink()
+{
+}
+
+} // namespace example_copypush
--- a/examples/copypush/Sink.h
+++ b/examples/copypush/Sink.h
@ -0,0 +1,42 @@
+/********************************************************************************
+ *    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"                       *
+ ********************************************************************************/
+/**
+ * Sink.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLECOPYPUSHSINK_H
+#define FAIRMQEXAMPLECOPYPUSHSINK_H
+
+#include "FairMQDevice.h"
+
+#include <stdint.h> // uint64_t
+
+namespace example_copypush
+{
+
+class Sink : public FairMQDevice
+{
+  public:
+    Sink();
+    virtual ~Sink();
+
+  protected:
+    virtual void InitTask();
+    bool HandleData(FairMQMessagePtr&, int);
+
+  private:
+    uint64_t fMaxIterations;
+    uint64_t fNumIterations;
+};
+
+} // namespace example_copypush
+
+#endif /* FAIRMQEXAMPLECOPYPUSHSINK_H */
--- a/examples/copypush/runSampler.cxx
+++ b/examples/copypush/runSampler.cxx
@ -0,0 +1,23 @@
+/********************************************************************************
+ *    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 "Sampler.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 FairMQProgOptions& /*config*/)
+{
+    return new example_copypush::Sampler();
+}
--- a/examples/copypush/runSink.cxx
+++ b/examples/copypush/runSink.cxx
@ -0,0 +1,23 @@
+/********************************************************************************
+ *    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 "Sink.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 FairMQProgOptions& /*config*/)
+{
+    return new example_copypush::Sink();
+}
--- a/examples/copypush/sampler.cxx
+++ b/examples/copypush/sampler.cxx
@ -1,65 +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 <fairmq/Device.h>
-#include <fairmq/runDevice.h>
-
-#include <chrono>
-#include <cstdint> // uint64_t
-#include <thread> // this_thread::sleep_for
-
-namespace bpo = boost::program_options;
-
-struct Sampler : fair::mq::Device
-{
-    void InitTask() override
-    {
-        fNumDataChannels = GetNumSubChannels("data");
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-    }
-
-    bool ConditionalRun() override
-    {
-        // 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
-        fair::mq::MessagePtr msg(NewSimpleMessage(fCounter++));
-
-        for (int i = 0; i < fNumDataChannels - 1; ++i) {
-            fair::mq::MessagePtr msgCopy(NewMessage());
-            msgCopy->Copy(*msg);
-            Send(msgCopy, "data", i);
-        }
-        Send(msg, "data", fNumDataChannels - 1);
-
-        if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-            LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-            return false;
-        }
-
-        std::this_thread::sleep_for(std::chrono::seconds(1));
-
-        return true;
-    }
-
-  private:
-    int fNumDataChannels = 0;
-    uint64_t fCounter = 0;
-    uint64_t fMaxIterations = 0;
-    uint64_t fNumIterations = 0;
-};
-
-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)");
-}
-
-std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)
-{
-    return std::make_unique<Sampler>();
-}
--- a/examples/copypush/sink.cxx
+++ b/examples/copypush/sink.cxx
@ -1,57 +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 <fairmq/Device.h>
-#include <fairmq/runDevice.h>
-
-#include <cstdint> // uint64_t
-
-namespace bpo = boost::program_options;
-
-struct Sink : fair::mq::Device
-{
-    Sink()
-    {
-        OnData("data", &Sink::HandleData);
-    }
-
-  protected:
-    void InitTask() override
-    {
-        // Get the fMaxIterations value from the command line options (via fConfig)
-        fMaxIterations = fConfig->GetProperty<uint64_t>("max-iterations");
-    }
-
-    bool HandleData(fair::mq::MessagePtr& msg, int)
-    {
-        LOG(info) << "Received message: \"" << *(static_cast<uint64_t*>(msg->GetData())) << "\"";
-
-        if (fMaxIterations > 0 && ++fNumIterations >= fMaxIterations) {
-            LOG(info) << "Configured maximum number of iterations reached. Leaving RUNNING state.";
-            return false;
-        }
-
-        // return true if want to be called again (otherwise go to IDLE state)
-        return true;
-    }
-
-  private:
-    uint64_t fMaxIterations = 0;
-    uint64_t fNumIterations = 0;
-};
-
-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)");
-}
-
-std::unique_ptr<fair::mq::Device> getDevice(fair::mq::ProgOptions& /*config*/)
-{
-    return std::make_unique<Sink>();
-}
--- a/examples/copypush/test-ex-copypush.sh.in
+++ b/examples/copypush/test-ex-copypush.sh.in
@ -1,7 +1,5 @@
 #!/bin/bash

-set -e
-
 export FAIRMQ_PATH=@FAIRMQ_BIN_DIR@

 transport="zeromq"
@ -10,25 +8,16 @@ if [[ $1 =~ ^[a-z]+$ ]]; then
    transport=$1
 fi

-session="$(@CMAKE_BINARY_DIR@/fairmq/fairmq-uuid-gen -h)"
-chan="data"
-chanAddr1="/tmp/fmq_$session""_""$chan""_1""_""$transport"
-chanAddr2="/tmp/fmq_$session""_""$chan""_2""_""$transport"
-
 # setup a trap to kill everything if the test fails/timeouts
-trap 'set +e; kill -TERM $SAMPLER_PID; kill -TERM $SINK1_PID; kill -TERM $SINK2_PID; wait $SAMPLER_PID; wait $SINK1_PID; wait $SINK2_PID; rm $chanAddr1; rm $chanAddr2; exit 0' TERM
+trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK1_PID; kill -TERM $SINK2_PID; wait $SAMPLER_PID; wait $SINK1_PID; wait $SINK2_PID;' TERM

 SAMPLER="fairmq-ex-copypush-sampler"
 SAMPLER+=" --id sampler1"
 SAMPLER+=" --transport $transport"
 SAMPLER+=" --verbosity veryhigh"
-SAMPLER+=" --severity debug"
-SAMPLER+=" --shm-segment-size 100000000"
-SAMPLER+=" --shm-monitor true"
-SAMPLER+=" --session $session"
 SAMPLER+=" --control static --color false"
 SAMPLER+=" --max-iterations 1"
-SAMPLER+=" --channel-config name=$chan,type=push,method=bind,rateLogging=0,address=ipc://$chanAddr1,address=ipc://$chanAddr2"
+SAMPLER+=" --channel-config name=data,type=push,method=bind,rateLogging=0,address=tcp://*:5555,address=tcp://*:5556"
@CMAKE_CURRENT_BINARY_DIR@/$SAMPLER &
 SAMPLER_PID=$!

@ -36,13 +25,9 @@ SINK1="fairmq-ex-copypush-sink"
 SINK1+=" --id sink1"
 SINK1+=" --transport $transport"
 SINK1+=" --verbosity veryhigh"
-SINK1+=" --severity debug"
-SINK1+=" --shm-segment-size 100000000"
-SINK1+=" --shm-monitor true"
-SINK1+=" --session $session"
 SINK1+=" --control static --color false"
 SINK1+=" --max-iterations 1"
-SINK1+=" --channel-config name=$chan,type=pull,method=connect,rateLogging=0,address=ipc://$chanAddr1"
+SINK1+=" --channel-config name=data,type=pull,method=connect,rateLogging=0,address=tcp://localhost:5555"
@CMAKE_CURRENT_BINARY_DIR@/$SINK1 &
 SINK1_PID=$!

@ -50,13 +35,9 @@ SINK2="fairmq-ex-copypush-sink"
 SINK2+=" --id sink2"
 SINK2+=" --transport $transport"
 SINK2+=" --verbosity veryhigh"
-SINK2+=" --severity debug"
-SINK2+=" --shm-segment-size 100000000"
-SINK2+=" --shm-monitor true"
-SINK2+=" --session $session"
 SINK2+=" --control static --color false"
 SINK2+=" --max-iterations 1"
-SINK2+=" --channel-config name=$chan,type=pull,method=connect,rateLogging=0,address=ipc://$chanAddr2"
+SINK2+=" --channel-config name=data,type=pull,method=connect,rateLogging=0,address=tcp://localhost:5556"
@CMAKE_CURRENT_BINARY_DIR@/$SINK2 &
 SINK2_PID=$!

@ -64,7 +45,3 @@ SINK2_PID=$!
 wait $SAMPLER_PID
 wait $SINK1_PID
 wait $SINK2_PID
-
-set +e
-rm $chanAddr1; rm $chanAddr2
-exit 0
--- a/examples/custom-controller/CMakeLists.txt
+++ b/examples/custom-controller/CMakeLists.txt
@ -1,20 +0,0 @@
-################################################################################
-# Copyright (C) 2022-2023 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(name "custom-controller")
-set(exe "${exe_prefix}-${name}")
-add_executable(${exe} main.cxx)
-target_link_libraries(${exe} PRIVATE FairMQ)
-set_target_properties(${exe} PROPERTIES ENABLE_EXPORTS ON)
-
-set(test "${testsuite}.${name}")
-add_test(NAME ${test} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${exe})
-set_tests_properties(${test} PROPERTIES TIMEOUT 30)
-if(lsan_options)
-  set_tests_properties(${test} PROPERTIES ENVIRONMENT_MODIFICATION ${lsan_options})
-endif()
--- a/examples/custom-controller/MyController.h
+++ b/examples/custom-controller/MyController.h
@ -1,97 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2022 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 FAIR_MQ_EXAMPLE_CUSTOM_CONTROLLER_PLUGIN
-#define FAIR_MQ_EXAMPLE_CUSTOM_CONTROLLER_PLUGIN
-
-#include <fairmq/Plugin.h>
-#include <utility>   // for std::forward
-
-namespace example {
-
-struct MyController : fair::mq::Plugin   // NOLINT
-{
-    template<typename... Args>
-    MyController(Args&&... args)
-        : Plugin(std::forward<Args>(args)...)
-    {
-        TakeDeviceControl();
-
-        SubscribeToDeviceStateChange([this](auto state) {
-            auto shutdown = GetProperty<bool>("please-shut-me-down", false);
-            try {
-                switch (state) {
-                    case DeviceState::Idle: {
-                        ChangeDeviceState(shutdown ? DeviceStateTransition::End
-                                                    : DeviceStateTransition::InitDevice);
-                        break;
-                    }
-                    case DeviceState::InitializingDevice: {
-                        ChangeDeviceState(DeviceStateTransition::CompleteInit);
-                        break;
-                    }
-                    case DeviceState::Initialized: {
-                        ChangeDeviceState(DeviceStateTransition::Bind);
-                        break;
-                    }
-                    case DeviceState::Bound: {
-                        ChangeDeviceState(DeviceStateTransition::Connect);
-                        break;
-                    }
-                    case DeviceState::DeviceReady: {
-                        ChangeDeviceState(shutdown ? DeviceStateTransition::ResetDevice
-                                                    : DeviceStateTransition::InitTask);
-                        break;
-                    }
-                    case DeviceState::Ready: {
-                        ChangeDeviceState(shutdown ? DeviceStateTransition::ResetTask
-                                                    : DeviceStateTransition::Run);
-                        break;
-                    }
-                    case DeviceState::Running: {
-                        ChangeDeviceState(DeviceStateTransition::Stop);
-                        break;
-                    }
-                    case DeviceState::Exiting: {
-                        ReleaseDeviceControl();
-                        break;
-                    }
-                    default:
-                        break;
-                }
-            } catch (fair::mq::PluginServices::DeviceControlError const&) {
-                // this means we do not have device control
-            }
-        });
-    }
-
-    ~MyController() override { ReleaseDeviceControl(); }
-};
-
-// auto MyControllerProgramOptions() -> fair::mq::Plugin::ProgOptions
-// {
-// auto plugin_options = boost::program_options::options_description{"MyController Plugin"};
-// plugin_options.add_options()
-// ("custom-dummy-option", boost::program_options::value<std::string>(), "Cool custom option.")
-// ("custom-dummy-option2", boost::program_options::value<std::string>(), "Another one.");
-// return plugin_options;
-// }
-
-}   // namespace example
-
-REGISTER_FAIRMQ_PLUGIN(example::MyController,   // Class name
-                       mycontroller,            // Plugin name (string, lower case chars only)
-                       (fair::mq::Plugin::Version{0, 42, 0}),     // Version
-                       "Mr. Dummy <dummy@test.net>",              // Maintainer
-                       "https://git.test.net/mycontroller.git",   // Homepage
-                       //                       example::MyControllerProgramOptions   // Free
-                       //                       function which declares custom
-                       // program options for the plugin
-                       fair::mq::Plugin::NoProgramOptions)
-
-#endif /* FAIR_MQ_EXAMPLE_CUSTOM_CONTROLLER_PLUGIN */
--- a/examples/custom-controller/main.cxx
+++ b/examples/custom-controller/main.cxx
@ -1,46 +0,0 @@
-/********************************************************************************
- *    Copyright (C) 2022 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 "MyController.h"
-#include "MyDevice.h"
-
-#include <chrono>   // for std::chrono_literals
-#include <fairlogger/Logger.h>
-#include <fairmq/DeviceRunner.h>
-#include <memory>   // for std::make_unique
-
-int main(int argc, char* argv[])
-{
-    using namespace fair::mq;
-    using namespace std::chrono_literals;
-
-    DeviceRunner runner(argc, argv);
-
-    runner.AddHook<hooks::LoadPlugins>([](DeviceRunner& r) {
-        r.fPluginManager.LoadPlugin("s:mycontroller");
-        // 's:' stands for static because the plugin is compiled into the executable
-        // 'mycontroller' is the plugin name passed as second arg to REGISTER_FAIRMQ_PLUGIN
-    });
-
-    fair::Logger::SetConsoleSeverity(fair::Severity::debug);
-
-    runner.AddHook<hooks::InstantiateDevice>([](DeviceRunner& r) {
-        r.fConfig.SetProperty<int>("catch-signals", 0);
-        r.fConfig.SetProperty<bool>("please-shut-me-down", false);
-        r.fDevice = std::make_unique<example::MyDevice>(r.fConfig);
-
-        r.fDevice->SubscribeToStateChange("example", [&r](auto state) {
-            if (state == State::Running) {
-                r.fDevice->WaitFor(3s);
-                r.fConfig.SetProperty<bool>("please-shut-me-down", true);
-            }
-        });
-    });
-
-    return runner.RunWithExceptionHandlers();
-}
--- a/examples/dds/CMakeLists.txt
+++ b/examples/dds/CMakeLists.txt
@ -1,85 +1,67 @@
 ################################################################################
-#  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,             #
 #                  copied verbatim in the file "LICENSE"                       #
 ################################################################################

-add_executable(fairmq-ex-dds-sampler sampler.cxx)
-target_link_libraries(fairmq-ex-dds-sampler PRIVATE FairMQ)
+add_library(ExampleDDSLib STATIC
+    "Sampler.cxx"
+    "Sampler.h"
+    "Processor.cxx"
+    "Processor.h"
+    "Sink.cxx"
+    "Sink.h"
+)

-add_executable(fairmq-ex-dds-processor processor.cxx)
-target_link_libraries(fairmq-ex-dds-processor PRIVATE FairMQ)
+target_link_libraries(ExampleDDSLib PUBLIC FairMQ)

-add_executable(fairmq-ex-dds-sink sink.cxx)
-target_link_libraries(fairmq-ex-dds-sink PRIVATE FairMQ)
+add_executable(fairmq-ex-dds-sampler runSampler.cxx)
+target_link_libraries(fairmq-ex-dds-sampler PRIVATE ExampleDDSLib)
+
+add_executable(fairmq-ex-dds-processor runProcessor.cxx)
+target_link_libraries(fairmq-ex-dds-processor PRIVATE ExampleDDSLib)
+
+add_executable(fairmq-ex-dds-sink runSink.cxx)
+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)

-list(JOIN Boost_LIBRARY_DIRS ":" LIB_DIR)
-set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/sdk)
-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
-# if(DDS_FOUND)
-  # 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
-    # PASS_REGULAR_EXPRESSION "Example successful"
-  # )
-# endif()

 # install

 install(
-  TARGETS
-  fairmq-ex-dds-sampler
-  fairmq-ex-dds-processor
-  fairmq-ex-dds-sink
+    TARGETS
+    fairmq-ex-dds-sampler
+    fairmq-ex-dds-processor
+    fairmq-ex-dds-sink

-  LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
-  RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR}
 )

 # 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
-  DESTINATION ${PROJECT_INSTALL_DATADIR}
-  RENAME ex-dds-topology.xml
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml_install
+    DESTINATION ${PROJECT_INSTALL_DATADIR}
+    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
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-hosts.cfg
+    DESTINATION ${PROJECT_INSTALL_DATADIR}
 )
--- a/examples/dds/Processor.cxx
+++ b/examples/dds/Processor.cxx
@ -0,0 +1,52 @@
+/********************************************************************************
+ *    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 "Processor.h"
+#include "FairMQLogger.h"
+
+using namespace std;
+
+namespace example_dds
+{
+
+Processor::Processor()
+{
+    OnData("data1", &Processor::HandleData);
+}
+
+bool Processor::HandleData(FairMQMessagePtr& msg, int /*index*/)
+{
+    LOG(info) << "Received data, processing...";
+
+    // Modify the received string
+    string* text = new std::string(static_cast<char*>(msg->GetData()), msg->GetSize());
+    *text += " (modified by " + fId + ")";
+
+    // create message object with a pointer to the data buffer,
+    // its size,
+    // custom deletion function (called when transfer is done),
+    // and pointer to the object managing the data buffer
+    FairMQMessagePtr msg2(NewMessage(const_cast<char*>(text->c_str()),
+                                     text->length(),
+                                     [](void* /*data*/, void* object) { delete static_cast<string*>(object); },
+                                     text));
+
+    // Send out the output message
+    if (Send(msg2, "data2") < 0)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+Processor::~Processor()
+{
+}
+
+} // namespace example_dds
--- a/examples/dds/Processor.h
+++ b/examples/dds/Processor.h
@ -0,0 +1,29 @@
+/********************************************************************************
+ *    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 FAIRMQEXAMPLEDDSPROCESSOR_H
+#define FAIRMQEXAMPLEDDSPROCESSOR_H
+
+#include "FairMQDevice.h"
+
+namespace example_dds
+{
+
+class Processor : public FairMQDevice
+{
+  public:
+    Processor();
+    virtual ~Processor();
+
+  protected:
+    bool HandleData(FairMQMessagePtr&, int);
+};
+
+}
+
+#endif /* FAIRMQEXAMPLEDDSPROCESSOR_H */
--- a/examples/dds/README.md
+++ b/examples/dds/README.md
@ -40,14 +40,14 @@ The configuration of the channel connection addresses is done by the DDS plugin

 **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:

@ -55,10 +55,10 @@ First you need to initialize DDS environment:
 source DDS_env.sh  # this script is located in the DDS installation directory
 ```

-The DDS session is started with:
+The DDS server is started with:

 ```bash
-dds-session start
+dds-server start -s
 ```

 ##### 5. Submit DDS Agents (configured in the hosts file).
@ -91,7 +91,7 @@ A simple utility (fairmq-dds-command-ui) is included with FairMQ to send command

 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.

-The utility requires a session parameter to connect to appropriate DDS session. The session value is given when starting dds-session.
+The utility requires a session parameter to connect to appropriate DDS session. The session value is given when starting dds-server.

 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:
@ -108,15 +108,15 @@ Given our topology file, here are some examples of valid paths:
 ./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
@ -0,0 +1,53 @@
+/********************************************************************************
+ *    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>
+
+#include "Sampler.h"
+
+using namespace std;
+
+namespace example_dds
+{
+
+Sampler::Sampler()
+{
+}
+
+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"));
+
+    LOG(info) << "Sending \"Data\"";
+
+    // 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)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+Sampler::~Sampler()
+{
+}
+
+}
--- a/examples/dds/Sampler.h
+++ b/examples/dds/Sampler.h
@ -0,0 +1,35 @@
+/********************************************************************************
+ *    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.h
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#ifndef FAIRMQEXAMPLEDDSSAMPLER_H
+#define FAIRMQEXAMPLEDDSSAMPLER_H
+
+#include "FairMQDevice.h"
+
+namespace example_dds
+{
+
+class Sampler : public FairMQDevice
+{
+  public:
+    Sampler();
+    virtual ~Sampler();
+
+  protected:
+    virtual bool ConditionalRun();
+};
+
+} // namespace example_dds
+
+#endif /* FAIRMQEXAMPLEDDSSAMPLER_H */
--- a/examples/dds/Sink.cxx
+++ b/examples/dds/Sink.cxx
@ -0,0 +1,41 @@
+/********************************************************************************
+ *    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"                       *
+ ********************************************************************************/
+/**
+ * Sink.cxx
+ *
+ * @since 2014-10-10
+ * @author A. Rybalchenko
+ */
+
+#include "Sink.h"
+
+using namespace std;
+
+namespace example_dds
+{
+
+Sink::Sink()
+{
+    // register a handler for data arriving on "data2" channel
+    OnData("data2", &Sink::HandleData);
+}
+
+// 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()) << "\"";
+
+    // return true if want to be called again (otherwise go to IDLE state)
+    return true;
+}
+
+Sink::~Sink()
+{
+}
+
+} // namespace example_dds
--- a/Show More
+++ b/Show More