You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2016/05/18 15:19:29 UTC
qpid-interop-test git commit: QPIDIT-21: Uptaded for latest changes
to Proton C++ API
Repository: qpid-interop-test
Updated Branches:
refs/heads/master 159efd475 -> f33dffc47
QPIDIT-21: Uptaded for latest changes to Proton C++ API
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/f33dffc4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/f33dffc4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/f33dffc4
Branch: refs/heads/master
Commit: f33dffc47f56b1361e3dfaf4c2041463d27701d7
Parents: 159efd4
Author: Kim van der Riet <kp...@apache.org>
Authored: Wed May 18 11:15:28 2016 -0400
Committer: Kim van der Riet <kp...@apache.org>
Committed: Wed May 18 11:15:28 2016 -0400
----------------------------------------------------------------------
shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp | 4 ++--
shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.hpp | 4 ++--
shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp | 4 ++--
shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.hpp | 4 ++--
shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.cpp | 4 ++--
shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.hpp | 4 ++--
shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp | 4 ++--
shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.hpp | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/f33dffc4/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp
index fb76f0e..0d4a8c0 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.cpp
@@ -24,7 +24,7 @@
#include <iostream>
#include <json/json.h>
#include "proton/connection.hpp"
-#include "proton/container.hpp"
+#include <proton/default_container.hpp>
#include "proton/delivery.hpp"
#include "proton/receiver.hpp"
#include "qpidit/QpidItErrors.hpp"
@@ -272,7 +272,7 @@ int main(int argc, char** argv) {
try {
qpidit::shim::AmqpReceiver receiver(oss.str(), argv[3], std::strtoul(argv[4], NULL, 0));
- proton::container(receiver).run();
+ proton::default_container(receiver).run();
std::cout << argv[3] << std::endl;
std::cout << receiver.getReceivedValueList();
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/f33dffc4/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.hpp b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.hpp
index c11fbaf..64909f9 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.hpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpReceiver.hpp
@@ -24,7 +24,7 @@
#include <iomanip>
#include <json/value.h>
-#include "proton/handler.hpp"
+#include "proton/messaging_handler.hpp"
#include "proton/types.hpp"
#include <sstream>
@@ -33,7 +33,7 @@ namespace qpidit
namespace shim
{
- class AmqpReceiver : public proton::handler
+ class AmqpReceiver : public proton::messaging_handler
{
protected:
const std::string _brokerUrl;
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/f33dffc4/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp
index 960308e..b256551 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp
@@ -24,7 +24,7 @@
#include <iostream>
#include <json/json.h>
#include "proton/connection.hpp"
-#include "proton/container.hpp"
+#include "proton/default_container.hpp"
#include "proton/sender.hpp"
#include "proton/tracker.hpp"
@@ -354,7 +354,7 @@ int main(int argc, char** argv) {
}
qpidit::shim::AmqpSender sender(oss.str(), argv[3], testValues);
- proton::container(sender).run();
+ proton::default_container(sender).run();
} catch (const std::exception& e) {
std::cerr << "AmqpSender error: " << e.what() << std::endl;
exit(1);
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/f33dffc4/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.hpp b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.hpp
index f27c371..0d4a87a 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.hpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.hpp
@@ -24,7 +24,7 @@
#include <iomanip>
#include <json/value.h>
-#include "proton/handler.hpp"
+#include "proton/messaging_handler.hpp"
#include "proton/message.hpp"
#include "qpidit/QpidItErrors.hpp"
@@ -33,7 +33,7 @@ namespace qpidit
namespace shim
{
- class AmqpSender : public proton::handler
+ class AmqpSender : public proton::messaging_handler
{
protected:
const std::string _brokerUrl;
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/f33dffc4/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 f062577..845c39d 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.cpp
@@ -24,7 +24,7 @@
#include <iostream>
#include <json/json.h>
#include "proton/connection.hpp"
-#include "proton/container.hpp"
+#include "proton/default_container.hpp"
#include "proton/delivery.hpp"
#include "qpidit/QpidItErrors.hpp"
@@ -305,7 +305,7 @@ int main(int argc, char** argv) {
}
qpidit::shim::JmsReceiver receiver(oss.str(), argv[3], testNumberMap);
- proton::container(receiver).run();
+ proton::default_container(receiver).run();
std::cout << argv[3] << std::endl;
std::cout << receiver.getReceivedValueMap();
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/f33dffc4/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.hpp b/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.hpp
index 198a957..ff12ac9 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.hpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/JmsReceiver.hpp
@@ -24,7 +24,7 @@
#include <iomanip>
#include <json/value.h>
-#include "proton/handler.hpp"
+#include "proton/messaging_handler.hpp"
#include "proton/types.hpp"
#include <sstream>
@@ -33,7 +33,7 @@ namespace qpidit
namespace shim
{
- class JmsReceiver : public proton::handler
+ class JmsReceiver : public proton::messaging_handler
{
protected:
static proton::symbol s_jmsMessageTypeAnnotationKey;
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/f33dffc4/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 102fc1d..66bedb9 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.cpp
@@ -26,7 +26,7 @@
#include <iostream>
#include <json/json.h>
#include "proton/connection.hpp"
-#include "proton/container.hpp"
+#include "proton/default_container.hpp"
#include "proton/tracker.hpp"
#include <stdio.h>
@@ -346,7 +346,7 @@ int main(int argc, char** argv) {
}
qpidit::shim::JmsSender sender(oss.str(), argv[3], testValueMap);
- proton::container(sender).run();
+ proton::default_container(sender).run();
} catch (const std::exception& e) {
std::cerr << "JmsSender error: " << e.what() << std::endl;
}
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/f33dffc4/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.hpp b/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.hpp
index f953b43..ef43dcb 100644
--- a/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.hpp
+++ b/shims/qpid-proton-cpp/src/qpidit/shim/JmsSender.hpp
@@ -23,7 +23,7 @@
#define SRC_QPIDIT_SHIM_JMSSENDER_HPP_
#include "json/value.h"
-#include "proton/handler.hpp"
+#include "proton/messaging_handler.hpp"
#include "qpidit/QpidItErrors.hpp"
#include <typeinfo>
@@ -36,7 +36,7 @@ namespace qpidit
namespace shim
{
- class JmsSender : public proton::handler
+ class JmsSender : public proton::messaging_handler
{
protected:
static proton::symbol s_jmsMessageTypeAnnotationKey;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org