2 files changed, 0 insertions, 35 deletions
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index e9994714f7..991dac9139 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
@@ -472,17 +472,6 @@ void ManagementAgent::clientAdded (const string& routingKey)
     }
 }
 
-void ManagementAgent::clusterUpdate() {
-    // Called on all cluster memebers when a new member joins a cluster.
-    // Set clientWasAdded so that on the next periodicProcessing we will do 
-    // a full update on all cluster members.
-    sys::Mutex::ScopedLock l(userLock);
-    moveNewObjects();         // keep lists consistent with updater/updatee.
-    moveDeletedObjects();
-    clientWasAdded = true;
-    debugSnapshot("Cluster member joined");
-}
-
 void ManagementAgent::encodeHeader (Buffer& buf, uint8_t opcode, uint32_t seq)
 {
     buf.putOctet ('A');
@@ -2881,25 +2870,6 @@ ManagementAgent::DeletedObject::DeletedObject(const std::string& encoded)
 }
 
 
-// encode a DeletedObject to a string buffer. Used by
-// clustering to move deleted objects between clustered brokers.  See
-// DeletedObject(const std::string&) for the reverse.
-void ManagementAgent::DeletedObject::encode(std::string& toBuffer)
-{
-    qpid::types::Variant::Map map_;
-
-
-    map_["_package_name"] = packageName;
-    map_["_class_name"] = className;
-    map_["_object_id"] = objectId;
-
-    map_["_v1_config"] = encodedV1Config;
-    map_["_v1_inst"] = encodedV1Inst;
-    map_["_v2_data"] = encodedV2;
-
-    MapCodec::encode(map_, toBuffer);
-}
-
 // Remove Deleted objects, and save for later publishing...
 bool ManagementAgent::moveDeletedObjects() {
     typedef vector<pair<ObjectId, ManagementObject::shared_ptr> > DeleteList;
diff --git a/qpid/cpp/src/qpid/management/ManagementAgent.h b/qpid/cpp/src/qpid/management/ManagementAgent.h
index d3e72abc71..48ed2f7566 100644
--- a/qpid/cpp/src/qpid/management/ManagementAgent.h
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.h
@@ -107,8 +107,6 @@ public:
                                        severity_t severity = SEV_DEFAULT);
     QPID_BROKER_EXTERN void clientAdded     (const std::string& routingKey);
 
-    QPID_BROKER_EXTERN void clusterUpdate();
-
     bool dispatchCommand (qpid::broker::Deliverable&       msg,
                           const std::string&         routingKey,
                           const framing::FieldTable* args,
@@ -118,9 +116,6 @@ public:
     /** Disallow a method. Attempts to call it will receive an exception with message. */
     void disallow(const std::string& className, const std::string& methodName, const std::string& message);
 
-    /** Disallow all QMFv1 methods (used in clustered brokers). */
-    void disallowV1Methods() { disallowAllV1Methods = true; }
-
     /** Serialize my schemas as a binary blob into schemaOut */
     void exportSchemas(std::string& schemaOut);