qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r1367978 - in /qpid/branches/0.18/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ broker-plugins/management-http/src/ma...
Date Wed, 01 Aug 2012 13:11:31 GMT
Author: robbie
Date: Wed Aug  1 13:11:29 2012
New Revision: 1367978

URL: http://svn.apache.org/viewvc?rev=1367978&view=rev
Log:
QPID-4167: Fix a cycle in the JSON output of the AlternateExchange attribute which would lead
to massive/broken output that would cripple the webui. Add checkbox to create a DLQ for the
new queue, and display the alternateExchange attribute.

Work by myself and Keith Wall.

Modified:
    qpid/branches/0.18/qpid/java/   (props changed)
    qpid/branches/0.18/qpid/java/amqp-1-0-client/   (props changed)
    qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/   (props changed)
    qpid/branches/0.18/qpid/java/amqp-1-0-common/   (props changed)
    qpid/branches/0.18/qpid/java/broker/   (props changed)
    qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
    qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
    qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
    qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
    qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
    qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java
    qpid/branches/0.18/qpid/java/broker/bin/   (props changed)
    qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ 
 (props changed)
    qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
  (props changed)
    qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
  (props changed)
    qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
  (props changed)
    qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
  (props changed)
    qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/   (props
changed)
    qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/   (props changed)
    qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
  (props changed)
    qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
  (props changed)
    qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
  (props changed)
    qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
  (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/Excludes   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/JavaPre010Excludes   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/JavaTransientExcludes   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/XAExcludes   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/cpp.async.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/cpp.cluster.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/cpp.noprefetch.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.excludes   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/cpp.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/java-bdb.0-9-1.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/java-dby.0-9-1.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/java-mms.0-9-1.testprofile   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/log4j-test.xml   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/test-provider.properties   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/test_resources/   (props changed)
    qpid/branches/0.18/qpid/java/test-profiles/testprofile.defaults   (props changed)

Propchange: qpid/branches/0.18/qpid/java/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java:r1367797

Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1367797

Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1367797

Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1367797

Propchange: qpid/branches/0.18/qpid/java/broker/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker:r1367797

Modified: qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1367978&r1=1367977&r2=1367978&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
(original)
+++ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
Wed Aug  1 13:11:29 2012
@@ -292,7 +292,11 @@ public class RestServlet extends Abstrac
         for(String name : confObject.getAttributeNames())
         {
             Object value = confObject.getAttribute(name);
-            if(value != null)
+            if(value instanceof ConfiguredObject)
+            {
+                object.put(name, ((ConfiguredObject) value).getName());
+            }
+            else if(value != null)
             {
                 object.put(name, value);
             }

Modified: qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html?rev=1367978&r1=1367977&r2=1367978&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
(original)
+++ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
Wed Aug  1 13:11:29 2012
@@ -162,8 +162,15 @@
                             regexp="[0-9]+"
                             invalidMessage= "Invalid value"/></td>
                     </tr>
-
-
+                    <tr>
+                        <td valign="top"><strong>Create DLQ? </strong></td>
+                        <td><input type="checkbox" name="dlqEnabled" id="formAddQueue.dlqEnabled"
value="dlqEnabled" dojoType="dijit.form.CheckBox" /></td>
+                    </tr>
+                </table>
+                <table cellpadding="0" cellspacing="2">
+                    <tr>
+                        <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>
             </div>
             <br/>

Modified: qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1367978&r1=1367977&r2=1367978&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
(original)
+++ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
Wed Aug  1 13:11:29 2012
@@ -270,8 +270,7 @@ define(["dojo/_base/xhr",
                            "durable",
                            "lifetimePolicy",
                            "type",
-                           "keyName",
-                           "keyValue",
+                           "typeQualifier",
                            "alertRepeatGap",
                            "alertRepeatGapUnits",
                            "alertThresholdMessageAge",
@@ -281,6 +280,7 @@ define(["dojo/_base/xhr",
                            "alertThresholdQueueDepthBytes",
                            "alertThresholdQueueDepthBytesUnits",
                            "alertThresholdQueueDepthMessages",
+                           "alternateExchange",
                            "queueDepthMessages",
                            "queueDepthBytes",
                            "queueDepthBytesUnits",
@@ -335,7 +335,7 @@ define(["dojo/_base/xhr",
                this.state.innerHTML = this.queueData[ "state" ];
                this.durable.innerHTML = this.queueData[ "durable" ];
                this.lifetimePolicy.innerHTML = this.queueData[ "lifetimePolicy" ];
-               this.type.innerHTML = this.queueData[ "type" ];
+               this.alternateExchange.innerHTML = this.queueData[ "alternateExchange" ] ?
this.queueData[ "alternateExchange" ]: "" ;
 
                this.queueDepthMessages.innerHTML = this.queueData["queueDepthMessages"];
                bytesDepth = formatter.formatBytes( this.queueData["queueDepthBytes"] );
@@ -346,15 +346,14 @@ define(["dojo/_base/xhr",
                bytesDepth = formatter.formatBytes( this.queueData["unacknowledgedBytes"]
);
                this.unacknowledgedBytes.innerHTML = "(" + bytesDepth.value;
                this.unacknowledgedBytesUnits.innerHTML = bytesDepth.units + ")";
+               this.type.innerHTML = this.queueData[ "type" ];
                if (this.queueData.type == "standard")
                {
-                   this.keyName.style.display = "none";
-                   this.keyValue.style.display = "none";
+                   this.typeQualifier.style.display = "none";
                }
                else
                {
-                   this.keyName.innerHTML = queueTypeKeyNames[this.queueData.type] + ":";
-                   this.keyValue.innerHTML = this.queueData[queueTypeKeys[this.queueData.type]];
+                   this.typeQualifier.innerHTML = "(" + queueTypeKeyNames[this.queueData.type]
+ ": " + this.queueData[queueTypeKeys[this.queueData.type]] + ")";
                }
 
            };

Modified: qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js?rev=1367978&r1=1367977&r2=1367978&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
(original)
+++ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
Wed Aug  1 13:11:29 2012
@@ -81,7 +81,14 @@ define(["dojo/_base/xhr",
                             if (formValues.durable[0] && formValues.durable[0] ==
"durable") {
                                 newQueue.durable = true;
                             }
-                        } else if (!typeSpecificFields.hasOwnProperty(propName) ||
+                        }
+                        else if(propName === "dlqEnabled")
+                        {
+                            if (formValues.dlqEnabled[0] && formValues.dlqEnabled[0]
== "dlqEnabled") {
+                                newQueue["x-qpid-dlq-enabled"] = true;
+                            }
+                        }
+                        else if (!typeSpecificFields.hasOwnProperty(propName) ||
                                         formValues.type === typeSpecificFields[ propName
]) {
                             if(formValues[ propName ] !== "") {
                                 if (fieldConverters.hasOwnProperty(propName))

Modified: qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html?rev=1367978&r1=1367977&r2=1367978&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
(original)
+++ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
Wed Aug  1 13:11:29 2012
@@ -47,9 +47,9 @@
     <span class="bytesOutRate" style="position:absolute; right: 3.3em"></span>
     <span class="bytesOutRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
     <br/>
-    <span style="">Type:</span><span style="position:absolute; left:6em" class="type"></span>
-    <span style="position:absolute; left:26em" class="keyName"></span>
-    <span style="position:absolute; right:1em" class="keyValue"></span>
+    <span style="">AlternateExchange:</span><span class="alternateExchange"
style="position:absolute; left:10em"></span>
+    <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/>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'">

Modified: qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java?rev=1367978&r1=1367977&r2=1367978&view=diff
==============================================================================
--- qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java
(original)
+++ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java
Wed Aug  1 13:11:29 2012
@@ -346,6 +346,46 @@ public class VirtualHostRestTest extends
         assertEquals("Unexpected priorities key attribute", 10, priorityQueue.get(Queue.PRIORITIES));
     }
 
+    @SuppressWarnings("unchecked")
+    public void testCreateQueueWithDLQEnabled() throws Exception
+    {
+        String queueName = getTestQueueName();
+
+        Map<String, Object> attributes = new HashMap<String, Object>();
+        attributes.put(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
+
+        //verify the starting state
+        Map<String, Object> hostDetails = getJsonAsSingletonList("/rest/virtualhost/test");
+        List<Map<String, Object>> queues = (List<Map<String, Object>>)
hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
+        List<Map<String, Object>> exchanges = (List<Map<String, Object>>)
hostDetails.get(VirtualHostRestTest.VIRTUALHOST_EXCHANGES_ATTRIBUTE);
+
+        assertNull("queue should not have already been present", find(Queue.NAME, queueName
, queues));
+        assertNull("queue should not have already been present", find(Queue.NAME, queueName
+ "_DLQ" , queues));
+        assertNull("exchange should not have already been present", find(Exchange.NAME, queueName
+ "_DLE" , exchanges));
+
+        //create the queue
+        createQueue(queueName, "standard", attributes);
+
+        //verify the new queue, as well as the DLQueue and DLExchange have been created
+        hostDetails = getJsonAsSingletonList("/rest/virtualhost/test");
+        queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
+        exchanges = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_EXCHANGES_ATTRIBUTE);
+
+        Map<String, Object> queue = find(Queue.NAME, queueName , queues);
+        Map<String, Object> dlqQueue = find(Queue.NAME, queueName + "_DLQ" , queues);
+        Map<String, Object> dlExchange = find(Exchange.NAME, queueName + "_DLE" , exchanges);
+        assertNotNull("queue should not have been present", queue);
+        assertNotNull("queue should not have been present", dlqQueue);
+        assertNotNull("exchange should not have been present", dlExchange);
+
+        //verify that the alternate exchange is set as expected on the new queue
+        Map<String, Object> queueAttributes = new HashMap<String, Object>();
+        queueAttributes.put(Queue.ALTERNATE_EXCHANGE, queueName + "_DLE");
+
+        Asserts.assertQueue(queueName, "standard", queue, queueAttributes);
+        Asserts.assertQueue(queueName, "standard", queue, null);
+    }
+
     private void createExchange(String exchangeName, String exchangeType) throws IOException
     {
         HttpURLConnection connection = openManagementConection("/rest/exchange/test/" + exchangeName,
"PUT");

Propchange: qpid/branches/0.18/qpid/java/broker/bin/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker/bin:r1367797

Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:r1367797

Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0:r1367797

Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1367797

Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:r1367797

Propchange: qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1367797

Propchange: qpid/branches/0.18/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1367797



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


Mime
View raw message