From 42bfb186da9e911c208f22dd5f6c794b9bddd859 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Fri, 25 Jul 2014 14:24:36 +0000
Subject: QPID-4304 : [Java Broker] Add an attribute to queues -
 "messageDurability" - which controls whether message data is persisted or
 not.  By default, depend on the persistence setting of the message, but allow
 an individual queue to declare that all (or no) messages should be persisted
 on the queue

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1613440 13f79535-47bb-0310-9956-ffa450edef68
---
 .../management-http/src/main/java/resources/addQueue.html     | 11 +++++++++++
 .../src/main/java/resources/js/qpid/management/Queue.js       |  2 ++
 .../management-http/src/main/java/resources/showQueue.html    |  4 ++++
 3 files changed, 17 insertions(+)

(limited to 'qpid/java/broker-plugins/management-http')

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
index 9a24e23407..c32c1d3bba 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
@@ -32,6 +32,17 @@
                     <td valign="top"><strong>Durable? </strong></td>
                     <td><input type="checkbox" name="durable" id="formAddQueue.durable" value="durable" checked="checked" dojoType="dijit.form.CheckBox" /></td>
                 </tr>
+                <tr>
+                    <td valign="top"><strong>Persist Messages? </strong></td>
+                    <td>
+                        <select id="formAddQueue.messageDurability" name="messageDurability" data-dojo-type="dijit.form.FilteringSelect"
+                                data-dojo-props="name: 'messageDurability', value: '', searchAttr: 'name', placeHolder: '', value: '', required: false ">
+                            <option value="ALWAYS">Always</option>
+                            <option value="DEFAULT">Default</option>
+                            <option value="NEVER">Never</option>
+                        </select>
+                    </td>
+                </tr>
                 <tr>
                     <td valign="top"><strong>Queue Type: </strong></td>
                     <td>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
index 039437a0bf..6c0924d09b 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
@@ -277,6 +277,7 @@ define(["dojo/_base/xhr",
                storeNodes(["name",
                            "state",
                            "durable",
+                           "messageDurability",
                            "exclusive",
                            "owner",
                            "lifetimePolicy",
@@ -351,6 +352,7 @@ define(["dojo/_base/xhr",
                this.exclusive.innerHTML = entities.encode(String(this.queueData[ "exclusive" ]));
                this.owner.innerHTML = this.queueData[ "owner" ] ? entities.encode(String(this.queueData[ "owner" ])) : "" ;
                this.lifetimePolicy.innerHTML = entities.encode(String(this.queueData[ "lifetimePolicy" ]));
+               this.messageDurability.innerHTML = entities.encode(String(this.queueData[ "messageDurability" ]));
                this.alternateExchange.innerHTML = this.queueData[ "alternateExchange" ] ? entities.encode(String(this.queueData[ "alternateExchange" ])) : "" ;
 
                this.queueDepthMessages.innerHTML = entities.encode(String(this.queueData["queueDepthMessages"]));
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
index 89b7327957..8f2bf3364d 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
@@ -32,6 +32,10 @@
             <div class="formLabel-labelCell" style="float:left; width: 150px;">Durable:</div>
             <div class="durable" style="float:left;"></div>
         </div>
+        <div style="clear:both">
+            <div class="formLabel-labelCell" style="float:left; width: 150px;">Persist Messages:</div>
+            <div class="messageDurability" style="float:left;"></div>
+        </div>
         <div style="clear:both">
             <div class="formLabel-labelCell" style="float:left; width: 150px;">Exclusive:</div>
             <div class="exclusive" style="float:left;"></div>
-- 
cgit v1.2.1