From f827655f8195a17db21789c789404d7b9d8338b5 Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Fri, 15 Sep 2017 13:51:42 +0200
Subject: [PATCH] Port DDS plugin to the new plugin system.

---
 examples/MQ/3-dds/CMakeLists.txt       |  2 --
 examples/MQ/3-dds/ex3-dds-topology.xml |  6 ++--
 examples/MQ/3-dds/ex3-dds.json         | 41 --------------------------
 3 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 examples/MQ/3-dds/ex3-dds.json

diff --git a/examples/MQ/3-dds/CMakeLists.txt b/examples/MQ/3-dds/CMakeLists.txt
index ad63fca9..cfc416ce 100644
--- a/examples/MQ/3-dds/CMakeLists.txt
+++ b/examples/MQ/3-dds/CMakeLists.txt
@@ -10,8 +10,6 @@ configure_file(${CMAKE_SOURCE_DIR}/examples/MQ/3-dds/ex3-dds-topology.xml
                ${CMAKE_BINARY_DIR}/bin/config/ex3-dds-topology.xml @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/examples/MQ/3-dds/ex3-dds-hosts.cfg
                ${CMAKE_BINARY_DIR}/bin/config/ex3-dds-hosts.cfg COPYONLY)
-configure_file(${CMAKE_SOURCE_DIR}/examples/MQ/3-dds/ex3-dds.json
-               ${CMAKE_BINARY_DIR}/bin/config/ex3-dds.json COPYONLY)
 
 Set(INCLUDE_DIRECTORIES
   ${CMAKE_SOURCE_DIR}/fairmq
diff --git a/examples/MQ/3-dds/ex3-dds-topology.xml b/examples/MQ/3-dds/ex3-dds-topology.xml
index ad037efc..b960c336 100644
--- a/examples/MQ/3-dds/ex3-dds-topology.xml
+++ b/examples/MQ/3-dds/ex3-dds-topology.xml
@@ -8,7 +8,7 @@
     <declrequirement id="SinkWorker" type="wnname" value="sink"/>
 
     <decltask id="Sampler">
-        <exe reachable="true">@CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-sampler --id sampler --log-color false --control libFairMQDDSControlPlugin.so --config libFairMQDDSConfigPlugin.so --mq-config @CMAKE_BINARY_DIR@/bin/config/ex3-dds.json</exe>
+        <exe reachable="true">@CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-sampler --id sampler --log-color false --channel-config name=data1,type=push,method=bind -S "&lt;@CMAKE_BINARY_DIR@/lib" -P dds</exe>
         <requirements>
             <id>SamplerWorker</id>
         </requirements>
@@ -18,7 +18,7 @@
     </decltask>
 
     <decltask id="Processor">
-        <exe reachable="true">@CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-processor --id processor_%taskIndex% --config-key processor --log-color false --control libFairMQDDSControlPlugin.so --config libFairMQDDSConfigPlugin.so --mq-config @CMAKE_BINARY_DIR@/bin/config/ex3-dds.json</exe>
+        <exe reachable="true">@CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-processor --id processor_%taskIndex% --config-key processor --log-color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -S "&lt;@CMAKE_BINARY_DIR@/lib" -P dds</exe>
         <requirements>
             <id>ProcessorWorker</id>
         </requirements>
@@ -29,7 +29,7 @@
     </decltask>
 
     <decltask id="Sink">
-        <exe reachable="true">@CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-sink --id sink --log-color false --control libFairMQDDSControlPlugin.so --config libFairMQDDSConfigPlugin.so --mq-config @CMAKE_BINARY_DIR@/bin/config/ex3-dds.json</exe>
+        <exe reachable="true">@CMAKE_BINARY_DIR@/bin/examples/MQ/3-dds/ex3-sink --id sink --log-color false --channel-config name=data2,type=pull,method=bind -S "&lt;@CMAKE_BINARY_DIR@/lib" -P dds</exe>
         <requirements>
             <id>SinkWorker</id>
         </requirements>
diff --git a/examples/MQ/3-dds/ex3-dds.json b/examples/MQ/3-dds/ex3-dds.json
deleted file mode 100644
index efb88836..00000000
--- a/examples/MQ/3-dds/ex3-dds.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "fairMQOptions": {
-        "devices": [
-            {
-                "id": "sampler",
-                "channels": [
-                    {
-                        "name": "data1",
-                        "type": "push",
-                        "method": "bind"
-                    }
-                ]
-            },
-            {
-                "key": "processor",
-                "channels": [
-                    {
-                        "name": "data1",
-                        "type": "pull",
-                        "method": "connect"
-                    },
-                    {
-                        "name": "data2",
-                        "type": "push",
-                        "method": "connect"
-                    }
-                ]
-            },
-            {
-                "id": "sink",
-                "channels": [
-                    {
-                        "name": "data2",
-                        "type": "pull",
-                        "method": "bind"
-                    }
-                ]
-            }
-        ]
-    }
-}