[rhmessaging-commits] rhmessaging commits: r1003 - in mgmt: notes and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Wed Oct 10 23:09:53 EDT 2007
Author: justi9
Date: 2007-10-10 23:09:53 -0400 (Wed, 10 Oct 2007)
New Revision: 1003
Modified:
mgmt/cumin/python/cumin/exchange.py
mgmt/cumin/python/cumin/page.py
mgmt/cumin/python/cumin/queue.py
mgmt/cumin/python/cumin/queue.strings
mgmt/cumin/python/cumin/virtualhost.py
mgmt/cumin/python/cumin/virtualhost.strings
mgmt/notes/Todo
Log:
Separates the UIs of vhosts that are under a server or cluster from
that of vhosts that are standalone and serve as templates. The former
are read-only, while the latter can have new queues and exchanges
added, etc.
Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py 2007-10-11 02:41:16 UTC (rev 1002)
+++ mgmt/cumin/python/cumin/exchange.py 2007-10-11 03:09:53 UTC (rev 1003)
@@ -220,7 +220,7 @@
session.set_redirect(branch.marshal())
def render_title(self, session, vhost):
- return "Add Exchange to Functional Host '%s'" % vhost.name
+ return "Add Exchange to Host Template '%s'" % vhost.name
class ExchangeEdit(ExchangeForm):
def on_cancel(self, session, exchange):
Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py 2007-10-11 02:41:16 UTC (rev 1002)
+++ mgmt/cumin/python/cumin/page.py 2007-10-11 03:09:53 UTC (rev 1003)
@@ -109,7 +109,7 @@
self.view = MainView(app, "view")
self.add_child(self.view)
- self.vhost = VirtualHostFrame(app, "vhost")
+ self.vhost = VirtualHostTemplateFrame(app, "vhost")
self.add_child(self.vhost)
self.server = ServerFrame(app, "server")
Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py 2007-10-11 02:41:16 UTC (rev 1002)
+++ mgmt/cumin/python/cumin/queue.py 2007-10-11 03:09:53 UTC (rev 1003)
@@ -267,7 +267,7 @@
session.set_redirect(branch.marshal())
def render_title(self, session, vhost):
- return "Add Queue to Functional Host '%s'" % vhost.name
+ return "Add Queue to Host Template '%s'" % vhost.name
class QueueEdit(QueueForm):
def on_cancel(self, session, queue):
Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings 2007-10-11 02:41:16 UTC (rev 1002)
+++ mgmt/cumin/python/cumin/queue.strings 2007-10-11 03:09:53 UTC (rev 1003)
@@ -7,12 +7,13 @@
[QueueSet.html]
<table class="QueueSet mobjects">
-<tr>
- <th>Queue</th>
- <th>Configuration</th>
- <th>Status</th>
-</tr>
-{items}
+ <tr>
+ <th>Queue</th>
+ <th>Configuration</th>
+ <th>Status</th>
+ </tr>
+
+ {items}
</table>
[QueueSet.item_html]
Modified: mgmt/cumin/python/cumin/virtualhost.py
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.py 2007-10-11 02:41:16 UTC (rev 1002)
+++ mgmt/cumin/python/cumin/virtualhost.py 2007-10-11 03:09:53 UTC (rev 1003)
@@ -17,7 +17,7 @@
def render_item_link(self, session, vhost):
branch = session.branch()
- self.page().show_virtual_host(branch, vhost)
+ self.page().show_virtual_host(branch, vhost).show_view(branch)
return mlink(branch.marshal(), "VirtualHost", vhost.name)
@@ -26,54 +26,35 @@
return "Groups (%i)" \
% len(model.get_virtual_host_groups())
-class VirtualHostFrame(CuminFrame):
+class VirtualHostParameter(Parameter):
+ def do_unmarshal(self, string):
+ return self.app.model.get_virtual_host(int(string))
+
+ def do_marshal(self, vhost):
+ return str(vhost.id)
+
+class BaseVirtualHostFrame(CuminFrame):
def __init__(self, app, name):
- super(VirtualHostFrame, self).__init__(app, name)
+ super(BaseVirtualHostFrame, self).__init__(app, name)
- self.param = self.VirtualHostParameter(app, "id")
+ self.param = VirtualHostParameter(app, "id")
self.add_parameter(self.param)
self.set_object_attribute(self.param)
- self.view = VirtualHostView(app, "view")
- self.add_child(self.view)
-
- self.queue_add = QueueAdd(app, "queue_add")
- self.add_child(self.queue_add)
-
self.queue = QueueFrame(app, "queue")
self.add_child(self.queue)
- self.exchange_add = ExchangeAdd(app, "exchange_add")
- self.add_child(self.exchange_add)
-
self.exchange = ExchangeFrame(app, "exchange")
self.add_child(self.exchange)
- # XXX move this to the top level
- class VirtualHostParameter(Parameter):
- def do_unmarshal(self, string):
- return self.app.model.get_virtual_host(int(string))
-
- def do_marshal(self, vhost):
- return str(vhost.id)
-
def set_virtual_host(self, session, vhost):
return self.param.set(session, vhost)
- def show_view(self, session):
- return self.show_mode(session, self.view)
-
- def show_queue_add(self, session):
- return self.show_mode(session, self.queue_add)
-
def show_queue(self, session, queue):
self.queue.set_queue(session, queue)
return self.show_mode(session, self.queue)
- def show_exchange_add(self, session):
- return self.show_mode(session, self.exchange_add)
-
def show_exchange(self, session, exchange):
self.exchange.set_exchange(session, exchange)
@@ -84,31 +65,104 @@
self.show_view(branch)
return branch.marshal()
+class VirtualHostFrame(BaseVirtualHostFrame):
+ def __init__(self, app, name):
+ super(VirtualHostFrame, self).__init__(app, name)
+
+ self.view = VirtualHostView(app, "view")
+ self.add_child(self.view)
+
+ def set_virtual_host(self, session, vhost):
+ return self.param.set(session, vhost)
+
+ def show_view(self, session):
+ return self.show_mode(session, self.view)
+
def render_title(self, session, vhost):
return "Functional Host '%s'" % vhost.name
-class VirtualHostView(Widget):
+class VirtualHostTemplateFrame(BaseVirtualHostFrame):
def __init__(self, app, name):
- super(VirtualHostView, self).__init__(app, name)
+ super(VirtualHostTemplateFrame, self).__init__(app, name)
+ self.view = VirtualHostTemplateView(app, "view")
+ self.add_child(self.view)
+
+ self.queue_add = QueueAdd(app, "queue_add")
+ self.add_child(self.queue_add)
+
+ self.exchange_add = ExchangeAdd(app, "exchange_add")
+ self.add_child(self.exchange_add)
+
+ def show_view(self, session):
+ return self.show_mode(session, self.view)
+
+ def show_queue_add(self, session):
+ return self.show_mode(session, self.queue_add)
+
+ def show_exchange_add(self, session):
+ return self.show_mode(session, self.exchange_add)
+
+ def render_title(self, session, vhost):
+ return "Host Template '%s'" % vhost.name
+
+class BaseVirtualHostView(Widget):
+ def __init__(self, app, name):
+ super(BaseVirtualHostView, self).__init__(app, name)
+
self.tabs = TabSet(app, "tabs")
self.add_child(self.tabs)
- self.queues = QueueSet(app, "queues")
+ self.queues = self.QueueTab(app, "queues")
self.tabs.add_child(self.queues)
- self.exchanges = ExchangeSet(app, "exchanges")
+ self.exchanges = self.ExchangeTab(app, "exchanges")
self.tabs.add_child(self.exchanges)
+ def render_name(self, session, vhost):
+ return vhost.name
+
+ class QueueTab(Widget):
+ def __init__(self, app, name):
+ super(BaseVirtualHostView.QueueTab, self).__init__(app, name)
+
+ self.queues = QueueSet(app, "queues")
+ self.add_child(self.queues)
+
+ def render_title(self, session, vhost):
+ return self.queues.render_title(session, vhost)
+
+ def render_add_queue_href(self, session, vhost):
+ branch = session.branch()
+ self.page().show_virtual_host(branch, vhost).show_queue_add(branch)
+ return branch.marshal()
+
+ class ExchangeTab(Widget):
+ def __init__(self, app, name):
+ super(BaseVirtualHostView.ExchangeTab, self).__init__(app, name)
+
+ self.exchanges = ExchangeSet(app, "exchanges")
+ self.add_child(self.exchanges)
+
+ def render_title(self, session, vhost):
+ return self.exchanges.render_title(session, vhost)
+
+ def render_add_exchange_href(self, session, vhost):
+ branch = session.branch()
+ frame = self.page().show_virtual_host(branch, vhost)
+ frame.show_exchange_add(branch)
+ return branch.marshal()
+
+class VirtualHostView(BaseVirtualHostView):
+ def __init__(self, app, name):
+ super(VirtualHostView, self).__init__(app, name)
+
self.log = self.VirtualHostLog(app, "log")
self.tabs.add_child(self.log)
def render_title(self, session, vhost):
return "Functional Host '%s'" % vhost.name
- def render_name(self, session, vhost):
- return vhost.name
-
def render_server(self, session, vhost):
server = vhost.get_server()
@@ -131,6 +185,14 @@
else:
return none()
+ class VirtualHostLog(Widget):
+ def render_title(self, session, vhost):
+ return "Log Messages"
+
+class VirtualHostTemplateView(VirtualHostView):
+ def render_title(self, session, vhost):
+ return "Host Template '%s'" % vhost.name
+
def render_add_queue_href(self, session, vhost):
branch = session.branch()
self.page().show_virtual_host(branch, vhost).show_queue_add(branch)
@@ -140,7 +202,3 @@
branch = session.branch()
self.page().show_virtual_host(branch, vhost).show_exchange_add(branch)
return branch.marshal()
-
- class VirtualHostLog(Widget):
- def render_title(self, session, vhost):
- return "Log Messages"
Modified: mgmt/cumin/python/cumin/virtualhost.strings
===================================================================
--- mgmt/cumin/python/cumin/virtualhost.strings 2007-10-11 02:41:16 UTC (rev 1002)
+++ mgmt/cumin/python/cumin/virtualhost.strings 2007-10-11 03:09:53 UTC (rev 1003)
@@ -25,9 +25,34 @@
<dt>Cluster</dt><dd>{cluster}</dd>
</dl>
+ {tabs}
+</div>
+
+[VirtualHostTemplateView.html]
+<div class="oblock">
+ <h1>{title}</h1>
+
+ <dl class="properties">
+ <dt>Name</dt><dd>{name}</dd>
+ </dl>
+
<ul class="actions">
- <li><a href="{add_queue_href}">Add Queue</a></li>
- <li><a href="{add_exchange_href}">Add Exchange</a></li>
+ <li><a href="">Remove This Template</a></li>
</ul>
-{tabs}
+
+ {tabs}
</div>
+
+[QueueTab.html]
+<ul class="actions">
+ <li><a href="{add_queue_href}">Add Queue</a></li>
+</ul>
+
+{queues}
+
+[ExchangeTab.html]
+<ul class="actions">
+ <li><a href="{add_exchange_href}">Add Exchange</a></li>
+</ul>
+
+{exchanges}
Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo 2007-10-11 02:41:16 UTC (rev 1002)
+++ mgmt/notes/Todo 2007-10-11 03:09:53 UTC (rev 1003)
@@ -67,3 +67,5 @@
* Consider adding a set_object to Frame, instead of having
set_somethingspecific on each frame.
+
+ * Remove log messages from host template view
More information about the rhmessaging-commits
mailing list