WIP: support local transactipons

src/api/qpid-proton/CMakeLists.txt

@@ -1,6 +1,6 @@
 PROJECT(dtests-proton-cpp)
 
-set(PROTON_DIR /usr CACHE String "QPID Proton base directory")
+set(PROTON_DIR /usr CACHE STRING "QPID Proton base directory")
 
 include_directories(
     ${PROTON_DIR}/include
@@ -27,10 +27,10 @@ else ()
 endif ()
 
 
-cmake_policy(SET CMP0003 OLD)
+cmake_policy(SET CMP0003 NEW)
 add_library(
     dtests-proton-common
-    
+
     common/ModernClient.cpp
     ${MODERNClient_tracing_src}
 )
@@ -53,18 +53,22 @@ else (WIN32)
     )
 endif (WIN32)
 
-cmake_policy(SET CMP0003 OLD)
+cmake_policy(SET CMP0003 NEW)
 add_library(
     dtests-proton-reactor
 
     reactor/formatter/ReactorDecoder.cpp
     reactor/handler/CommonHandler.cpp
     reactor/handler/ConnectorHandler.cpp
     reactor/handler/SenderHandler.cpp
+    reactor/handler/TxSenderHandler.cpp
     reactor/handler/ReceiverHandler.cpp
+    reactor/handler/TxReceiverHandler.cpp
     reactor/ConnectingClient.cpp
     reactor/SendingClient.cpp
+    reactor/TxSendingClient.cpp
     reactor/ReceivingClient.cpp
+    reactor/TxReceivingClient.cpp
 )
 
 target_link_libraries(
@@ -100,7 +104,7 @@ set(proton-reactor-clients
 )
 
 foreach(client ${proton-reactor-clients})
-    cmake_policy(SET CMP0003 OLD)
+    cmake_policy(SET CMP0003 NEW)
     add_executable(${client}
             clients/${client}.cpp
     )

src/api/qpid-proton/clients/aac3_receiver.cpp

@@ -1,17 +1,33 @@
 /*
- * aac1_sender.cpp
+ * aac3_sender.cpp
  *
  *  Created on: Apr 14, 2015
  *      Author: opiske
  */
-
 #include <reactor/ReceivingClient.h>
+#include <reactor/TxReceivingClient.h>
 
 using dtests::proton::reactor::ReceivingClient;
+using dtests::proton::reactor::TxReceivingClient;
 
 int main(int argc, char** argv)
 {
-    ReceivingClient client = ReceivingClient();
+    int i = 0;
+    bool tx_mode = false;
+    std::string tx_opt = "--tx-";
+    while (i < argc) {
+        if (std::string(argv[i]).rfind("--tx-", 0) == 0) { // pos=0 limits the search to the prefix
+            tx_mode = true;
+            break;
+        }
+        i++;
+    }
 
-    return client.run(argc, argv);
+    if (tx_mode) {
+        TxReceivingClient client = TxReceivingClient();
+        return client.run(argc, argv);
+    } else {
+        ReceivingClient client = ReceivingClient();
+        return client.run(argc, argv);
+    }
 }

src/api/qpid-proton/clients/aac3_sender.cpp

@@ -1,23 +1,33 @@
 /*
- * aac1_sender.cpp
+ * aac3_sender.cpp
  *
  *  Created on: Apr 14, 2015
  *      Author: opiske
  */
-#include <cstdlib>
-
 #include <reactor/SendingClient.h>
+#include <reactor/TxSendingClient.h>
 
 using dtests::proton::reactor::SendingClient;
+using dtests::proton::reactor::TxSendingClient;
 
 int main(int argc, char** argv)
 {
-    SendingClient client = SendingClient();
-
-    return client.run(argc, argv);
-
+    int i = 0;
+    bool tx_mode = false;
+    std::string tx_opt = "--tx-";
+    while (i < argc) {
+        if (std::string(argv[i]).rfind("--tx-", 0) == 0) { // pos=0 limits the search to the prefix
+	    tx_mode = true;
+	    break;
+        }
+        i++;
+    }
+
+    if (tx_mode) {
+        TxSendingClient client = TxSendingClient();
+        return client.run(argc, argv);
+    } else {
+        SendingClient client = SendingClient();
+        return client.run(argc, argv);
+    }
 }
-
-
-
-

src/api/qpid-proton/reactor/ReceivingClient.h

@@ -52,6 +52,7 @@ class ReceivingClient : public ModernClient {
   private:
     typedef ModernClient super;
 
+  protected:
     void setMessageOptions(const OptionsSetter &setter, message &msg) const;
 
 };

src/api/qpid-proton/reactor/SendingClient.h

@@ -47,6 +47,7 @@ class SendingClient : public ModernClient {
   private:
     typedef ModernClient super;
 
+  protected:
     void setMessageOptions(const OptionsSetter &setter, message &msg) const;
     bool nameVal(const string& in, string& name, string& value, string& separator) const;
     void setMessageProperty(message *msg, const string &property) const;