QPID-5580 : [Java Broker] Introduce explicit type hierarchy for queues in the ConfiguredObject model

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

6 files changed, 14 insertions, 14 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 410a5d23ca..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
@@ -35,16 +35,16 @@
                 <tr>
                     <td valign="top"><strong>Queue Type: </strong></td>
                     <td>
-                    <input type="radio" id="formAddQueueTypeStandard" name="queueType" value="standard" checked="checked" dojoType="dijit.form.RadioButton" />
+                    <input type="radio" id="formAddQueueTypeStandard" name="type" value="standard" checked="checked" dojoType="dijit.form.RadioButton" />
                     <label for="formAddQueueTypeStandard">Standard</label>
                     &nbsp;&nbsp;
-                    <input type="radio" id="formAddQueueTypePriority" name="queueType" value="priority" dojoType="dijit.form.RadioButton" />
+                    <input type="radio" id="formAddQueueTypePriority" name="type" value="priority" dojoType="dijit.form.RadioButton" />
                     <label for="formAddQueueTypePriority">Priority</label>
                     &nbsp;&nbsp;
-                    <input type="radio" id="formAddQueueTypeLVQ" name="queueType" value="lvq" dojoType="dijit.form.RadioButton" />
+                    <input type="radio" id="formAddQueueTypeLVQ" name="type" value="lvq" dojoType="dijit.form.RadioButton" />
                     <label for="formAddQueueTypeLVQ">LVQ</label>
                     &nbsp;&nbsp;
-                    <input type="radio" id="formAddQueueTypeSorted" name="queueType" value="sorted" dojoType="dijit.form.RadioButton" />
+                    <input type="radio" id="formAddQueueTypeSorted" name="type" value="sorted" dojoType="dijit.form.RadioButton" />
                     <label for="formAddQueueTypeSorted">Sorted</label>
                     </td>
                 </tr>
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 606f95e349..c1442e5edc 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,7 +277,7 @@ define(["dojo/_base/xhr",
                            "exclusive",
                            "owner",
                            "lifetimePolicy",
-                           "queueType",
+                           "type",
                            "typeQualifier",
                            "alertRepeatGap",
                            "alertRepeatGapUnits",
@@ -359,14 +359,14 @@ define(["dojo/_base/xhr",
                bytesDepth = formatter.formatBytes( this.queueData["unacknowledgedBytes"] );
                this.unacknowledgedBytes.innerHTML = "(" + bytesDepth.value;
                this.unacknowledgedBytesUnits.innerHTML = bytesDepth.units + ")";
-               this.queueType.innerHTML = entities.encode(this.queueData[ "queueType" ]);
-               if (this.queueData.queueType == "standard")
+               this["type" ].innerHTML = entities.encode(this.queueData[ "type" ]);
+               if (this.queueData["type"] == "standard")
                {
                    this.typeQualifier.style.display = "none";
                }
                else
                {
-                   this.typeQualifier.innerHTML = entities.encode("(" + queueTypeKeyNames[this.queueData.queueType] + ": " + this.queueData[queueTypeKeys[this.queueData.queueType]] + ")");
+                   this.typeQualifier.innerHTML = entities.encode("(" + queueTypeKeyNames[this.queueData[ "type" ]] + ": " + this.queueData[queueTypeKeys[this.queueData[ "type" ]]] + ")");
                }
 
                if(this.queueData["messageGroupKey"])
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 64e821b2dd..64b31309d9 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
@@ -96,7 +96,7 @@ define(["dojo/_base/xhr",
                             }
                         }
                         else if (!typeSpecificFields.hasOwnProperty(propName) ||
-                                        formValues.queueType === typeSpecificFields[ propName ]) {
+                                        formValues[ "type" ] === typeSpecificFields[ propName ]) {
                             if(formValues[ propName ] !== "") {
                                 if (fieldConverters.hasOwnProperty(propName))
                                 {
@@ -130,7 +130,7 @@ define(["dojo/_base/xhr",
                             theForm = registry.byId("formAddQueue");
                             array.forEach(theForm.getDescendants(), function(widget)
                                 {
-                                    if(widget.name === "queueType") {
+                                    if(widget.name === "type") {
                                         widget.on("change", function(isChecked) {
 
                                             var objId = widget.id + ":fields";
@@ -195,4 +195,4 @@ define(["dojo/_base/xhr",
                         };
 
         return addQueue;
-    });
\ No newline at end of file
+    });
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 252deb3100..89b7327957 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
@@ -47,7 +47,7 @@
         <div style="clear:both">
             <div class="formLabel-labelCell" style="float:left; width: 150px;">Type:</div>
             <div style="float:left;">
-                <span class="queueType"></span>
+                <span class="type"></span>
                 <span class="typeQualifier"></span>
             </div>
         </div>
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
index 74183eafc5..e95ed9a383 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
@@ -185,7 +185,7 @@ public class QueueMBean extends AMQManagedObject implements ManagedQueue, QueueN
     @Override
     public String getQueueType()
     {
-        return (String) _queue.getAttribute(Queue.QUEUE_TYPE);
+        return (String) _queue.getAttribute(Queue.TYPE);
     }
 
     public boolean isDurable()
diff --git a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
index 2df196eff6..a81de49fb9 100644
--- a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
@@ -131,7 +131,7 @@ public class QueueMBeanTest extends QpidTestCase
 
     public void testQueueType() throws Exception
     {
-        when(_mockQueue.getAttribute(Queue.QUEUE_TYPE)).thenReturn(QUEUE_TYPE);
+        when(_mockQueue.getAttribute(Queue.TYPE)).thenReturn(QUEUE_TYPE);
         MBeanTestUtils.assertMBeanAttribute(_queueMBean, "queueType", QUEUE_TYPE);
     }