You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/08/07 19:05:31 UTC
svn commit: r1616543 [2/2] - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/
bdbstore/src/main/java/resources/js/qpid/management/virt...
Copied: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js (from r1616524, qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js?p2=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js&p1=qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js&r1=1616524&r2=1616543&rev=1616543&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js Thu Aug 7 17:05:30 2014
@@ -16,14 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-define(["qpid/common/util", "dojo/domReady!"],
- function (util)
+
+define(["dijit/registry", "qpid/common/util", "dojo/domReady!"],
+ function (registry, util)
{
- var fieldNames = ["storeUnderfullSize", "storeOverfullSize", "storePath"];
+ var fieldNames = ["storeUnderfullSize", "storeOverfullSize"];
return {
show: function(data)
{
- util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", fieldNames, data.data);
+ util.buildEditUI(data.containerNode, "virtualhost/providedstore/edit.html", "editVirtualHost.", fieldNames, data.data);
+
+ registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp);
+ registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp);
}
};
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html?rev=1616543&r1=1616542&r2=1616543&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html Thu Aug 7 17:05:30 2014
@@ -33,7 +33,7 @@
<td class="tableContainer-labelCell"><strong>Name*:</strong></td>
<td class="tableContainer-valueCell"><input type="text" name="preferencesProviderName"
class="preferencesProviderName" data-dojo-type="dijit/form/ValidationTextBox"
- data-dojo-props="placeHolder: 'Name', required: true, missingMessage: 'A name must be supplied', title: 'Enter name', pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" /></td>
+ data-dojo-props="placeHolder: 'Name', required: true, missingMessage: 'A name must be supplied', title: 'Enter name'" /></td>
</tr>
</table>
<div class="preferencesProviderFieldsContainer"></div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html?rev=1616543&r1=1616542&r2=1616543&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html Thu Aug 7 17:05:30 2014
@@ -23,26 +23,24 @@
<div class="formLabel-labelCell tableContainer-labelCell">Store overfull size:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addVirtualHost.storeOverfullSize"
- data-dojo-type="dijit/form/NumberTextBox"
+ data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storeOverfullSize',
placeHolder: 'size in bytes',
required: false,
- title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages',
- constraints:{min:0,places:0}" />
+ title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages'" />
</div>
</div>
<div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Store underfull size:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addVirtualHost.storeUnderfullSize"
- data-dojo-type="dijit/form/NumberTextBox"
+ data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storeUnderfullSize',
placeHolder: 'size in bytes',
required: false,
- title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages',
- constraints:{min:0,places:0}" />
+ title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages'" />
</div>
</div>
</div>
Copied: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/edit.html (from r1616524, qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/edit.html?p2=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/edit.html&p1=qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html&r1=1616524&r2=1616543&rev=1616543&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/edit.html Thu Aug 7 17:05:30 2014
@@ -18,34 +18,34 @@
-->
<div>
- <div id="addVirtualHost.diskFlowControls">
+
<div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size:</div>
- <div class="formLabel-controlCell tableContainer-valueCell">
- <input type="text" id="addVirtualHost.storeOverfullSize"
- data-dojo-type="dijit/form/NumberTextBox"
+ <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size (bytes):</div>
+ <div class="tableContainer-valueCell formLabel-controlCell">
+ <input data-dojo-type="dijit/form/ValidationTextBox"
+ id="editVirtualHost.storeOverfullSize"
data-dojo-props="
name: 'storeOverfullSize',
placeHolder: 'size in bytes',
required: false,
- title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages',
- constraints:{min:0,places:0}" />
+ title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages'"
+ />
</div>
</div>
<div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Store underfull size:</div>
- <div class="formLabel-controlCell tableContainer-valueCell">
- <input type="text" id="addVirtualHost.storeUnderfullSize"
- data-dojo-type="dijit/form/NumberTextBox"
+ <div class="formLabel-labelCell tableContainer-labelCell">Store underfull size (bytes):</div>
+ <div class="tableContainer-valueCell formLabel-controlCell">
+ <input data-dojo-type="dijit/form/ValidationTextBox"
+ id="editVirtualHost.storeUnderfullSize"
data-dojo-props="
name: 'storeUnderfullSize',
placeHolder: 'size in bytes',
required: false,
- title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages',
- constraints:{min:0,places:0}" />
+ title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages'"
+ />
</div>
</div>
- </div>
+
<div class="clear"></div>
- <div class="infoMessage">The virtual host will have the same name as the node.</div>
+
</div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html?rev=1616543&r1=1616542&r2=1616543&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html Thu Aug 7 17:05:30 2014
@@ -35,26 +35,24 @@
<div class="formLabel-labelCell tableContainer-labelCell">Store overfull size:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addVirtualHost.storeOverfullSize"
- data-dojo-type="dijit/form/NumberTextBox"
+ data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storeOverfullSize',
placeHolder: 'size in bytes',
required: false,
- title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages',
- constraints:{min:0,places:0}" />
+ title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages'" />
</div>
</div>
<div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Store underfull size:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text" id="addVirtualHost.storeUnderfullSize"
- data-dojo-type="dijit/form/NumberTextBox"
+ data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storeUnderfullSize',
placeHolder: 'size in bytes',
required: false,
- title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages',
- constraints:{min:0,places:0}" />
+ title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages'" />
</div>
</div>
<div class="clear"></div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html?rev=1616543&r1=1616542&r2=1616543&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html Thu Aug 7 17:05:30 2014
@@ -37,28 +37,26 @@
<div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Store overfull size (bytes):</div>
<div class="tableContainer-valueCell formLabel-controlCell">
- <input data-dojo-type="dijit/form/NumberSpinner"
+ <input data-dojo-type="dijit/form/ValidationTextBox"
id="editVirtualHost.storeOverfullSize"
data-dojo-props="
name: 'storeOverfullSize',
placeHolder: 'size in bytes',
required: false,
- title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages',
- constraints:{min:0,places:0}"
+ title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages'"
/>
</div>
</div>
<div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Store underfull size (bytes):</div>
<div class="tableContainer-valueCell formLabel-controlCell">
- <input data-dojo-type="dijit/form/NumberSpinner"
+ <input data-dojo-type="dijit/form/ValidationTextBox"
id="editVirtualHost.storeUnderfullSize"
data-dojo-props="
name: 'storeUnderfullSize',
placeHolder: 'size in bytes',
required: false,
- title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages',
- constraints:{min:0,places:0}"
+ title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages'"
/>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org