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

rhmessaging-commits at lists.jboss.org rhmessaging-commits at lists.jboss.org
Tue Oct 23 16:55:55 EDT 2007


Author: justi9
Date: 2007-10-23 16:55:55 -0400 (Tue, 23 Oct 2007)
New Revision: 1150

Modified:
   mgmt/cumin/python/cumin/exchange.py
   mgmt/cumin/python/cumin/exchange.strings
   mgmt/cumin/python/cumin/model.py
   mgmt/cumin/python/cumin/queue.py
   mgmt/cumin/python/cumin/queue.strings
   mgmt/notes/Todo
Log:
Renames routing_key to binding_key.  Adds some todo items.



Modified: mgmt/cumin/python/cumin/exchange.py
===================================================================
--- mgmt/cumin/python/cumin/exchange.py	2007-10-23 18:45:18 UTC (rev 1149)
+++ mgmt/cumin/python/cumin/exchange.py	2007-10-23 20:55:55 UTC (rev 1150)
@@ -126,8 +126,8 @@
     def render_item_name(self, session, binding):
         return binding.get_queue().name
 
-    def render_item_routing_key(self, session, binding):
-        return binding.routing_key
+    def render_item_binding_key(self, session, binding):
+        return binding.binding_key
 
     def render_item_messages_matched(self, session, binding):
         return binding.get_measurement("msgMatched").get_value()

Modified: mgmt/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/cumin/python/cumin/exchange.strings	2007-10-23 18:45:18 UTC (rev 1149)
+++ mgmt/cumin/python/cumin/exchange.strings	2007-10-23 20:55:55 UTC (rev 1150)
@@ -113,7 +113,7 @@
 [ExchangeBindingSet.item_html]
 <tr>
   <td><a href="{item_href}">Queue '{item_name}'</a></td>
-  <td>{item_routing_key}</td>
+  <td>{item_binding_key}</td>
   <td style="text-align: right;">{item_messages_matched}</td>
 </tr>
 

Modified: mgmt/cumin/python/cumin/model.py
===================================================================
--- mgmt/cumin/python/cumin/model.py	2007-10-23 18:45:18 UTC (rev 1149)
+++ mgmt/cumin/python/cumin/model.py	2007-10-23 20:55:55 UTC (rev 1150)
@@ -245,7 +245,7 @@
         # Default binding
 
         binding = Binding(self.model)
-        binding.routing_key = queue.name
+        binding.binding_key = queue.name
         binding.set_queue(queue)
         binding.set_exchange(self.default_exchange)
 
@@ -660,7 +660,7 @@
     def __init__(self, model):
         super(Binding, self).__init__(model, model.binding)
 
-        self.routing_key = None
+        self.binding_key = None
 
         self.measurements = list()
 
@@ -678,7 +678,7 @@
         writer.write("<binding id=\"binding-%i\">" % self.id)
         writer.write("<exchange ref=\"exchange-%i\"/>" % self.exchange.id)
         writer.write("<queue ref=\"queue-%i\"/>" % self.queue.id)
-        writer.write("<routing-key>%s</routing-key>" % self.routing_key)
+        writer.write("<binding-key>%s</binding-key>" % self.binding_key)
         writer.write("</binding>")
 
 class Client(ModelObject):

Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2007-10-23 18:45:18 UTC (rev 1149)
+++ mgmt/cumin/python/cumin/queue.py	2007-10-23 20:55:55 UTC (rev 1150)
@@ -149,8 +149,8 @@
     def render_item_name(self, session, binding):
         return binding.get_exchange().name
 
-    def render_item_routing_key(self, session, binding):
-        return binding.routing_key
+    def render_item_binding_key(self, session, binding):
+        return binding.binding_key
 
     def render_item_messages_matched(self, session, binding):
         return binding.get_measurement("msgMatched").get_value()
@@ -283,8 +283,8 @@
         self.exchanges = self.Exchanges(app, "exchanges", self)
         self.add_child(self.exchanges)
 
-        self.routing_key = TextInput(app, "routing_key", self)
-        self.add_child(self.routing_key)
+        self.binding_key = TextInput(app, "binding_key", self)
+        self.add_child(self.binding_key)
     
     def render_title(self, session, queue):
         return "Add Binding to Queue '%s'" % queue.name
@@ -297,10 +297,10 @@
     def validate(self, session):
         valid = True
 
-        if not self.routing_key.get(session):
+        if not self.binding_key.get(session):
             valid = False
-            self.routing_key.add_error(session, """
-            The routing key is empty; it is required
+            self.binding_key.add_error(session, """
+            The binding key is empty; it is required
             """)
 
         if not self.exchanges.get(session):
@@ -317,7 +317,7 @@
 
             binding.lock()
             try:
-                binding.routing_key = self.routing_key.get(session)
+                binding.binding_key = self.binding_key.get(session)
                 binding.set_queue(queue)
                 binding.set_exchange(self.exchanges.get(session))
             finally:

Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings	2007-10-23 18:45:18 UTC (rev 1149)
+++ mgmt/cumin/python/cumin/queue.strings	2007-10-23 20:55:55 UTC (rev 1150)
@@ -149,7 +149,7 @@
 [QueueBindingSet.item_html]
 <tr>
   <td><a href="{item_href}">Exchange '{item_name}'</a></td>
-  <td>{item_routing_key}</td>
+  <td>{item_binding_key}</td>
   <td style="text-align: right;">{item_messages_matched}</td>
 </tr>
 
@@ -162,9 +162,9 @@
     <span class="legend">Exchange</span>
     <fieldset>{exchanges}</fieldset>
 
-    <span class="legend">Routing Key</span>
+    <span class="legend">Binding Key</span>
     <fieldset>
-      <div class="field">{routing_key}</div>
+      <div class="field">{binding_key}</div>
     </fieldset>
 
     {hidden_inputs}

Modified: mgmt/notes/Todo
===================================================================
--- mgmt/notes/Todo	2007-10-23 18:45:18 UTC (rev 1149)
+++ mgmt/notes/Todo	2007-10-23 20:55:55 UTC (rev 1150)
@@ -109,10 +109,18 @@
  * Add a sanity check traversal to the widget tree and to the
    registered sets of widgets and parameters
 
- * Rename routing_key to binding_key
-
  * Remove legacy show_view methods now that we have set_view_mode
 
  * Make the model objects use MeasuredModelObject
 
  * Add more bindings to the demo data
+
+ * Add producers to the default exchange
+
+ * queue: make stats first
+
+ * queue: link consumers stat to consumers view
+
+ * exch: make stats first
+
+ * exch: link bindings, proucers stats to respective views




More information about the rhmessaging-commits mailing list