QPID-4677: Add missing broker attributes related to store transactions

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1462472 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 72 insertions, 0 deletions

diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
index 6c6ece0864..f5e40025c2 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
+++ b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
@@ -371,6 +371,62 @@ define(["dojo/_base/xhr",
                            name: "virtualhost.housekeepingCheckPeriod"
                          });
                        }
+               }, {
+                       name: "virtualhost.storeTransactionIdleTimeoutClose",
+                       createWidget: function(brokerData) {
+                         return new dijit.form.ValidationTextBox({
+                           trim: "true",
+                           regexp: "[0-9]+",
+                           invalidMessage: "Invalid value",
+                           required: false,
+                           value: brokerData["virtualhost.storeTransactionIdleTimeoutClose"],
+                           placeholder: "Time in ms",
+                           label: "Idle store transaction close timeout:",
+                           name: "virtualhost.storeTransactionIdleTimeoutClose"
+                         });
+                       }
+               }, {
+                       name: "virtualhost.storeTransactionIdleTimeoutWarn",
+                       createWidget: function(brokerData) {
+                         return new dijit.form.ValidationTextBox({
+                           trim: "true",
+                           regexp: "[0-9]+",
+                           invalidMessage: "Invalid value",
+                           required: false,
+                           value: brokerData["virtualhost.storeTransactionIdleTimeoutWarn"],
+                           placeholder: "Time in ms",
+                           label: "Idle store transaction warn timeout:",
+                           name: "virtualhost.storeTransactionIdleTimeoutWarn"
+                         });
+                       }
+               }, {
+                       name: "virtualhost.storeTransactionOpenTimeoutClose",
+                       createWidget: function(brokerData) {
+                         return new dijit.form.ValidationTextBox({
+                           trim: "true",
+                           regexp: "[0-9]+",
+                           invalidMessage: "Invalid value",
+                           required: false,
+                           value: brokerData["virtualhost.storeTransactionOpenTimeoutClose"],
+                           placeholder: "Time in ms",
+                           label: "Open store transaction close timeout:",
+                           name: "virtualhost.storeTransactionOpenTimeoutClose"
+                         });
+                       }
+               }, {
+                       name: "virtualhost.storeTransactionOpenTimeoutWarn",
+                       createWidget: function(brokerData) {
+                         return new dijit.form.ValidationTextBox({
+                           trim: "true",
+                           regexp: "[0-9]+",
+                           invalidMessage: "Invalid value",
+                           required: false,
+                           value: brokerData["virtualhost.storeTransactionOpenTimeoutWarn"],
+                           placeholder: "Time in ms",
+                           label: "Open store transaction warn timeout:",
+                           name: "virtualhost.storeTransactionOpenTimeoutWarn"
+                         });
+                       }
                } ];
            }
 
diff --git a/java/broker-plugins/management-http/src/main/java/resources/showBroker.html b/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
index 6d1adab992..0cac138cb1 100644
--- a/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
+++ b/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
@@ -150,6 +150,22 @@
                     <div class="formLabel-labelCell" style="float:left; width: 250px;">House keeping check period:</div>
                     <div id="brokerAttribute.virtualhost.housekeepingCheckPeriod" style="float:left;"></div>ms
                 </div>
+                <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutClose.container" style="clear:both">
+                    <div class="formLabel-labelCell" style="float:left; width: 250px;">Idle store transaction close timeout:</div>
+                    <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutClose" style="float:left;"></div>ms
+                </div>
+                <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutWarn.container" style="clear:both">
+                    <div class="formLabel-labelCell" style="float:left; width: 250px;">Idle store transaction warn timeout:</div>
+                    <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutWarn" style="float:left;"></div>ms
+                </div>
+                <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutClose.container" style="clear:both">
+                    <div class="formLabel-labelCell" style="float:left; width: 250px;">Open store transaction close timeout:</div>
+                    <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutClose" style="float:left;"></div>ms
+                </div>
+                <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutWarn.container" style="clear:both">
+                    <div class="formLabel-labelCell" style="float:left; width: 250px;">Open store transaction warn timeout:</div>
+                    <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutWarn" style="float:left;"></div>ms
+                </div>
                 <div style="clear:both"></div>
             </div>
         </div>