Enabled management, add cluster shutdown command.

Remove dead Handler methods in Cluster.
Fixed SessionException handling in broker, was throwing some SessionExceptions as "unknown exception"


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

1 files changed, 2 insertions, 6 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.h b/cpp/src/qpid/cluster/Cluster.h
index 55358e25db..ec43c56c69 100644
--- a/cpp/src/qpid/cluster/Cluster.h
+++ b/cpp/src/qpid/cluster/Cluster.h
@@ -83,11 +83,6 @@ class Cluster : private Cpg::Handler, public management::Manageable
     /** Leave the cluster */
     void leave();
 
-    // Cluster controls.
-    void update(const MemberId&, const framing::FieldTable& members, uint64_t dumping);
-    void dumpRequest(const MemberId&, const std::string& url);
-    void ready(const MemberId&, const std::string& url);
-
     MemberId getSelf() const { return self; }
     MemberId getId() const { return self; }
 
@@ -95,7 +90,7 @@ class Cluster : private Cpg::Handler, public management::Manageable
     void stall();
     void unstall();
 
-    void shutdown();
+    void brokerShutdown();
 
     broker::Broker& getBroker();
 
@@ -172,6 +167,7 @@ class Cluster : private Cpg::Handler, public management::Manageable
 
     size_t mcastId;
 
+  friend class ClusterHandler;
   friend class JoiningHandler;
   friend class MemberHandler;
 };