You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/10/31 13:00:30 UTC

svn commit: r1767268 - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/model/Broker.java broker-plugins/management-http/src/main/java/resources/editBroker.html broker-plugins/management-http/src/main/java/resources/showBroker.html

Author: kwall
Date: Mon Oct 31 13:00:29 2016
New Revision: 1767268

URL: http://svn.apache.org/viewvc?rev=1767268&view=rev
Log:
QPID-7481: Fix screen labels associated with statistics gathering

Modified:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
    qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editBroker.html
    qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showBroker.html

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1767268&r1=1767267&r2=1767268&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Mon Oct 31 13:00:29 2016
@@ -138,10 +138,10 @@ public interface Broker<X extends Broker
     @ManagedAttribute( defaultValue = "true" )
     boolean getConnection_closeWhenNoRoute();
 
-    @ManagedAttribute( defaultValue = "0" )
+    @ManagedAttribute( defaultValue = "0", description = "Frequency with which statistics are reported to the log")
     int getStatisticsReportingPeriod();
 
-    @ManagedAttribute( defaultValue = "false")
+    @ManagedAttribute( defaultValue = "false", description = "If enabled, statistics are automatically reset to zero after each statistics report is made.")
     boolean getStatisticsReportingResetEnabled();
 
 

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editBroker.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editBroker.html?rev=1767268&r1=1767267&r2=1767268&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editBroker.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editBroker.html Mon Oct 31 13:00:29 2016
@@ -37,20 +37,20 @@
                   </div>
               </div>
               <div class="clear">
-                  <div class="formLabel-labelCell tableContainer-labelCell">Statistics reporting period (ms):</div>
+                  <div class="formLabel-labelCell tableContainer-labelCell">Statistics reporting period (s):</div>
                   <div class="formLabel-controlCell tableContainer-valueCell">
                       <input type="text" id="editBroker.statisticsReportingPeriod"
                              data-dojo-type="dijit/form/ValidationTextBox"
                              data-dojo-props="
                               name: 'statisticsReportingPeriod',
                               trim: true,
-                              placeholder: 'Time in ms',
-                              label: 'Statistics reporting period (ms):',
+                              placeholder: 'Time in seconds',
+                              label: 'Statistics reporting period (s):',
                               promptMessage: 'Frequency with which statistics are reported to broker log.'" />
                   </div>
               </div>
               <div class="clear">
-                  <div class="formLabel-labelCell tableContainer-labelCell">Statistics reporting period enabled:</div>
+                  <div class="formLabel-labelCell tableContainer-labelCell">Statistics reporting auto-reset enabled:</div>
                   <div class="formLabel-controlCell tableContainer-valueCell">
                       <input type="text" id="editBroker.statisticsReportingResetEnabled"
                              data-dojo-type="dijit/form/CheckBox"

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showBroker.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showBroker.html?rev=1767268&r1=1767267&r2=1767268&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showBroker.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showBroker.html Mon Oct 31 13:00:29 2016
@@ -46,11 +46,11 @@
                 <div id="brokerAttribute.confidentialConfigurationEncryptionProvider"></div>
             </div>
             <div id="brokerAttribute.statisticsReportingPeriod.container" class="hidden clear">
-                <div class="formLabel-labelCell">Statistics reporting period (ms):</div>
+                <div class="formLabel-labelCell">Statistics reporting period (s):</div>
                 <div id="brokerAttribute.statisticsReportingPeriod"></div>
             </div>
             <div id="brokerAttribute.statisticsReportingResetEnabled.container" class="hidden clear">
-                <div class="formLabel-labelCell">Statistics reporting period enabled:</div>
+                <div class="formLabel-labelCell">Statistics reporting auto-reset enabled:</div>
                 <div id="brokerAttribute.statisticsReportingResetEnabled"></div>
             </div>
             <div class="clear"></div>



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