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 2013/10/17 18:36:11 UTC
svn commit: r1533143 - in /qpid/trunk/qpid/java: ./
broker-plugins/management-http/src/main/java/resources/
broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/
broker-plugins/management-http/src/main/java/resources/js/qpid/man...
Author: orudyy
Date: Thu Oct 17 16:36:11 2013
New Revision: 1533143
URL: http://svn.apache.org/r1533143
Log:
QPID-5243: Upgrade dojo toolkit to 1.9.1 and fix the incompatibility issues in web management console
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/ivy.retrieve.xml
qpid/trunk/qpid/java/pom.xml
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js?rev=1533143&r1=1533142&r2=1533143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js Thu Oct 17 16:36:11 2013
@@ -18,7 +18,8 @@
* under the License.
*
*/
-define(["dojo/_base/xhr", "dojox/encoding/base64", "dojox/encoding/digests/_base", "dojox/encoding/digests/MD5"], function () {
+define(["dojo/_base/xhr", "dojox/encoding/base64", "dojox/encoding/digests/_base", "dojox/encoding/digests/MD5"],
+ function (xhr, base64, digestsBase, MD5) {
var encodeUTF8 = function encodeUTF8(str) {
var byteArray = [];
@@ -65,7 +66,7 @@ var errorHandler = function errorHandler
var saslPlain = function saslPlain(user, password, callbackFunction)
{
var responseArray = [ 0 ].concat(encodeUTF8( user )).concat( [ 0 ] ).concat( encodeUTF8( password ) );
- var plainResponse = dojox.encoding.base64.encode(responseArray);
+ var plainResponse = base64.encode(responseArray);
// Using dojo.xhrGet, as very little information is being sent
dojo.xhrPost({
@@ -95,19 +96,19 @@ var saslCramMD5 = function saslCramMD5(u
}).then(function(data)
{
- var challengeBytes = dojox.encoding.base64.decode(data.challenge);
+ var challengeBytes = base64.decode(data.challenge);
var wa=[];
var bitLength = challengeBytes.length*8;
for(var i=0; i<bitLength; i+=8)
{
wa[i>>5] |= (challengeBytes[i/8] & 0xFF)<<(i%32);
}
- var challengeStr = dojox.encoding.digests.wordToString(wa).substring(0,challengeBytes.length);
+ var challengeStr = digestsBase.wordToString(wa).substring(0,challengeBytes.length);
- var digest = user + " " + dojox.encoding.digests.MD5._hmac(challengeStr, password, dojox.encoding.digests.outputTypes.Hex);
+ var digest = user + " " + MD5._hmac(challengeStr, password, digestsBase.outputTypes.Hex);
var id = data.id;
- var response = dojox.encoding.base64.encode(encodeUTF8( digest ));
+ var response = base64.encode(encodeUTF8( digest ));
dojo.xhrPost({
// The URL of the request
@@ -162,7 +163,7 @@ SaslClient.authenticate = function(usern
}
else if (containsMechanism(mechMap, "CRAM-MD5-HEX"))
{
- var hashedPassword = dojox.encoding.digests.MD5(password, dojox.encoding.digests.outputTypes.Hex);
+ var hashedPassword = MD5(password, digestsBase.outputTypes.Hex);
saslCramMD5(username, hashedPassword, "CRAM-MD5-HEX", callbackFunction);
}
else if (containsMechanism(mechMap, "PLAIN"))
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1533143&r1=1533142&r2=1533143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js Thu Oct 17 16:36:11 2013
@@ -390,10 +390,12 @@ define(["dojo/_base/xhr",
var bindings = thisObj.queueData[ "bindings" ];
var consumers = thisObj.queueData[ "consumers" ];
- for(i=0; i < bindings.length; i++) {
+ if (bindings)
+ {
+ for(i=0; i < bindings.length; i++) {
bindings[i].argumentString = json.stringify(bindings[i].arguments);
+ }
}
-
thisObj.updateHeader();
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html?rev=1533143&r1=1533142&r2=1533143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html Thu Oct 17 16:36:11 2013
@@ -19,24 +19,43 @@
-
-->
<div class="exchange">
- <span style="">Name:</span><span class="name" style="position:absolute; left:6em"></span>
- <br/>
- <span style="">State:</span><span class="state" style="position:absolute; left:6em"></span>
- <br/>
- <span style="">Durable:</span><span class="durable" style="position:absolute; left:6em"></span>
- <span style="position:absolute; left:26em">Inbound:</span>
- <span class="msgInRate" style="position:absolute; right:9.5em"></span>
- <span style="position:absolute; right: 5em; width: 4em"> msg/s</span>
- <span class="bytesInRate" style="position:absolute; right: 3.3em"></span>
- <span class="bytesInRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
- <br/>
- <span style="">Lifespan:</span><span style="position:absolute; left:6em" class="lifetimePolicy"></span>
- <span style="position:absolute; left:26em">Dropped:</span>
- <span class="msgDropRate" style="position:absolute; right:9.5em"></span>
- <span style="position:absolute; right: 5em; width: 4em"> msg/s</span>
- <span class="bytesDropRate" style="position:absolute; right: 3.3em"></span>
- <span class="bytesDropRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
- <br/>
+ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Exchange Attributes', open: true">
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Name:</div>
+ <div class="name" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">State:</div>
+ <div class="state" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Durable:</div>
+ <div class="durable" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Lifespan:</div>
+ <div class="lifetimePolicy" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Inbound:</div>
+ <div style="float:left;">
+ <span class="msgInRate"></span>
+ <span> msg/s</span>
+ <span class="bytesInRate">(</span>
+ <span class="bytesInRateUnits">)</span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Dropped:</div>
+ <div style="float:left;">
+ <span class="msgDropRate"></span>
+ <span> msg/s</span>
+ <span class="bytesDropRate">(</span>
+ <span class="bytesDropRateUnits">)</span>
+ </div>
+ </div>
+ <div style="clear:both"></div>
+ </div>
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'">
<div class="bindings"></div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html?rev=1533143&r1=1533142&r2=1533143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html Thu Oct 17 16:36:11 2013
@@ -19,41 +19,81 @@
-
-->
<div class="queue">
- <span style="">Name:</span><span class="name" style="position:absolute; left:6em"></span>
- <span style="position:absolute; left:26em">Size:</span>
- <span class="queueDepthMessages" style="position:absolute; right:9.5em"></span>
- <span style="position:absolute; right: 5em; width: 4em"> msgs</span>
- <span class="queueDepthBytes" style="position:absolute; right: 3.3em">(</span>
- <span class="queueDepthBytesUnits" style="position:absolute; right: 0em; width: 3em">)</span>
- <br/>
- <span style="">State:</span><span class="state" style="position:absolute; left:6em"></span>
- <span style="position:absolute; left:26em">Pre-fetched:</span>
- <span class="unacknowledgedMessages" style="position:absolute; right:9.5em"></span>
- <span style="position:absolute; right: 5em; width: 4em"> msgs</span>
- <span class="unacknowledgedBytes" style="position:absolute; right: 3.3em"></span>
- <span class="unacknowledgedBytesUnits" style="position:absolute; right: 0em; width: 3em"></span>
- <br/>
- <span style="">Durable:</span><span class="durable" style="position:absolute; left:6em"></span>
- <span style="position:absolute; left:26em">Inbound:</span>
- <span class="msgInRate" style="position:absolute; right:9.5em"></span>
- <span style="position:absolute; right: 5em; width: 4em"> msg/s</span>
- <span class="bytesInRate" style="position:absolute; right: 3.3em"></span>
- <span class="bytesInRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
- <br/>
- <span style="">Lifespan:</span><span style="position:absolute; left:6em" class="lifetimePolicy"></span>
- <span style="position:absolute; left:26em">Outbound:</span>
- <span class="msgOutRate" style="position:absolute; right:9.5em"></span>
- <span style="position:absolute; right: 5em; width: 4em"> msg/s</span>
- <span class="bytesOutRate" style="position:absolute; right: 3.3em"></span>
- <span class="bytesOutRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
- <br/>
- <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/>
- <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 data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Queue Attributes', open: true">
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Name:</div>
+ <div class="name" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">State:</div>
+ <div class="state" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Durable:</div>
+ <div class="durable" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Lifespan:</div>
+ <div class="lifetimePolicy" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Type:</div>
+ <div style="float:left;">
+ <span class="type"></span>
+ <span class="typeQualifier"></span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Size:</div>
+ <div style="float:left;">
+ <span class="queueDepthMessages"></span>
+ <span> msgs</span>
+ <span class="queueDepthBytes">(</span>
+ <span class="queueDepthBytesUnits">)</span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Pre-fetched:</div>
+ <div style="float:left;">
+ <span class="unacknowledgedMessages"></span>
+ <span> msgs</span>
+ <span class="unacknowledgedBytes">(</span>
+ <span class="unacknowledgedBytesUnits">)</span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Inbound:</div>
+ <div style="float:left;">
+ <span class="msgInRate"></span>
+ <span> msg/s</span>
+ <span class="bytesInRate">(</span>
+ <span class="bytesInRateUnits">)</span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Outbound:</div>
+ <div style="float:left;">
+ <span class="msgOutRate"></span>
+ <span> msg/s</span>
+ <span class="bytesOutRate">(</span>
+ <span class="bytesOutRateUnits">)</span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">AlternateExchange:</div>
+ <div class="alternateExchange" style="float:left;"></div>
+ </div>
+ <div class="messageGroups" style="clear:both">
+ <div style="clear:both">
+ <div style="float:left; width: 150px;" class="messageGroupKeyLabel formLabel-labelCell ">Message Group Key:</div>
+ <div style="float:left;" class="messageGroupKey"></div>
+ </div>
+ <div style="clear:both">
+ <div style="float:left; width: 150px;" class="messageGroupSharedGroupsLabel formLabel-labelCell">Shared Message Groups:</div>
+ <div style="float:left;" class="messageGroupSharedGroups"></div>
+ </div>
+ </div>
+ <div style="clear:both"></div>
</div>
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'">
@@ -73,31 +113,42 @@
</div>
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Alerting Thresholds', open: false">
- <span style="">Queue Depth:</span>
- <span class="alertThresholdQueueDepthMessages"
- style="position:absolute; left:4em; width:8em; text-align:right"></span>
- <span style="position:absolute; left:12.2em">msgs</span>
-
- <span style="position:absolute; left:21em">Queue Depth:</span>
- <span class="alertThresholdQueueDepthBytes"
- style="position:absolute; left:22em; width:8em; text-align:right"></span>
- <span class="alertThresholdQueueDepthBytesUnits" style="position:absolute; left:30.2em"></span>
- <br>
- <span style="">Message Age:</span>
- <span class="alertThresholdMessageAge"
- style="position:absolute; left:4em; width:8em; text-align:right"></span>
- <span class="alertThresholdMessageAgeUnits" style="position:absolute; left:12.2em"></span>
-
- <span style="position:absolute; left:21em">Message Size: </span>
- <span class="alertThresholdMessageSize"
- style="position:absolute; left:25em; width:5em; text-align:right"></span>
- <span class="alertThresholdMessageSizeUnits" style="position:absolute; left:30.2em"></span>
- <br/>
- <br/>
- <span style="">Alert frequency:</span>
- <span class="alertRepeatGap"
- style="position:absolute; left:4em; width:8em; text-align:right"></span>
- <span class="alertRepeatGapUnits" style="position:absolute; left:12.2em"></span>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Queue Depth:</div>
+ <div style="float:left;">
+ <span class="alertThresholdQueueDepthMessages"></span>
+ <span>msgs</span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Queue Depth:</div>
+ <div style="float:left;">
+ <span class="alertThresholdQueueDepthBytes"></span>
+ <span class="alertThresholdQueueDepthBytesUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Message Age:</div>
+ <div style="float:left;">
+ <span class="alertThresholdMessageAge"></span>
+ <span class="alertThresholdMessageAgeUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Message Size:</div>
+ <div style="float:left;">
+ <span class="alertThresholdMessageSize"></span>
+ <span class="alertThresholdMessageSizeUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Alert frequency:</div>
+ <div style="float:left;">
+ <span class="alertRepeatGap"></span>
+ <span class="alertRepeatGapUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both"></div>
</div>
<div class="dijitDialogPaneActionBar">
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html?rev=1533143&r1=1533142&r2=1533143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html Thu Oct 17 16:36:11 2013
@@ -21,31 +21,55 @@
-->
<div class="virtualhost">
- <span style="">Name:</span><span class="name" style="position:absolute; left:6em"></span>
- <br/>
- <span style="">State:</span><span class="state" style="position:absolute; left:6em"></span>
- <br/>
- <span style="">Durable:</span><span class="durable" style="position:absolute; left:6em"></span>
- <span style="position:absolute; left:26em">Inbound:</span>
- <span class="msgInRate" style="position:absolute; right:9.5em"></span>
- <span style="position:absolute; right: 5em; width: 4em"> msg/s</span>
- <span class="bytesInRate" style="position:absolute; right: 3.3em"></span>
- <span class="bytesInRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
- <br/>
- <span style="">Lifespan:</span><span style="position:absolute; left:6em" class="lifetimePolicy"></span>
- <span style="position:absolute; left:26em">Outbound:</span>
- <span class="msgOutRate" style="position:absolute; right:9.5em"></span>
- <span style="position:absolute; right: 5em; width: 4em"> msg/s</span>
- <span class="bytesOutRate" style="position:absolute; right: 3.3em"></span>
- <span class="bytesOutRateUnits" style="position:absolute; right: 0em; width: 3em"></span>
- <br/>
- <span style="">Store Type:</span><span style="position:absolute; left:6em" class="storeType"></span>
- <span style="position:absolute; left:26em">Store Path:</span>
- <span class="storePath" style="position:absolute; right: 1em"></span>
- <div class="configPathDiv">
- <span style="">ConfigPath:</span><span style="position:absolute; left:6em" class="configPath"></span>
- </div>
-
+ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host Attributes', open: true">
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Name:</div>
+ <div class="name" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">State:</div>
+ <div class="state" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Durable:</div>
+ <div class="durable" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Lifespan:</div>
+ <div class="lifetimePolicy" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Inbound:</div>
+ <div style="float:left;">
+ <span class="msgInRate"></span>
+ <span> msg/s</span>
+ <span class="bytesInRate"></span>
+ <span class="bytesInRateUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Outbound:</div>
+ <div style="float:left;">
+ <span class="msgOutRate"></span>
+ <span> msg/s</span>
+ <span class="bytesOutRate"></span>
+ <span class="bytesOutRateUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Store Type:</div>
+ <div class="storeType" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Store Path:</div>
+ <div class="storePath" style="float:left;"></div>
+ </div>
+ <div class="configPathDiv" style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 100px;">Config Path:</div>
+ <div class="configPath" style="float:left;"></div>
+ </div>
+ <div style="clear:both"></div>
+ </div>
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Exchanges'">
<div class="exchanges"></div>
@@ -64,31 +88,42 @@
</div>
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Alerting Thresholds', open: false">
- <span style="">Queue Depth:</span>
- <span class="alertThresholdQueueDepthMessages"
- style="position:absolute; left:4em; width:8em; text-align:right"></span>
- <span style="position:absolute; left:12.2em">msgs</span>
-
- <span style="position:absolute; left:21em">Queue Depth:</span>
- <span class="alertThresholdQueueDepthBytes"
- style="position:absolute; left:22em; width:8em; text-align:right"></span>
- <span class="alertThresholdQueueDepthBytesUnits" style="position:absolute; left:30.2em"></span>
- <br>
- <span style="">Message Age:</span>
- <span class="alertThresholdMessageAge"
- style="position:absolute; left:4em; width:8em; text-align:right"></span>
- <span class="alertThresholdMessageAgeUnits" style="position:absolute; left:12.2em"></span>
-
- <span style="position:absolute; left:21em">Message Size: </span>
- <span class="alertThresholdMessageSize"
- style="position:absolute; left:25em; width:5em; text-align:right"></span>
- <span class="alertThresholdMessageSizeUnits" style="position:absolute; left:30.2em"></span>
- <br/>
- <br/>
- <span style="">Alert frequency:</span>
- <span class="alertRepeatGap"
- style="position:absolute; left:4em; width:8em; text-align:right"></span>
- <span class="alertRepeatGapUnits" style="position:absolute; left:12.2em"></span>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Queue Depth:</div>
+ <div style="float:left;">
+ <span class="alertThresholdQueueDepthMessages"></span>
+ <span>msgs</span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Queue Depth:</div>
+ <div style="float:left;">
+ <span class="alertThresholdQueueDepthBytes"></span>
+ <span class="alertThresholdQueueDepthBytesUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Message Age:</div>
+ <div style="float:left;">
+ <span class="alertThresholdMessageAge"></span>
+ <span class="alertThresholdMessageAgeUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Message Size:</div>
+ <div style="float:left;">
+ <span class="alertThresholdMessageSize"></span>
+ <span class="alertThresholdMessageSizeUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 150px;">Alert frequency:</div>
+ <div style="float:left;">
+ <span class="alertRepeatGap"></span>
+ <span class="alertRepeatGapUnits"></span>
+ </div>
+ </div>
+ <div style="clear:both"></div>
</div>
</div>
Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1533143&r1=1533142&r2=1533143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Thu Oct 17 16:36:11 2013
@@ -57,7 +57,7 @@ jetty-servlet=lib/required/jetty-servlet
jetty-websocket=lib/required/jetty-websocket-7.6.10.v20130312.jar
servlet-api=${geronimo-servlet}
-dojo-version=1.8.3
+dojo-version=1.9.1
dojo=lib/required/dojo-${dojo-version}.zip
jackson-core=lib/required/jackson-core-asl-1.9.0.jar
Modified: qpid/trunk/qpid/java/ivy.retrieve.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.retrieve.xml?rev=1533143&r1=1533142&r2=1533143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ivy.retrieve.xml (original)
+++ qpid/trunk/qpid/java/ivy.retrieve.xml Thu Oct 17 16:36:11 2013
@@ -71,7 +71,7 @@
<dependency org="xalan" name="xalan" rev="2.7.0" transitive="false"/>
<dependency org="velocity" name="velocity" rev="1.4" transitive="false"/>
<dependency org="velocity" name="velocity-dep" rev="1.4" transitive="false"/>
- <dependency org="org.dojotoolkit" name="dojo" rev="1.8.3" transitive="false">
+ <dependency org="org.dojotoolkit" name="dojo" rev="1.9.1" transitive="false">
<artifact name="dojo" type="zip"/>
</dependency>
Modified: qpid/trunk/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1533143&r1=1533142&r2=1533143&view=diff
==============================================================================
--- qpid/trunk/qpid/java/pom.xml (original)
+++ qpid/trunk/qpid/java/pom.xml Thu Oct 17 16:36:11 2013
@@ -59,7 +59,7 @@
<properties>
<!-- dependency version numbers -->
- <dojo-version>1.8.3</dojo-version>
+ <dojo-version>1.9.1</dojo-version>
<!-- test dependency version numbers -->
<junit-version>3.8.1</junit-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org