You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/02/24 14:49:43 UTC

svn commit: r1784282 - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/model/Queue.java broker-plugins/management-http/src/main/java/resources/addQueue.html broker-plugins/management-http/src/main/java/resources/editQueue.html

Author: orudyy
Date: Fri Feb 24 14:49:43 2017
New Revision: 1784282

URL: http://svn.apache.org/viewvc?rev=1784282&view=rev
Log:
QPID-7618: Improve overflow policy attribute description and set overflow policy to None on add/edit queue UI

Modified:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
    qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addQueue.html
    qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editQueue.html

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java?rev=1784282&r1=1784281&r2=1784282&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java Fri Feb 24 14:49:43 2017
@@ -276,12 +276,13 @@ public interface Queue<X extends Queue<X
     @ManagedAttribute(defaultValue = "${queue.defaultOverflowPolicy}",
             description = "Queue overflow policy."
                           + " Current options are ProducerFlowControl, Ring and None."
-                          + " ProducerFlowControl overflow policy - when queue message count or size of messages"
-                          + " in queue exceeds maximum, the producer is blocked until queue depth falls below "
-                          + " the resume threshold."
-                          + " Ring overflow policy - when queue message count or size of messages in queue exceeds"
+                          + " ProducerFlowControl overflow policy - when queue message number or size of messages"
+                          + " in queue exceeds maximum, the producing sessions are blocked until queue depth falls"
+                          + " below the resume threshold."
+                          + " Ring overflow policy - when queue message number or size of messages in queue exceeds"
                           + " maximum, oldest messages are discarded."
-                          + " None overflow policy - maximum size and maximum count properties are not applied.",
+                          + " None overflow policy - queue capacity is unbounded, the attributes defining the limits for"
+                          + " maximum message number and maximum number of bytes are not applied.",
             mandatory = true)
     OverflowPolicy getOverflowPolicy();
 

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addQueue.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addQueue.html?rev=1784282&r1=1784281&r2=1784282&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addQueue.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addQueue.html Fri Feb 24 14:49:43 2017
@@ -148,7 +148,7 @@
                                     dojoType="dijit.form.FilteringSelect"
                                     data-dojo-props="
                               name: 'overflowPolicy',
-                              value: 'None',
+                              value: 'NONE',
                               searchAttr: 'name',
                               required: false,
                               promptMessage: 'Select overflow policy to use',

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editQueue.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editQueue.html?rev=1784282&r1=1784281&r2=1784282&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editQueue.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/editQueue.html Fri Feb 24 14:49:43 2017
@@ -142,7 +142,7 @@
                                         dojoType="dijit.form.FilteringSelect"
                                         data-dojo-props="
                               name: 'overflowPolicy',
-                              value: 'None',
+                              value: 'NONE',
                               searchAttr: 'name',
                               required: false,
                               promptMessage: 'Select overflow policy to use',



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