QPID-4449 - Reverted much of the original change and re-implemented the fix in a simpler way.

The build-define _IN_QPID_BROKER is now used for modules built in the broker.  The shared-pointer
changes are conditionally compiled only for in-broker cases.


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

32 files changed, 58 insertions, 65 deletions

diff --git a/cpp/src/qpid/acl/Acl.cpp b/cpp/src/qpid/acl/Acl.cpp
index 3634c0cdc1..61e0b56104 100644
--- a/cpp/src/qpid/acl/Acl.cpp
+++ b/cpp/src/qpid/acl/Acl.cpp
@@ -317,7 +317,7 @@ Acl::~Acl(){
     broker->getConnectionObservers().remove(connectionCounter);
 }
 
-ManagementObject::shared_ptr Acl::GetManagementObjectShared(void) const
+ManagementObject::shared_ptr Acl::GetManagementObject(void) const
 {
     return mgmtObject;
 }
diff --git a/cpp/src/qpid/acl/Acl.h b/cpp/src/qpid/acl/Acl.h
index 8c1a925713..ea3c6586a3 100644
--- a/cpp/src/qpid/acl/Acl.h
+++ b/cpp/src/qpid/acl/Acl.h
@@ -117,7 +117,7 @@ private:
     bool readAclFile(std::string& aclFile, std::string& errorText);
     Manageable::status_t lookup       (management::Args& args, std::string& text);
     Manageable::status_t lookupPublish(management::Args& args, std::string& text);
-    virtual qpid::management::ManagementObject::shared_ptr GetManagementObjectShared(void) const;
+    virtual qpid::management::ManagementObject::shared_ptr GetManagementObject(void) const;
     virtual management::Manageable::status_t ManagementMethod (uint32_t methodId, management::Args& args, std::string& text);
 
 };
diff --git a/cpp/src/qpid/broker/Bridge.cpp b/cpp/src/qpid/broker/Bridge.cpp
index 90cb1a79ed..6d3894d65f 100644
--- a/cpp/src/qpid/broker/Bridge.cpp
+++ b/cpp/src/qpid/broker/Bridge.cpp
@@ -298,7 +298,7 @@ uint32_t Bridge::encodedSize() const
         + 2;              // sync
 }
 
-management::ManagementObject::shared_ptr Bridge::GetManagementObjectShared (void) const
+management::ManagementObject::shared_ptr Bridge::GetManagementObject(void) const
 {
     return mgmtObject;
 }
diff --git a/cpp/src/qpid/broker/Bridge.h b/cpp/src/qpid/broker/Bridge.h
index 9f99c9ce01..da397b8f77 100644
--- a/cpp/src/qpid/broker/Bridge.h
+++ b/cpp/src/qpid/broker/Bridge.h
@@ -73,7 +73,7 @@ class Bridge : public PersistableConfig,
 
     bool isDetached() const { return detached; }
 
-    management::ManagementObject::shared_ptr GetManagementObjectShared() const;
+    management::ManagementObject::shared_ptr GetManagementObject() const;
     management::Manageable::status_t ManagementMethod(uint32_t methodId,
                                                       management::Args& args,
                                                       std::string& text);
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 292820abe4..cb93abfac7 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -234,7 +234,7 @@ Broker::Broker(const Broker::Options& conf) :
         systemObject = System::shared_ptr(system);
 
         mgmtObject = _qmf::Broker::shared_ptr(new _qmf::Broker(managementAgent.get(), this, system, "amqp-broker"));
-        mgmtObject->set_systemRef(system->GetManagementObjectShared()->getObjectId());
+        mgmtObject->set_systemRef(system->GetManagementObject()->getObjectId());
         mgmtObject->set_port(conf.port);
         mgmtObject->set_workerThreads(conf.workerThreads);
         mgmtObject->set_connBacklog(conf.connectionBacklog);
@@ -454,7 +454,7 @@ Broker::~Broker() {
     QPID_LOG(notice, "Shut down");
 }
 
-ManagementObject::shared_ptr Broker::GetManagementObjectShared(void) const
+ManagementObject::shared_ptr Broker::GetManagementObject(void) const
 {
     return mgmtObject;
 }
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index eecfd3925c..0a8f406dbf 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -235,7 +235,7 @@ class Broker : public sys::Runnable, public Plugin::Target,
     SessionManager& getSessionManager() { return sessionManager; }
     const std::string& getFederationTag() const { return federationTag; }
 
-    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObjectShared() const;
+    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObject() const;
     QPID_BROKER_EXTERN management::Manageable* GetVhostObject() const;
     QPID_BROKER_EXTERN management::Manageable::status_t ManagementMethod(
         uint32_t methodId, management::Args& args, std::string& text);
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp
index 238bb71fb5..3cb30a82e3 100644
--- a/cpp/src/qpid/broker/Connection.cpp
+++ b/cpp/src/qpid/broker/Connection.cpp
@@ -402,7 +402,7 @@ SessionHandler& Connection::getChannel(ChannelId id) {
     return *ptr_map_ptr(i);
 }
 
-ManagementObject::shared_ptr Connection::GetManagementObjectShared(void) const
+ManagementObject::shared_ptr Connection::GetManagementObject(void) const
 {
     return mgmtObject;
 }
diff --git a/cpp/src/qpid/broker/Connection.h b/cpp/src/qpid/broker/Connection.h
index 91470dc3df..2f25b0e3f9 100644
--- a/cpp/src/qpid/broker/Connection.h
+++ b/cpp/src/qpid/broker/Connection.h
@@ -112,7 +112,7 @@ class Connection : public sys::ConnectionInputHandler,
     void closeChannel(framing::ChannelId channel);
 
     // Manageable entry points
-    management::ManagementObject::shared_ptr GetManagementObjectShared (void) const;
+    management::ManagementObject::shared_ptr GetManagementObject(void) const;
     management::Manageable::status_t
         ManagementMethod (uint32_t methodId, management::Args& args, std::string&);
 
diff --git a/cpp/src/qpid/broker/Exchange.cpp b/cpp/src/qpid/broker/Exchange.cpp
index 20bd76f645..9098c75f0b 100644
--- a/cpp/src/qpid/broker/Exchange.cpp
+++ b/cpp/src/qpid/broker/Exchange.cpp
@@ -177,7 +177,7 @@ Exchange::Exchange (const string& _name, Manageable* parent, Broker* b) :
             mgmtExchange->set_autoDelete(false);
             agent->addObject(mgmtExchange, 0, durable);
             if (broker)
-                brokerMgmtObject = boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(broker->GetManagementObjectShared());
+                brokerMgmtObject = boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(broker->GetManagementObject());
         }
     }
 }
@@ -198,7 +198,7 @@ Exchange::Exchange(const string& _name, bool _durable, const qpid::framing::Fiel
             mgmtExchange->set_arguments(ManagementAgent::toMap(args));
             agent->addObject(mgmtExchange, 0, durable);
             if (broker)
-                brokerMgmtObject = boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(broker->GetManagementObjectShared());
+                brokerMgmtObject = boost::dynamic_pointer_cast<qmf::org::apache::qpid::broker::Broker>(broker->GetManagementObject());
         }
     }
 
@@ -227,7 +227,7 @@ void Exchange::setAlternate(Exchange::shared_ptr _alternate)
     alternate = _alternate;
     if (mgmtExchange != 0) {
         if (alternate.get() != 0)
-            mgmtExchange->set_altExchange(alternate->GetManagementObjectShared()->getObjectId());
+            mgmtExchange->set_altExchange(alternate->GetManagementObject()->getObjectId());
         else
             mgmtExchange->clr_altExchange();
     }
@@ -294,7 +294,7 @@ void Exchange::recoveryComplete(ExchangeRegistry& exchanges)
     }
 }
 
-ManagementObject::shared_ptr Exchange::GetManagementObjectShared (void) const
+ManagementObject::shared_ptr Exchange::GetManagementObject (void) const
 {
     return mgmtExchange;
 }
@@ -352,7 +352,7 @@ Exchange::Binding::Binding(const string& _key, Queue::shared_ptr _queue, Exchang
 Exchange::Binding::~Binding ()
 {
     if (mgmtBinding != 0) {
-        _qmf::Queue::shared_ptr mo = boost::dynamic_pointer_cast<_qmf::Queue>(queue->GetManagementObjectShared());
+        _qmf::Queue::shared_ptr mo = boost::dynamic_pointer_cast<_qmf::Queue>(queue->GetManagementObject());
         if (mo != 0)
             mo->dec_bindingCount();
         mgmtBinding->resourceDestroy ();
@@ -367,7 +367,7 @@ void Exchange::Binding::startManagement()
         if (broker != 0) {
             ManagementAgent* agent = broker->getManagementAgent();
             if (agent != 0) {
-                _qmf::Queue::shared_ptr mo = boost::dynamic_pointer_cast<_qmf::Queue>(queue->GetManagementObjectShared());
+                _qmf::Queue::shared_ptr mo = boost::dynamic_pointer_cast<_qmf::Queue>(queue->GetManagementObject());
                 if (mo != 0) {
                     management::ObjectId queueId = mo->getObjectId();
 
@@ -383,7 +383,7 @@ void Exchange::Binding::startManagement()
     }
 }
 
-ManagementObject::shared_ptr Exchange::Binding::GetManagementObjectShared () const
+ManagementObject::shared_ptr Exchange::Binding::GetManagementObject () const
 {
     return mgmtBinding;
 }
diff --git a/cpp/src/qpid/broker/Exchange.h b/cpp/src/qpid/broker/Exchange.h
index ec9a0bea2f..70ed393f64 100644
--- a/cpp/src/qpid/broker/Exchange.h
+++ b/cpp/src/qpid/broker/Exchange.h
@@ -58,7 +58,7 @@ public:
                 framing::FieldTable args = framing::FieldTable(), const std::string& origin = std::string());
         ~Binding();
         void startManagement();
-        management::ManagementObject::shared_ptr GetManagementObjectShared() const;
+        management::ManagementObject::shared_ptr GetManagementObject() const;
     };
 
 private:
@@ -210,7 +210,7 @@ public:
     static QPID_BROKER_EXTERN Exchange::shared_ptr decode(ExchangeRegistry& exchanges, framing::Buffer& buffer);
 
     // Manageable entry points
-    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObjectShared(void) const;
+    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObject(void) const;
 
     // Federation hooks
     class DynamicBridge {
diff --git a/cpp/src/qpid/broker/Link.cpp b/cpp/src/qpid/broker/Link.cpp
index db789d79cf..0c18e08cd1 100644
--- a/cpp/src/qpid/broker/Link.cpp
+++ b/cpp/src/qpid/broker/Link.cpp
@@ -292,8 +292,8 @@ void Link::opened() {
     Mutex::ScopedLock mutex(lock);
     if (!connection) return;
 
-    if (!hideManagement() && connection->GetManagementObjectShared()) {
-        mgmtObject->set_connectionRef(connection->GetManagementObjectShared()->getObjectId());
+    if (!hideManagement() && connection->GetManagementObject()) {
+        mgmtObject->set_connectionRef(connection->GetManagementObject()->getObjectId());
     }
 
     // Get default URL from known-hosts if not already set
@@ -669,7 +669,7 @@ uint32_t Link::encodedSize() const
         + password.size() + 1;
 }
 
-ManagementObject::shared_ptr Link::GetManagementObjectShared (void) const
+ManagementObject::shared_ptr Link::GetManagementObject(void) const
 {
     return mgmtObject;
 }
diff --git a/cpp/src/qpid/broker/Link.h b/cpp/src/qpid/broker/Link.h
index 2087b5259c..97511de08f 100644
--- a/cpp/src/qpid/broker/Link.h
+++ b/cpp/src/qpid/broker/Link.h
@@ -183,7 +183,7 @@ class Link : public PersistableConfig, public management::Manageable {
     static bool isEncodedLink(const std::string& key);
 
     // Manageable entry points
-    management::ManagementObject::shared_ptr GetManagementObjectShared(void) const;
+    management::ManagementObject::shared_ptr GetManagementObject(void) const;
     management::Manageable::status_t ManagementMethod(uint32_t, management::Args&, std::string&);
 
     // manage the exchange owned by this link
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 271e8476f9..8af61bb49a 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -198,7 +198,7 @@ Queue::Queue(const string& _name, const QueueSettings& _settings,
                 new _qmf::Queue(agent, this, parent, _name, _store != 0, settings.autodelete));
             mgmtObject->set_arguments(settings.asMap());
             agent->addObject(mgmtObject, 0, store != 0);
-            brokerMgmtObject = boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObjectShared());
+            brokerMgmtObject = boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObject());
             if (brokerMgmtObject)
                 brokerMgmtObject->inc_queueCount();
         }
@@ -1108,7 +1108,7 @@ void Queue::setPersistenceId(uint64_t _persistenceId) const
 {
     if (mgmtObject != 0 && persistenceId == 0 && externalQueueStore)
     {
-        ManagementObject::shared_ptr childObj = externalQueueStore->GetManagementObjectShared();
+        ManagementObject::shared_ptr childObj = externalQueueStore->GetManagementObject();
         if (childObj != 0)
             childObj->setReference(mgmtObject->getObjectId());
     }
@@ -1154,7 +1154,7 @@ void Queue::setAlternateExchange(boost::shared_ptr<Exchange> exchange)
     alternateExchange = exchange;
     if (mgmtObject) {
         if (exchange.get() != 0)
-            mgmtObject->set_altExchange(exchange->GetManagementObjectShared()->getObjectId());
+            mgmtObject->set_altExchange(exchange->GetManagementObject()->getObjectId());
         else
             mgmtObject->clr_altExchange();
     }
@@ -1258,7 +1258,7 @@ void Queue::setExternalQueueStore(ExternalQueueStore* inst) {
     externalQueueStore = inst;
 
     if (inst) {
-        ManagementObject::shared_ptr childObj = inst->GetManagementObjectShared();
+        ManagementObject::shared_ptr childObj = inst->GetManagementObject();
         if (childObj != 0 && mgmtObject != 0)
             childObj->setReference(mgmtObject->getObjectId());
     }
@@ -1306,7 +1306,7 @@ void Queue::countLoadedFromDisk(uint64_t size) const
 }
 
 
-ManagementObject::shared_ptr Queue::GetManagementObjectShared (void) const
+ManagementObject::shared_ptr Queue::GetManagementObject(void) const
 {
     return mgmtObject;
 }
diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index 25cefd144d..bf1103902e 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -340,7 +340,7 @@ class Queue : public boost::enable_shared_from_this<Queue>,
     QPID_BROKER_EXTERN void countLoadedFromDisk(uint64_t size) const;
 
     // Manageable entry points
-    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObjectShared (void) const;
+    QPID_BROKER_EXTERN management::ManagementObject::shared_ptr GetManagementObject(void) const;
     management::Manageable::status_t
     QPID_BROKER_EXTERN ManagementMethod (uint32_t methodId, management::Args& args, std::string& text);
     QPID_BROKER_EXTERN void query(::qpid::types::Variant::Map&) const;
diff --git a/cpp/src/qpid/broker/QueueFlowLimit.cpp b/cpp/src/qpid/broker/QueueFlowLimit.cpp
index 9d6053669b..944cc7e838 100644
--- a/cpp/src/qpid/broker/QueueFlowLimit.cpp
+++ b/cpp/src/qpid/broker/QueueFlowLimit.cpp
@@ -78,7 +78,7 @@ QueueFlowLimit::QueueFlowLimit(Queue *_queue,
         if (queue->getSettings().maxDepth.hasCount()) maxCount = queue->getSettings().maxDepth.getCount();
         if (queue->getSettings().maxDepth.hasCount()) maxSize = queue->getSettings().maxDepth.getSize();
         broker = queue->getBroker();
-        queueMgmtObj = boost::dynamic_pointer_cast<_qmfBroker::Queue> (queue->GetManagementObjectShared());
+        queueMgmtObj = boost::dynamic_pointer_cast<_qmfBroker::Queue> (queue->GetManagementObject());
         if (queueMgmtObj) {
             queueMgmtObj->set_flowStopped(isFlowControlActive());
         }
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp
index 0dc8d6cdfe..f6411c98dd 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/cpp/src/qpid/broker/SemanticState.cpp
@@ -303,14 +303,14 @@ Consumer(_name, type),
     deliveryCount(0),
     protocols(parent->getSession().getBroker().getProtocolRegistry())
 {
-    if (parent != 0 && queue.get() != 0 && queue->GetManagementObjectShared() !=0)
+    if (parent != 0 && queue.get() != 0 && queue->GetManagementObject() !=0)
     {
         ManagementAgent* agent = parent->session.getBroker().getManagementAgent();
         qpid::management::Manageable* ms = dynamic_cast<qpid::management::Manageable*> (&(parent->session));
 
         if (agent != 0)
         {
-            mgmtObject = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, ms , queue->GetManagementObjectShared()->getObjectId(), getTag(),
+            mgmtObject = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, ms , queue->GetManagementObject()->getObjectId(), getTag(),
                                                                                !acquire, ackExpected, exclusive, ManagementAgent::toMap(arguments)));
             agent->addObject (mgmtObject);
             mgmtObject->set_creditMode("WINDOW");
@@ -318,7 +318,7 @@ Consumer(_name, type),
     }
 }
 
-ManagementObject::shared_ptr SemanticState::ConsumerImpl::GetManagementObjectShared (void) const
+ManagementObject::shared_ptr SemanticState::ConsumerImpl::GetManagementObject (void) const
 {
     return mgmtObject;
 }
diff --git a/cpp/src/qpid/broker/SemanticState.h b/cpp/src/qpid/broker/SemanticState.h
index afb527b0f5..be7c8d490a 100644
--- a/cpp/src/qpid/broker/SemanticState.h
+++ b/cpp/src/qpid/broker/SemanticState.h
@@ -163,7 +163,7 @@ class SemanticState : private boost::noncopyable {
 
         // manageable entry points
         QPID_BROKER_EXTERN management::ManagementObject::shared_ptr
-        GetManagementObjectShared(void) const;
+        GetManagementObject(void) const;
 
         QPID_BROKER_EXTERN management::Manageable::status_t
         ManagementMethod(uint32_t methodId, management::Args& args, std::string& text);
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index f48bf653fb..a6494bc362 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -65,7 +65,7 @@ SessionState::SessionState(
 }
 
 void SessionState::addManagementObject() {
-    if (GetManagementObjectShared()) return; // Already added.
+    if (GetManagementObject()) return; // Already added.
     Manageable* parent = broker.GetVhostObject ();
     if (parent != 0) {
         ManagementAgent* agent = getBroker().getManagementAgent();
@@ -127,7 +127,7 @@ void SessionState::attach(SessionHandler& h) {
     if (mgmtObject != 0)
     {
         mgmtObject->set_attached (1);
-        mgmtObject->set_connectionRef (h.getConnection().GetManagementObjectShared()->getObjectId());
+        mgmtObject->set_connectionRef (h.getConnection().GetManagementObject()->getObjectId());
         mgmtObject->set_channelId (h.getChannel());
     }
     asyncCommandCompleter->attached();
@@ -148,7 +148,7 @@ void SessionState::giveReadCredit(int32_t credit) {
         getConnection().outputTasks.giveReadCredit(credit);
 }
 
-ManagementObject::shared_ptr SessionState::GetManagementObjectShared (void) const
+ManagementObject::shared_ptr SessionState::GetManagementObject(void) const
 {
     return mgmtObject;
 }
diff --git a/cpp/src/qpid/broker/SessionState.h b/cpp/src/qpid/broker/SessionState.h
index 06643fdbef..ae28df8026 100644
--- a/cpp/src/qpid/broker/SessionState.h
+++ b/cpp/src/qpid/broker/SessionState.h
@@ -110,7 +110,7 @@ class SessionState : public qpid::SessionState,
                        const qpid::types::Variant::Map& annotations, bool sync);
 
     // Manageable entry points
-    management::ManagementObject::shared_ptr GetManagementObjectShared (void) const;
+    management::ManagementObject::shared_ptr GetManagementObject(void) const;
     management::Manageable::status_t
     ManagementMethod (uint32_t methodId, management::Args& args, std::string&);
 
diff --git a/cpp/src/qpid/broker/System.h b/cpp/src/qpid/broker/System.h
index 179a3275a7..52643fb2d5 100644
--- a/cpp/src/qpid/broker/System.h
+++ b/cpp/src/qpid/broker/System.h
@@ -45,7 +45,7 @@ class System : public management::Manageable
 
     System (std::string _dataDir, Broker* broker = 0);
 
-    management::ManagementObject::shared_ptr GetManagementObjectShared (void) const
+    management::ManagementObject::shared_ptr GetManagementObject(void) const
     { return mgmtObject; }
 
 
diff --git a/cpp/src/qpid/broker/Vhost.h b/cpp/src/qpid/broker/Vhost.h
index c4b1c280e1..599b821870 100644
--- a/cpp/src/qpid/broker/Vhost.h
+++ b/cpp/src/qpid/broker/Vhost.h
@@ -40,7 +40,7 @@ class Vhost : public management::Manageable
 
     Vhost (management::Manageable* parentBroker, Broker* broker = 0);
 
-    management::ManagementObject::shared_ptr GetManagementObjectShared (void) const
+    management::ManagementObject::shared_ptr GetManagementObject (void) const
     { return mgmtObject; }
     void setFederationTag(const std::string& tag);
 };
diff --git a/cpp/src/qpid/broker/amqp/ManagedConnection.cpp b/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
index 8daf860f8e..0253ba5552 100644
--- a/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
+++ b/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
@@ -73,7 +73,7 @@ void ManagedConnection::setSaslSsf(int ssf)
     connection->set_saslSsf(ssf);
 }
 
-qpid::management::ManagementObject::shared_ptr ManagedConnection::GetManagementObjectShared() const
+qpid::management::ManagementObject::shared_ptr ManagedConnection::GetManagementObject() const
 {
     return connection;
 }
diff --git a/cpp/src/qpid/broker/amqp/ManagedConnection.h b/cpp/src/qpid/broker/amqp/ManagedConnection.h
index f1514d11c5..e2d0376918 100644
--- a/cpp/src/qpid/broker/amqp/ManagedConnection.h
+++ b/cpp/src/qpid/broker/amqp/ManagedConnection.h
@@ -44,7 +44,7 @@ class ManagedConnection : public qpid::management::Manageable, public Connection
     std::string getUserid() const;
     void setSaslMechanism(const std::string&);
     void setSaslSsf(int);
-    qpid::management::ManagementObject::shared_ptr GetManagementObjectShared() const;
+    qpid::management::ManagementObject::shared_ptr GetManagementObject() const;
     bool isLocal(const ConnectionToken* t) const;
     void incomingMessageReceived();
     void outgoingMessageSent();
diff --git a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp b/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
index 0fe20f68ab..f36a1e8da4 100644
--- a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
+++ b/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
@@ -37,7 +37,7 @@ ManagedOutgoingLink::ManagedOutgoingLink(Broker& broker, Queue& q, ManagedSessio
 {
     qpid::management::ManagementAgent* agent = broker.getManagementAgent();
     if (agent) {
-        subscription = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, &p, q.GetManagementObjectShared()->getObjectId(), id,
+        subscription = _qmf::Subscription::shared_ptr(new _qmf::Subscription(agent, this, &p, q.GetManagementObject()->getObjectId(), id,
                                                            false/*FIXME*/, true/*FIXME*/, topic, qpid::types::Variant::Map()));
         agent->addObject(subscription);
         subscription->set_creditMode("n/a");
@@ -48,7 +48,7 @@ ManagedOutgoingLink::~ManagedOutgoingLink()
     if (subscription != 0) subscription->resourceDestroy();
 }
 
-qpid::management::ManagementObject::shared_ptr ManagedOutgoingLink::GetManagementObjectShared() const
+qpid::management::ManagementObject::shared_ptr ManagedOutgoingLink::GetManagementObject() const
 {
     return subscription;
 }
diff --git a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h b/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
index 19667da698..20a1095db2 100644
--- a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
+++ b/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
@@ -39,7 +39,7 @@ class ManagedOutgoingLink : public qpid::management::Manageable
   public:
     ManagedOutgoingLink(Broker& broker, Queue&, ManagedSession& parent, const std::string id, bool topic);
     virtual ~ManagedOutgoingLink();
-    qpid::management::ManagementObject::shared_ptr GetManagementObjectShared() const;
+    qpid::management::ManagementObject::shared_ptr GetManagementObject() const;
     void outgoingMessageSent();
     void outgoingMessageAccepted();
     void outgoingMessageRejected();
diff --git a/cpp/src/qpid/broker/amqp/ManagedSession.cpp b/cpp/src/qpid/broker/amqp/ManagedSession.cpp
index f1c4940118..9bef0e842b 100644
--- a/cpp/src/qpid/broker/amqp/ManagedSession.cpp
+++ b/cpp/src/qpid/broker/amqp/ManagedSession.cpp
@@ -38,7 +38,7 @@ ManagedSession::ManagedSession(Broker& broker, ManagedConnection& p, const std::
         session->set_attached(true);
         session->set_detachedLifespan(0);
         session->clr_expireTime();
-        session->set_connectionRef(parent.GetManagementObjectShared()->getObjectId());
+        session->set_connectionRef(parent.GetManagementObject()->getObjectId());
         agent->addObject(session);
     }
 }
@@ -48,7 +48,7 @@ ManagedSession::~ManagedSession()
     if (session) session->resourceDestroy();
 }
 
-qpid::management::ManagementObject::shared_ptr ManagedSession::GetManagementObjectShared() const
+qpid::management::ManagementObject::shared_ptr ManagedSession::GetManagementObject() const
 {
     return session;
 }
diff --git a/cpp/src/qpid/broker/amqp/ManagedSession.h b/cpp/src/qpid/broker/amqp/ManagedSession.h
index 2f62c8705a..1f56964bb6 100644
--- a/cpp/src/qpid/broker/amqp/ManagedSession.h
+++ b/cpp/src/qpid/broker/amqp/ManagedSession.h
@@ -40,7 +40,7 @@ class ManagedSession : public qpid::management::Manageable, public OwnershipToke
   public:
     ManagedSession(Broker& broker, ManagedConnection& parent, const std::string id);
     virtual ~ManagedSession();
-    qpid::management::ManagementObject::shared_ptr GetManagementObjectShared() const;
+    qpid::management::ManagementObject::shared_ptr GetManagementObject() const;
     bool isLocal(const ConnectionToken* t) const;
     void incomingMessageReceived();
     void incomingMessageAccepted();
diff --git a/cpp/src/qpid/ha/HaBroker.h b/cpp/src/qpid/ha/HaBroker.h
index 4b3f1d49c1..530211ced4 100644
--- a/cpp/src/qpid/ha/HaBroker.h
+++ b/cpp/src/qpid/ha/HaBroker.h
@@ -71,7 +71,7 @@ class HaBroker : public management::Manageable
     void initialize();
 
     // Implement Manageable.
-    qpid::management::ManagementObject::shared_ptr GetManagementObjectShared() const { return mgmtObject; }
+    qpid::management::ManagementObject::shared_ptr GetManagementObject() const { return mgmtObject; }
     management::Manageable::status_t ManagementMethod (
         uint32_t methodId, management::Args& args, std::string& text);
 
diff --git a/cpp/src/qpid/management/Manageable.cpp b/cpp/src/qpid/management/Manageable.cpp
index 322ec16656..651215ffb5 100644
--- a/cpp/src/qpid/management/Manageable.cpp
+++ b/cpp/src/qpid/management/Manageable.cpp
@@ -41,16 +41,6 @@ string Manageable::StatusText (status_t status, string text)
     return "??";
 }
 
-ManagementObject* Manageable::GetManagementObject(void) const
-{
-    return 0;
-}
-
-ManagementObject::shared_ptr Manageable::GetManagementObjectShared() const
-{
-    return ManagementObject::shared_ptr();
-}
-
 Manageable::status_t Manageable::ManagementMethod (uint32_t, Args&, std::string&)
 {
     return STATUS_UNKNOWN_METHOD;
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp
index 3f647ba052..7b8808c0a0 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/cpp/src/qpid/management/ManagementAgent.cpp
@@ -698,7 +698,7 @@ void ManagementAgent::periodicProcessing (void)
     //
     if (publish) {
         uint64_t uptime = sys::Duration(startTime, sys::now());
-        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObjectShared())->set_uptime(uptime);
+        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObject())->set_uptime(uptime);
         qpid::sys::MemStat::loadMemInfo(memstat.get());
     }
 
@@ -1722,7 +1722,7 @@ void ManagementAgent::handleAttachRequest (Buffer& inBuffer, const string& reply
     string   label;
     uint32_t requestedBrokerBank, requestedAgentBank;
     uint32_t assignedBank;
-    ObjectId connectionRef = ((const ConnectionState*) connToken)->GetManagementObjectShared()->getObjectId();
+    ObjectId connectionRef = ((const ConnectionState*) connToken)->GetManagementObject()->getObjectId();
     Uuid     systemId;
 
     moveNewObjects();
@@ -1754,7 +1754,7 @@ void ManagementAgent::handleAttachRequest (Buffer& inBuffer, const string& reply
     agent->mgmtObject = _qmf::Agent::shared_ptr(new _qmf::Agent (this, agent.get()));
     agent->mgmtObject->set_connectionRef(agent->connectionRef);
     agent->mgmtObject->set_label        (label);
-    agent->mgmtObject->set_registeredTo (broker->GetManagementObjectShared()->getObjectId());
+    agent->mgmtObject->set_registeredTo (broker->GetManagementObject()->getObjectId());
     agent->mgmtObject->set_systemId     ((const unsigned char*)systemId.data());
     agent->mgmtObject->set_brokerBank   (brokerBank);
     agent->mgmtObject->set_agentBank    (assignedBank);
@@ -1831,7 +1831,7 @@ void ManagementAgent::handleGetQuery(Buffer& inBuffer, const string& replyToKey,
 
     if (className == "broker") {
         uint64_t uptime = sys::Duration(startTime, sys::now());
-        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObjectShared())->set_uptime(uptime);
+        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObject())->set_uptime(uptime);
     }
 
 
@@ -1945,7 +1945,7 @@ void ManagementAgent::handleGetQuery(const string& body, const string& rte, cons
 
     if (className == "broker") {
         uint64_t uptime = sys::Duration(startTime, sys::now());
-        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObjectShared())->set_uptime(uptime);
+        boost::dynamic_pointer_cast<_qmf::Broker>(broker->GetManagementObject())->set_uptime(uptime);
     }
 
     /*
diff --git a/cpp/src/qpid/management/ManagementAgent.h b/cpp/src/qpid/management/ManagementAgent.h
index 9df5825e32..7f1a2e3e66 100644
--- a/cpp/src/qpid/management/ManagementAgent.h
+++ b/cpp/src/qpid/management/ManagementAgent.h
@@ -211,7 +211,7 @@ private:
         ObjectId          connectionRef;
         qmf::org::apache::qpid::broker::Agent::shared_ptr mgmtObject;
         RemoteAgent(ManagementAgent& _agent) : agent(_agent) {}
-        ManagementObject::shared_ptr GetManagementObjectShared (void) const { return mgmtObject; }
+        ManagementObject::shared_ptr GetManagementObject (void) const { return mgmtObject; }
 
         virtual ~RemoteAgent ();
         void mapEncode(qpid::types::Variant::Map& _map) const;
diff --git a/cpp/src/qpid/store/CMakeLists.txt b/cpp/src/qpid/store/CMakeLists.txt
index 9abdf0ae3d..7e64b6cdc1 100644
--- a/cpp/src/qpid/store/CMakeLists.txt
+++ b/cpp/src/qpid/store/CMakeLists.txt
@@ -42,6 +42,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
 
   set_target_properties (store PROPERTIES
                          PREFIX ""
+                         COMPILE_FLAGS -D_IN_QPID_BROKER
                          LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
 endif (CMAKE_COMPILER_IS_GNUCXX)
 
@@ -54,7 +55,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
   endif (MSVC)
 endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
 
-set_target_properties (store PROPERTIES VERSION ${qpidc_version})
+set_target_properties (store PROPERTIES
+                       COMPILE_FLAGS -D_IN_QPID_BROKER
+                       VERSION ${qpidc_version})
 install (TARGETS store # RUNTIME
          DESTINATION ${QPIDD_MODULE_DIR}
          COMPONENT ${QPID_COMPONENT_BROKER})