QPID-4847: add support for message group attributes when creating/inspecting queues via the rest interface and web management ui

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

4 files changed, 39 insertions, 0 deletions

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 76123296b1..9a24e23407 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
@@ -182,6 +182,22 @@
                         <td valign="top">NOTE: Configuring maximum delivery retries on a queue which has no DLQ / AlternateExchange will result in messages being discarded after the limit is reached.</td>
                     </tr>
                 </table>
+                <table cellpadding="0" cellspacing="2">
+
+                    <!-- qpid.group_header_key -->
+                    <tr>
+                        <td valign="top"><strong>Message Group Key:  </strong></td>
+                        <td><input type="text" required="false" name="messageGroupKey" id="formAddQueue.messageGroupKey"
+                            dojoType="dijit.form.ValidationTextBox"
+                            trim="true"/></td>
+                    </tr>
+
+                    <!-- qpid.qpid.shared_msg_group -->
+                    <tr>
+                        <td valign="top"><strong>Shared Message Groups? </strong></td>
+                        <td><input type="checkbox" name="messageGroupSharedGroups" id="formAddQueue.messageGroupSharedGroups" value="messageGroupSharedGroups" dojoType="dijit.form.CheckBox" /></td>
+                    </tr>
+                </table>
             </div>
             </div>
           <div class="dijitDialogPaneActionBar">
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 cb6846878f..a47b24d1ab 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
@@ -282,6 +282,9 @@ define(["dojo/_base/xhr",
                            "alertThresholdQueueDepthBytesUnits",
                            "alertThresholdQueueDepthMessages",
                            "alternateExchange",
+                           "messageGroups",
+                           "messageGroupKey",
+                           "messageGroupSharedGroups",
                            "queueDepthMessages",
                            "queueDepthBytes",
                            "queueDepthBytesUnits",
@@ -357,6 +360,16 @@ define(["dojo/_base/xhr",
                    this.typeQualifier.innerHTML = entities.encode("(" + queueTypeKeyNames[this.queueData.type] + ": " + this.queueData[queueTypeKeys[this.queueData.type]] + ")");
                }
 
+               if(this.queueData["messageGroupKey"])
+               {
+                   this.messageGroupKey.innerHTML = entities.encode(String(this.queueData["messageGroupKey"]));
+                   this.messageGroupSharedGroups.innerHTML = entities.encode(String(this.queueData["messageGroupSharedGroups"]));
+                   this.messageGroups.style.display = "block";
+               }
+               else
+               {
+                   this.messageGroups.style.display = "none";
+               }
            };
 
            QueueUpdater.prototype.update = function()
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
index b1357f8c98..e8b8dd1721 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
@@ -89,6 +89,12 @@ define(["dojo/_base/xhr",
                                 newQueue["x-qpid-dlq-enabled"] = true;
                             }
                         }
+                        else if(propName === "messageGroupSharedGroups")
+                        {
+                            if (formValues.messageGroupSharedGroups[0] && formValues.messageGroupSharedGroups[0] == "messageGroupSharedGroups") {
+                                newQueue["messageGroupSharedGroups"] = true;
+                            }
+                        }
                         else if (!typeSpecificFields.hasOwnProperty(propName) ||
                                         formValues.type === typeSpecificFields[ propName ]) {
                             if(formValues[ propName ] !== "") {
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 929e1d1f23..c31cae6f8a 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
@@ -51,6 +51,10 @@
     <span style="position:absolute; left:26em">Type:</span><span style="position:absolute; left:29em" class="type"></span>
     <span style="position:absolute; right:1em" class="typeQualifier"></span>
     <br/>
+    <div class="messageGroups">
+       <span style="" class="messageGroupKeyLabel">Message Group Key:</span><span class="messageGroupKey" style="position:absolute; left:11em"></span>
+       <span style="position:absolute; left:26em" class="messageGroupSharedGroupsLabel">Shared Message Groups:</span><span style="position:absolute; left:39em" class="messageGroupSharedGroups"></span>
+    </div>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'">
         <div class="bindings"></div>