Repository: qpid-interop-test Updated Branches: refs/heads/master 422f55593 -> 69cb5a213
QPIDIT-22: Updates to match recent changes to the Proton C++ API. Minor fix to QUICKSTART file Project: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/commit/69cb5a21 Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/69cb5a21 Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/69cb5a21 Branch: refs/heads/master Commit: 69cb5a21371ef92b42406bcbaa5b49f7802c0b21 Parents: 422f555 Author: Kim van der Riet <[email protected]> Authored: Tue May 31 12:33:13 2016 -0400 Committer: Kim van der Riet <[email protected]> Committed: Tue May 31 12:33:13 2016 -0400 ---------------------------------------------------------------------- QUICKSTART | 2 +- shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.cpp | 2 +- shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/69cb5a21/QUICKSTART ---------------------------------------------------------------------- diff --git a/QUICKSTART b/QUICKSTART index 91a8cf2..7d820d5 100644 --- a/QUICKSTART +++ b/QUICKSTART @@ -67,7 +67,7 @@ export QPID_INTEROP_TEST_HOME=<abs path to top level qpid-interop-test directory b. qpid-proton installed to local directory <abs-path-to-local-proton-install-dir>: Assuming proton's "make install" has been run, from top level qpid-interop-test directory: -export PYTHONPATH=<abs-path-to-local-proton-install-dir>/lib64/proton/bindings/python:src/py/qpid-interop-test +export PYTHONPATH=<abs-path-to-local-proton-install-dir>/lib64/proton/bindings/python:src/python/qpid-interop-test export LD_LIBRARY_PATH=<abs-path-to-local-proton-install-dir>/lib64 export QPID_INTEROP_TEST_HOME=<abs path to top level qpid-interop-test directory> http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/69cb5a21/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.cpp ---------------------------------------------------------------------- diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.cpp b/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.cpp index 5026f80..e5c41d9 100644 --- a/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.cpp +++ b/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.cpp @@ -64,7 +64,7 @@ namespace qpidit void JmsReceiver::on_message(proton::delivery &d, proton::message &m) { if (_received < _expected) { - switch (m.message_annotations()[proton::symbol("x-opt-jms-msg-type")].get<int8_t>()) { + switch (m.message_annotations().get(proton::symbol("x-opt-jms-msg-type")).get<int8_t>()) { case JMS_MESSAGE_TYPE: receiveJmsMessage(m); break; http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/69cb5a21/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp ---------------------------------------------------------------------- diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp b/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp index 2d26f30..575282d 100644 --- a/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp +++ b/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp @@ -121,7 +121,7 @@ namespace qpidit throw InvalidTestValueError(subType, testValueStr); } msg.content_type(proton::symbol("application/octet-stream")); - msg.message_annotations()[proton::symbol("x-opt-jms-msg-type")] = s_jmsMessageTypeAnnotationValues["JMS_MESSAGE_TYPE"]; + msg.message_annotations().put(proton::symbol("x-opt-jms-msg-type"), s_jmsMessageTypeAnnotationValues["JMS_MESSAGE_TYPE"]); return msg; } @@ -186,7 +186,7 @@ namespace qpidit msg.body(bin); msg.inferred(true); msg.content_type(proton::symbol("application/octet-stream")); - msg.message_annotations()[proton::symbol("x-opt-jms-msg-type")] = s_jmsMessageTypeAnnotationValues["JMS_BYTESMESSAGE_TYPE"]; + msg.message_annotations().put(proton::symbol("x-opt-jms-msg-type"), s_jmsMessageTypeAnnotationValues["JMS_BYTESMESSAGE_TYPE"]); return msg; } @@ -228,7 +228,7 @@ namespace qpidit } msg.inferred(false); msg.body(m); - msg.message_annotations()[proton::symbol("x-opt-jms-msg-type")] = s_jmsMessageTypeAnnotationValues["JMS_MAPMESSAGE_TYPE"]; + msg.message_annotations().put(proton::symbol("x-opt-jms-msg-type"), s_jmsMessageTypeAnnotationValues["JMS_MAPMESSAGE_TYPE"]); return msg; } @@ -236,7 +236,7 @@ namespace qpidit msg.body(getJavaObjectBinary(subType, testValue.asString())); msg.inferred(true); msg.content_type(proton::symbol("application/x-java-serialized-object")); - msg.message_annotations()[proton::symbol("x-opt-jms-msg-type")] = s_jmsMessageTypeAnnotationValues["JMS_OBJECTMESSAGE_TYPE"]; + msg.message_annotations().put(proton::symbol("x-opt-jms-msg-type"), s_jmsMessageTypeAnnotationValues["JMS_OBJECTMESSAGE_TYPE"]); return msg; } @@ -275,14 +275,14 @@ namespace qpidit } msg.body(l); msg.inferred(true); - msg.message_annotations()[proton::symbol("x-opt-jms-msg-type")] = s_jmsMessageTypeAnnotationValues["JMS_STREAMMESSAGE_TYPE"]; + msg.message_annotations().put(proton::symbol("x-opt-jms-msg-type"), s_jmsMessageTypeAnnotationValues["JMS_STREAMMESSAGE_TYPE"]); return msg; } proton::message& JmsSender::setTextMessage(proton::message& msg, const Json::Value& testValue) { msg.body(testValue.asString()); msg.inferred(false); - msg.message_annotations()[proton::symbol("x-opt-jms-msg-type")] = s_jmsMessageTypeAnnotationValues["JMS_TEXTMESSAGE_TYPE"]; + msg.message_annotations().put(proton::symbol("x-opt-jms-msg-type"), s_jmsMessageTypeAnnotationValues["JMS_TEXTMESSAGE_TYPE"]); return msg; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
