QPID-4905: Stopped broker::Broker needing to refer to broker::Connection

- Also removed ConnectionToken which didn't add anything over OwnershipToken

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1494640 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 0 deletions

diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index c14f534826..1d901025b6 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -23,6 +23,9 @@
 
 #include "qpid/amqp/CharSequence.h"
 #include "qpid/amqp/MapHandler.h"
+#include "qpid/broker/ConnectionIdentity.h"
+#include "qpid/management/ManagementObject.h"
+#include "qpid/management/Manageable.h"
 #include "qpid/StringUtils.h"
 #include "qpid/log/Statement.h"
 
@@ -199,6 +202,12 @@ uint8_t Message::getPriority() const
 
 bool Message::getIsManagementMessage() const { return isManagementMessage; }
 void Message::setIsManagementMessage(bool b) { isManagementMessage = b; }
+
+const OwnershipToken* Message::getPublisherOwnership() const {  return publisher->getOwnership(); }
+const management::ObjectId Message::getPublisherObjectId() const { return publisher->getObjectId(); }
+const std::string& Message::getPublisherUserId() const { return publisher->getUserId(); }
+const std::string& Message::getPublisherUrl() const { return publisher->getUrl(); }
+
 qpid::framing::SequenceNumber Message::getSequence() const
 {
     return sequence;