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/12/24 18:07:01 UTC
svn commit: r1553304 [2/2] - in /qpid/branches/java-broker-bdb-ha/qpid/java:
bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/src/main/java/org/apac...
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html?rev=1553304&r1=1553303&r2=1553304&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html Tue Dec 24 17:07:00 2013
@@ -21,103 +21,85 @@
-->
<div class="virtualhost">
- <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 style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Name:</div>
+ <div class="name" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Type:</div>
+ <div class="type" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Actual State:</div>
+ <div class="state" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Durable:</div>
+ <div class="durable" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Lifespan:</div>
+ <div class="lifetimePolicy" style="float:left;"></div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Inbound:</div>
+ <div style="float:left;">
+ <span class="msgInRate"></span>
+ <span> msg/s</span>
+ <span class="bytesInRate"></span>
+ <span class="bytesInRateUnits"></span>
</div>
- <div style="clear:both"></div>
- </div>
- <br/>
- <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Exchanges'">
- <div class="exchanges"></div>
- <button data-dojo-type="dijit.form.Button" class="addExchangeButton">Add Exchange</button>
- <button data-dojo-type="dijit.form.Button" class="deleteExchangeButton">Delete Exchange</button>
</div>
- <br/>
- <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Queues'">
- <div class="queues"></div>
- <button data-dojo-type="dijit.form.Button" class="addQueueButton">Add Queue</button>
- <button data-dojo-type="dijit.form.Button" class="deleteQueueButton">Delete Queue</button>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Outbound:</div>
+ <div style="float:left;">
+ <span class="msgOutRate"></span>
+ <span> msg/s</span>
+ <span class="bytesOutRate"></span>
+ <span class="bytesOutRateUnits"></span>
+ </div>
</div>
- <br/>
- <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Connections'">
- <div class="connections"></div>
+ <div class="configPathDiv" style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Config Path:</div>
+ <div class="configPath" style="float:left;"></div>
</div>
+ <div style="clear:both"></div>
+
+ <div class="virtualHostDetails"></div>
<br/>
+
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Alerting Thresholds', open: false">
<div style="clear:both">
- <div class="formLabel-labelCell" style="float:left; width: 150px;">Queue Depth:</div>
+ <div class="formLabel-labelCell" style="float:left; width: 200px">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 class="formLabel-labelCell" style="float:left; width: 200px">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 class="formLabel-labelCell" style="float:left; width: 200px">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 class="formLabel-labelCell" style="float:left; width: 200px">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 class="formLabel-labelCell" style="float:left; width: 200px">Alert frequency:</div>
<div style="float:left;">
<span class="alertRepeatGap"></span>
<span class="alertRepeatGapUnits"></span>
@@ -125,5 +107,23 @@
</div>
<div style="clear:both"></div>
</div>
+ <br/>
+
+ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Exchanges'">
+ <div class="exchanges"></div>
+ <button data-dojo-type="dijit.form.Button" class="addExchangeButton">Add Exchange</button>
+ <button data-dojo-type="dijit.form.Button" class="deleteExchangeButton">Delete Exchange</button>
+ </div>
+ <br/>
+ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Queues'">
+ <div class="queues"></div>
+ <button data-dojo-type="dijit.form.Button" class="addQueueButton">Add Queue</button>
+ <button data-dojo-type="dijit.form.Button" class="deleteQueueButton">Delete Queue</button>
+ </div>
+ <br/>
+ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Connections'">
+ <div class="connections"></div>
+ </div>
+
</div>
Added: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/standard/show.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/standard/show.html?rev=1553304&view=auto
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/standard/show.html (added)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/standard/show.html Tue Dec 24 17:07:00 2013
@@ -0,0 +1,35 @@
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements. See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership. The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License. You may obtain a copy of the License at
+ -
+ - http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied. See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+ -->
+<div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Desired State:</div>
+ <div class="desiredState" style="float:left;">ACTIVE</div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Store Type:</div>
+ <div class="storeType" style="float:left;"></div>
+ </div>
+ <div style="clear:both;">
+ <div class="formLabel-labelCell" style="float:left; width: 200px">Store Path:</div>
+ <div class="storePath" style="float:left;"></div>
+ </div>
+ <div style="clear:both"></div>
+</div>
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1553304&r1=1553303&r2=1553304&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Tue Dec 24 17:07:00 2013
@@ -51,7 +51,8 @@ public class Asserts
assertNotNull("Virtualhost " + virtualHostName + " data are not found", virtualHost);
assertAttributesPresent(virtualHost, VirtualHost.AVAILABLE_ATTRIBUTES, VirtualHost.TIME_TO_LIVE,
VirtualHost.CREATED, VirtualHost.UPDATED, VirtualHost.SUPPORTED_QUEUE_TYPES, VirtualHost.STORE_PATH,
- VirtualHost.CONFIG_PATH, VirtualHost.TYPE, VirtualHost.CONFIG_STORE_PATH, VirtualHost.CONFIG_STORE_TYPE);
+ VirtualHost.CONFIG_PATH, VirtualHost.TYPE, VirtualHost.CONFIG_STORE_PATH, VirtualHost.CONFIG_STORE_TYPE,
+ VirtualHost.QUIESCE_ON_MASTER_CHANGE);
assertEquals("Unexpected value of attribute " + VirtualHost.NAME, virtualHostName, virtualHost.get(VirtualHost.NAME));
assertNotNull("Unexpected value of attribute " + VirtualHost.ID, virtualHost.get(VirtualHost.ID));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org