You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/08/23 17:45:15 UTC

svn commit: r1620037 - in /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources: js/qpid/management/Exchange.js showExchange.html

Author: rgodfrey
Date: Sat Aug 23 15:45:14 2014
New Revision: 1620037

URL: http://svn.apache.org/r1620037
Log:
QPID-6038 : [Java Broker] display exchange type on exchange view in HTTP management

Modified:
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
    qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js?rev=1620037&r1=1620036&r2=1620037&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js Sat Aug 23 15:45:14 2014
@@ -140,6 +140,7 @@ define(["dojo/_base/xhr",
                }
 
                storeNodes(["name",
+                           "type",
                            "state",
                            "durable",
                            "lifetimePolicy",
@@ -197,6 +198,8 @@ define(["dojo/_base/xhr",
            ExchangeUpdater.prototype.updateHeader = function()
            {
               this.name.innerHTML = entities.encode(String(this.exchangeData[ "name" ]));
+              this["type"].innerHTML = entities.encode(String(this.exchangeData[ "type" ]));
+
               this.state.innerHTML = entities.encode(String(this.exchangeData[ "state" ]));
               this.durable.innerHTML = entities.encode(String(this.exchangeData[ "durable" ]));
               this.lifetimePolicy.innerHTML = entities.encode(String(this.exchangeData[ "lifetimePolicy" ]));

Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html?rev=1620037&r1=1620036&r2=1620037&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html Sat Aug 23 15:45:14 2014
@@ -25,8 +25,37 @@
             <div class="name"></div>
         </div>
         <div class="clear">
-            <div class="formLabel-labelCell">State:</div>
-            <div class="state"></div>
+            <div class="alignLeft">
+
+                <div class="clear">
+                    <div class="formLabel-labelCell">Type:</div>
+                    <div class="type  formValue-valueCell"></div>
+                </div>
+                <div class="clear">
+                    <div class="formLabel-labelCell">State:</div>
+                    <div class="state formValue-valueCell"></div>
+                </div>
+            </div>
+            <div class="alignRight">
+                <div class="clear">
+                    <div class="formLabel-labelCell">Inbound:</div>
+                    <div class="formValue-valueCell">
+                        <span class="msgInRate"></span>
+                        <span> msg/s</span>
+                        <span class="bytesInRate">(</span>
+                        <span class="bytesInRateUnits">)</span>
+                    </div>
+                </div>
+                <div class="clear">
+                    <div class="formLabel-labelCell">Dropped:</div>
+                    <div class="formValue-valueCell">
+                        <span class="msgDropRate"></span>
+                        <span> msg/s</span>
+                        <span class="bytesDropRate">(</span>
+                        <span class="bytesDropRateUnits">)</span>
+                    </div>
+                </div>
+            </div>
         </div>
         <div class="clear">
             <div class="formLabel-labelCell">Durable:</div>
@@ -36,33 +65,18 @@
             <div class="formLabel-labelCell">Lifespan:</div>
             <div class="lifetimePolicy"></div>
         </div>
-        <div class="clear">
-            <div class="formLabel-labelCell">Inbound:</div>
-            <div>
-                <span class="msgInRate"></span>
-                <span> msg/s</span>
-                <span class="bytesInRate">(</span>
-                <span class="bytesInRateUnits">)</span>
-            </div>
-        </div>
-        <div class="clear">
-            <div class="formLabel-labelCell">Dropped:</div>
-            <div>
-                <span class="msgDropRate"></span>
-                <span> msg/s</span>
-                <span class="bytesDropRate">(</span>
-                <span class="bytesDropRateUnits">)</span>
-            </div>
-        </div>
+
         <div class="clear"></div>
     </div>
     <br/>
+
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'">
         <div class="bindings"></div>
         <button data-dojo-type="dijit.form.Button" class="addBindingButton">Add Binding</button>
         <button data-dojo-type="dijit.form.Button" class="deleteBindingButton">Delete Binding</button>
     </div>
     <br/>
+
     <div class="dijitDialogPaneActionBar">
         <button data-dojo-type="dijit.form.Button" class="deleteExchangeButton" type="button">Delete Exchange</button>
     </div>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org