You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/05/23 15:03:07 UTC
qpid-broker-j git commit: QPID-7776: [Java Broker] Address review
comments
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 2ba420b83 -> 8fdfbfbd3
QPID-7776: [Java Broker] Address review comments
* update documentation
* use validValues from metadata in UI
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/8fdfbfbd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/8fdfbfbd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/8fdfbfbd
Branch: refs/heads/master
Commit: 8fdfbfbd35604399d996f54066bbef77b33f00c8
Parents: 2ba420b
Author: Lorenz Quack <qu...@gmail.com>
Authored: Tue May 23 16:01:46 2017 +0100
Committer: Lorenz Quack <qu...@gmail.com>
Committed: Tue May 23 16:02:25 2017 +0100
----------------------------------------------------------------------
.../src/main/java/resources/addQueue.html | 15 ++++-----------
.../src/main/java/resources/editQueue.html | 15 ++++-----------
.../java/resources/js/qpid/management/addQueue.js | 5 +++++
.../java/resources/js/qpid/management/editQueue.js | 6 ++++++
.../docbkx/concepts/Java-Broker-Concepts-Queues.xml | 4 +++-
5 files changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8fdfbfbd/broker-plugins/management-http/src/main/java/resources/addQueue.html
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/addQueue.html b/broker-plugins/management-http/src/main/java/resources/addQueue.html
index 03a0011..8f2929a 100644
--- a/broker-plugins/management-http/src/main/java/resources/addQueue.html
+++ b/broker-plugins/management-http/src/main/java/resources/addQueue.html
@@ -170,20 +170,13 @@
<div class="clear">
<div class="formLabel-labelCell">Overflow policy:</div>
<div class="formLabel-controlCell">
- <select id="formAddQueue.overflowPolicy"
- dojoType="dijit.form.FilteringSelect"
- data-dojo-props="
+ <input type="text" id="formAddQueue.overflowPolicy"
+ data-dojo-type="dijit/form/FilteringSelect"
+ data-dojo-props="
name: 'overflowPolicy',
- value: 'NONE',
- searchAttr: 'name',
required: false,
promptMessage: 'Select overflow policy to use',
- title: 'Select overflow policy override'">
- <option value="NONE">None</option>
- <option value="RING">Ring</option>
- <option value="PRODUCER_FLOW_CONTROL">Producer Flow Control</option>
- <option value="FLOW_TO_DISK">Flow To Disk</option>
- </select>
+ title: 'Select overflow policy override'"/>
</div>
</div>
<div class="clear">
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8fdfbfbd/broker-plugins/management-http/src/main/java/resources/editQueue.html
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/editQueue.html b/broker-plugins/management-http/src/main/java/resources/editQueue.html
index 9cf947d..d5883e0 100644
--- a/broker-plugins/management-http/src/main/java/resources/editQueue.html
+++ b/broker-plugins/management-http/src/main/java/resources/editQueue.html
@@ -164,20 +164,13 @@
<div class="clear">
<div class="formLabel-labelCell">Overflow policy:</div>
<div class="formLabel-controlCell">
- <select id="formEditQueue.overflowPolicy"
- dojoType="dijit.form.FilteringSelect"
- data-dojo-props="
+ <input type="text" id="formEditQueue.overflowPolicy"
+ data-dojo-type="dijit/form/FilteringSelect"
+ data-dojo-props="
name: 'overflowPolicy',
- value: 'NONE',
- searchAttr: 'name',
required: false,
promptMessage: 'Select overflow policy to use',
- title: 'Select overflow policy'">
- <option value="NONE">None</option>
- <option value="RING">Ring</option>
- <option value="PRODUCER_FLOW_CONTROL">Producer Flow Control</option>
- <option value="FLOW_TO_DISK">Flow To Disk</option>
- </select>
+ title: 'Select overflow policy'"/>
</div>
</div>
<div class="clear">
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8fdfbfbd/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
index 0326d50..0cf5771 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
@@ -143,6 +143,11 @@ define(["dojo/dom",
.show();
util.applyMetadataToWidgets(form.domNode, "Queue", "standard", addQueue.management.metadata);
+ var overflowPolicyWidget = registry.byId("formAddQueue.overflowPolicy");
+ var validValues = addQueue.management.metadata.getMetaData("Queue", "standard").attributes.overflowPolicy.validValues;
+ var validValueStore = util.makeTypeStore(validValues);
+ overflowPolicyWidget.set("store", validValueStore);
+
// Add regexp to the numeric fields
for (var i = 0; i < numericFieldNames.length; i++)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8fdfbfbd/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
index 7c243bd..ed76d33 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
@@ -148,6 +148,12 @@ define(["dojox/html/entities",
this.form.reset();
var that = this;
+
+ var overflowPolicyWidget = registry.byId("formEditQueue.overflowPolicy");
+ var validValues = this.management.metadata.getMetaData("Queue", "standard").attributes.overflowPolicy.validValues;
+ var validValueStore = util.makeTypeStore(validValues);
+ overflowPolicyWidget.set("store", validValueStore);
+
util.applyToWidgets(that.allFieldsContainer,
"Queue",
data.actual.type,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8fdfbfbd/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml b/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
index f242a9e..359de07 100644
--- a/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
+++ b/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
@@ -416,11 +416,13 @@ amqp://guest:guest@client1/development?maxprefetch='1'&brokerlist='tcp://loc
</listitem>
<listitem>
<para>
- <emphasis>Flow to Disk Policy</emphasis>
+ <emphasis>Flow to Disk</emphasis>
-If the queue breaches a limit, newly arriving messages are written to disk and the in-memory
representation of the message is minimised. The Broker will transparently retrieve messages
from disk as they are required by a consumer or management. The flow to disk policy does not
actually restrict the overall size of the queue, merely the space occupied in memory.
+ The Broker's other <link linkend="Java-Broker-Runtime-Flow-To-Disk">Flow to Disk feature</link>
+ operates completely independent of this Queue Overflow Policy.
</para>
</listitem>
</itemizedlist>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org