[rhmessaging-commits] rhmessaging commits: r1194 - in mgmt: notes and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-10-31 11:30:28 -0400 (Wed, 31 Oct 2007)
New Revision: 1194

Modified:
   mgmt/cumin/python/cumin/broker.py
   mgmt/notes/justin-todo.txt
Log:
Moves queues, exchanges, and clients to the broker level and hides
vhosts.



Modified: mgmt/cumin/python/cumin/broker.py
===================================================================
--- mgmt/cumin/python/cumin/broker.py	2007-10-31 15:02:28 UTC (rev 1193)
+++ mgmt/cumin/python/cumin/broker.py	2007-10-31 15:30:28 UTC (rev 1194)
@@ -3,6 +3,9 @@
 
 from configproperty import *
 from virtualhost import *
+from queue import *
+from exchange import *
+from client import *
 from widgets import *
 from parameters import *
 from util import *
@@ -213,11 +216,14 @@
         self.tabs = TabSet(app, "tabs")
         self.add_child(self.tabs)
 
-        self.tabs.add_tab(self.BrokerVirtualHostTab(app, "vhosts"))
+        self.tabs.add_tab(self.BrokerQueueTab(app, "queues"))
+        self.tabs.add_tab(self.BrokerExchangeTab(app, "exchanges"))
+        self.tabs.add_tab(self.BrokerClientTab(app, "clients"))
         self.config = self.BrokerConfigTab(app, "config")
         self.tabs.add_tab(self.config)
         self.tabs.add_tab(self.BrokerStatsTab(app, "stats"))
         self.tabs.add_tab(self.BrokerLogTab(app, "log"))
+        #self.tabs.add_tab(self.BrokerVirtualHostTab(app, "vhosts"))
 
     def show_config(self, session):
         return self.tabs.show_mode(session, self.config)
@@ -251,8 +257,32 @@
     def render_version(self, session, broker):
         return "1.0"
 
+    class BrokerQueueTab(QueueSet):
+        def render_title(self, session, broker):
+            return "Queues"
+
+        def get_object(self, session, broker):
+            return broker.default_virtual_host
+
+    class BrokerExchangeTab(ExchangeSet):
+        def render_title(self, session, broker):
+            return "Exchanges"
+
+        def get_object(self, session, broker):
+            return broker.default_virtual_host
+
+    class BrokerClientTab(ClientSet):
+        def render_title(self, session, broker):
+            return "Clients"
+
+        def get_object(self, session, broker):
+            return broker.default_virtual_host
+
     class BrokerVirtualHostTab(VirtualHostSet):
         def render_title(self, session, broker):
+            return "Configuration"
+
+        def render_title(self, session, broker):
             return "Functional Hosts (%i)" % len(broker.virtual_host_items())
 
         def get_items(self, session, broker):

Modified: mgmt/notes/justin-todo.txt
===================================================================
--- mgmt/notes/justin-todo.txt	2007-10-31 15:02:28 UTC (rev 1193)
+++ mgmt/notes/justin-todo.txt	2007-10-31 15:30:28 UTC (rev 1194)
@@ -102,8 +102,6 @@
  * Right now, non cumin pages don't print their stack traces in the
    log
 
- * Move q,e to server level (using default vhost)
-
  * Make sure nav links are so marked
 
  * Make the status lights also be links to an appropriate view