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/07/16 13:07:19 UTC
svn commit: r1610967 - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/
bdbstore/src/main/java/resources/virtualhost/store/bdb/ bdb...
Author: kwall
Date: Wed Jul 16 11:07:18 2014
New Revision: 1610967
URL: http://svn.apache.org/r1610967
Log:
QPID-5413: [Java Broker] Add virtualhostnode/virtualhost creation dialogue
Work by Andrew MacBean <ma...@apache.org> and me.
Added:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js
- copied, changed from r1610960, qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js
- copied, changed from r1610960, qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js
- copied, changed from r1610960, qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/none/
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/none/add.html
- copied, changed from r1610960, qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/derby/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/
qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/add.js
qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/
qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
Removed:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhost/store/bdb/add.html
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/virtualhost/store/pool/bonecp/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/jdbc/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/store/pool/none/add.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNode.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNode.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/standard/addVirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/standard/add.html
qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js
qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
Added: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js?rev=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js (added)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js Wed Jul 16 11:07:18 2014
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+define(["dojo/_base/xhr",
+ "dojo/parser",
+ "dojo/dom",
+ "dojo/dom-construct",
+ "dojo/json",
+ "dijit/registry",
+ "dojo/text!virtualhost/sizemonitoring/add.html",
+ "dijit/form/ValidationTextBox",
+ "dijit/form/NumberTextBox",
+ "dojo/domReady!"],
+ function (xhr, parser, dom, domConstruct, json, registry, template)
+ {
+ return {
+ show: function (data)
+ {
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode);
+ }
+ };
+ }
+);
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html Wed Jul 16 11:07:18 2014
@@ -20,23 +20,23 @@
-->
<div>
<div style="clear:both">
- <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Virtual Host Node Name*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div>
<div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.bdbNodeName"
+ <input type="text" id="addVirtualHostNode.name"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'name',
- placeHolder: 'node name',
+ placeHolder: 'virtual host node name',
required: true,
- missingMessage: 'A node name must be supplied',
- title: 'Enter node name',
+ missingMessage: 'A virtual host node name must be supplied',
+ title: 'Enter virtual host node name',
pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
</div>
</div>
<div style="clear:both">
<div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div>
<div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.bdbStorePath"
+ <input type="text" id="addVirtualHostNode.storePath"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storePath',
@@ -46,16 +46,6 @@
title: 'Enter store path'" />
</div>
</div>
- <div style="clear:both;display:none">
- <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Combined store:</div>
- <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.bdbMessageStoreProvider"
- data-dojo-type="dijit/form/CheckBox"
- data-dojo-props="
- name: 'messageStoreProvider',
- required: true,
- checked: true" />
- </div>
- </div>
+
<div style="clear:both"></div>
</div>
Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html Wed Jul 16 11:07:18 2014
@@ -20,23 +20,23 @@
-->
<div>
<div style="clear:both">
- <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Virtual Host Node Name*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div>
<div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.derbyNodeName"
+ <input type="text" id="addVirtualHostNode.name"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'name',
- placeHolder: 'node name',
+ placeHolder: 'virtual host node name',
required: true,
- missingMessage: 'A node name must be supplied',
- title: 'Enter node name',
+ missingMessage: 'A virtual host node name must be supplied',
+ title: 'Enter virtual host node name',
pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
</div>
</div>
<div style="clear:both">
<div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div>
<div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.derbyStorePath"
+ <input type="text" id="addVirtualHostNode.storePath"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'storePath',
@@ -46,16 +46,5 @@
title: 'Enter store path'" />
</div>
</div>
- <div style="clear:both;display:none">
- <div class="formLabel-labelCell" style="float:left; width: 300px;">Combined store:</div>
- <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.derbyMessageStoreProvider"
- data-dojo-type="dijit/form/CheckBox"
- data-dojo-props="
- name: 'messageStoreProvider',
- required: true,
- checked: true" />
- </div>
- </div>
<div style="clear:both"></div>
</div>
Copied: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js (from r1610960, qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js?p2=qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js&p1=qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js&r1=1610960&r2=1610967&rev=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/store/memory/add.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/js/qpid/management/store/pool/bonecp/add.js Wed Jul 16 11:07:18 2014
@@ -33,18 +33,18 @@ define(["dojo/_base/xhr",
"dojo/domReady!"],
function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) {
return {
- show: function() {
- var node = dom.byId("addVirtualHost.storeSpecificDiv");
+ show: function(poolSpecificDivId, formFieldPrefix, htmlUrl) {
+ var node = dom.byId(poolSpecificDivId);
var that = this;
array.forEach(registry.toArray(),
function(item) {
- if(item.id.substr(0,33) == "formAddVirtualHost.specific.store") {
+ if(item.id.substr(0,formFieldPrefix.length) == formFieldPrefix) {
item.destroyRecursive();
}
});
- xhr.get({url: "virtualhost/store/memory/add.html",
+ xhr.get({url: htmlUrl,
sync: true,
load: function(data) {
node.innerHTML = data;
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html Wed Jul 16 11:07:18 2014
@@ -19,22 +19,37 @@
<tr>
<td class="tableContainer-labelCell" style="width: 300px;"><strong>Partition Count: </strong></td>
<td class="tableContainer-valueCell">
- <input data-dojo-type="dijit/form/NumberSpinner" id="formAddVirtualHost.specific.store.pool.parititions"
- name="partitionCount" value="4" smallDelta="1" constraints="{min:1,max:1000,places:0}"/>
+ <input data-dojo-type="dijit/form/NumberSpinner"
+ id="formAddVirtualHost.qpid.jdbcstore.bonecp.partitionCount"
+ name="qpid.jdbcstore.bonecp.partitionCount"
+ value="4"
+ smallDelta="1"
+ constraints="{min:1,max:1000,places:0}"
+ contextvar="true"/>
</td>
</tr>
<tr>
- <td class="tableContainer-labelCell" style="width: 300px;"><strong>Min Conn per Partition: </strong></td>
+ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Minimum connections per Partition:</strong></td>
<td class="tableContainer-valueCell">
- <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHost.specific.store.pool.minConn"
- name="minConnectionsPerPartition" value="5" smallDelta="1" constraints="{min:1,max:1000,places:0}"/>
+ <input dojoType="dijit/form/NumberSpinner"
+ id="formAddVirtualHost.qpid.jdbcstore.bonecp.minConnectionsPerPartition"
+ name="qpid.jdbcstore.bonecp.minConnectionsPerPartition"
+ value="5"
+ smallDelta="1"
+ constraints="{min:1,max:1000,places:0}"
+ contextvar="true"/>
</td>
</tr>
<tr>
- <td class="tableContainer-labelCell" style="width: 300px;"><strong>Max Conn per Partition: </strong></td>
+ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Maximum connections per Partition: </strong></td>
<td class="tableContainer-valueCell">
- <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHost.specific.store.pool.maxCon"
- name="maxConnectionsPerPartition" value="10" smallDelta="1" constraints="{min:1,max:1000,places:0}"/>
+ <input dojoType="dijit/form/NumberSpinner"
+ id="formAddVirtualHost.qpid.jdbcstore.bonecp.maxConnectionsPerPartition"
+ name="qpid.jdbcstore.bonecp.maxConnectionsPerPartition"
+ value="10"
+ smallDelta="1"
+ constraints="{min:1,max:1000,places:0}"
+ contextvar="true"/>
</td>
</tr>
Added: qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html?rev=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html (added)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html Wed Jul 16 11:07:18 2014
@@ -0,0 +1,56 @@
+<!--
+ ~ 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.
+ -->
+<table class="tableContainer-table tableContainer-table-horiz">
+
+ <tr>
+ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Partition Count: </strong></td>
+ <td class="tableContainer-valueCell">
+ <input data-dojo-type="dijit/form/NumberSpinner"
+ id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.partitionCount"
+ name="qpid.jdbcstore.bonecp.partitionCount"
+ value="4"
+ smallDelta="1"
+ constraints="{min:1,max:1000,places:0}"
+ contextvar="true"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Minimum connections per Partition:</strong></td>
+ <td class="tableContainer-valueCell">
+ <input dojoType="dijit/form/NumberSpinner"
+ id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.minConnectionsPerPartition"
+ name="qpid.jdbcstore.bonecp.minConnectionsPerPartition"
+ value="5"
+ smallDelta="1"
+ constraints="{min:1,max:1000,places:0}"
+ contextvar="true"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="tableContainer-labelCell" style="width: 300px;"><strong>Maximum connections per Partition: </strong></td>
+ <td class="tableContainer-valueCell">
+ <input dojoType="dijit/form/NumberSpinner"
+ id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.maxConnectionsPerPartition"
+ name="qpid.jdbcstore.bonecp.maxConnectionsPerPartition"
+ value="10"
+ smallDelta="1"
+ constraints="{min:1,max:1000,places:0}"
+ contextvar="true"/>
+ </td>
+ </tr>
+
+</table>
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java Wed Jul 16 11:07:18 2014
@@ -110,7 +110,7 @@ public class GenericJDBCConfigurationSto
catch (SQLException e)
{
throw new StoreException("Failed to create connection provider for connectionUrl: " + _connectionURL +
- " and username: " + settings.getUsername());
+ " and username: " + settings.getUsername(), e);
}
_blobType = details.getBlobType();
_varBinaryType = details.getVarBinaryType();
Copied: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js (from r1610960, qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js?p2=qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js&p1=qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js&r1=1610960&r2=1610967&rev=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/store/bdb/add.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/store/pool/none/add.js Wed Jul 16 11:07:18 2014
@@ -33,18 +33,18 @@ define(["dojo/_base/xhr",
"dojo/domReady!"],
function (xhr, dom, construct, win, registry, parser, array, event, json, string, Memory, FilteringSelect) {
return {
- show: function() {
- var node = dom.byId("addVirtualHost.storeSpecificDiv");
+ show: function(poolSpecificDivId, formFieldPrefix, htmlUrl) {
+ var node = dom.byId(poolSpecificDivId);
var that = this;
array.forEach(registry.toArray(),
function(item) {
- if(item.id.substr(0,34) == "formAddVirtualHost.specific.store.") {
+ if(item.id.substr(0,formFieldPrefix.length) == formFieldPrefix) {
item.destroyRecursive();
}
});
- xhr.get({url: "virtualhost/store/bdb/add.html",
+ xhr.get({url: htmlUrl,
sync: true,
load: function(data) {
node.innerHTML = data;
Copied: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js (from r1610960, qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js?p2=qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js&p1=qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js&r1=1610960&r2=1610967&rev=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/add.js Wed Jul 16 11:07:18 2014
@@ -1,5 +1,4 @@
/*
- *
* 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
@@ -16,7 +15,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
define(["dojo/_base/xhr",
"dojo/_base/array",
@@ -27,7 +25,7 @@ define(["dojo/_base/xhr",
"dojo/string",
"dojo/store/Memory",
"dijit/registry",
- "dojo/text!virtualhostnode/jdbc/add.html",
+ "dojo/text!virtualhost/jdbc/add.html",
"dojo/text!service/helper?action=pluginList&plugin=JDBCConnectionProviderFactory",
"dijit/form/ValidationTextBox",
"dijit/form/CheckBox",
@@ -47,7 +45,7 @@ define(["dojo/_base/xhr",
poolTypesData[i]= {id: poolTypes[i], name: poolTypes[i]};
}
var poolTypesStore = new Memory({ data: poolTypesData });
- var poolTypeControl = registry.byId("addVirtualHostNode.jdbcConnectionPoolType");
+ var poolTypeControl = registry.byId("addVirtualHost.connectionPoolType");
poolTypeControl.set("store", poolTypesStore);
var poolTypeFieldsDiv = dom.byId("addVirtualHost.poolSpecificDiv");
@@ -59,10 +57,10 @@ define(["dojo/_base/xhr",
var widgets = registry.findWidgets(poolTypeFieldsDiv);
array.forEach(widgets, function(item) { item.destroyRecursive();});
domConstruct.empty(poolTypeFieldsDiv);
- require(["qpid/management/virtualhost/store/pool/"+type.toLowerCase()+"/add"],
+ require(["qpid/management/store/pool/"+type.toLowerCase()+"/add"],
function(poolType)
{
- poolType.show();
+ poolType.show("addVirtualHost.poolSpecificDiv", "formAddVirtualHost.qpid.jdbcstore.bonecp", "virtualhost/store/pool/"+type.toLowerCase()+"/add.html");
});
}
}
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/add.js Wed Jul 16 11:07:18 2014
@@ -47,10 +47,10 @@ define(["dojo/_base/xhr",
poolTypesData[i]= {id: poolTypes[i], name: poolTypes[i]};
}
var poolTypesStore = new Memory({ data: poolTypesData });
- var poolTypeControl = registry.byId("addVirtualHostNode.jdbcConnectionPoolType");
+ var poolTypeControl = registry.byId("addVirtualHostNode.connectionPoolType");
poolTypeControl.set("store", poolTypesStore);
- var poolTypeFieldsDiv = dom.byId("addVirtualHost.poolSpecificDiv");
+ var poolTypeFieldsDiv = dom.byId("addVirtualHostNode.poolSpecificDiv");
poolTypeControl.on("change",
function(type)
{
@@ -59,10 +59,10 @@ define(["dojo/_base/xhr",
var widgets = registry.findWidgets(poolTypeFieldsDiv);
array.forEach(widgets, function(item) { item.destroyRecursive();});
domConstruct.empty(poolTypeFieldsDiv);
- require(["qpid/management/virtualhost/store/pool/"+type.toLowerCase()+"/add"],
+ require(["qpid/management/store/pool/"+type.toLowerCase()+"/add"],
function(poolType)
{
- poolType.show();
+ poolType.show("addVirtualHostNode.poolSpecificDiv", "formAddVirtualHostNode.qpid.jdbcstore.bonecp", "virtualhostnode/store/pool/" + type.toLowerCase() + "/add.html");
});
}
}
Added: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html?rev=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html (added)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html Wed Jul 16 11:07:18 2014
@@ -0,0 +1,76 @@
+<!--
+ ~ 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 tableContainer-labelCell" style="float:left; width: 300px;">JDBC Url*:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="text" id="addVirtualHost.connectionUrl"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'connectionUrl',
+ placeHolder: 'jdbc:provider:info',
+ required: true,
+ missingMessage: 'JDBC URL must be supplied',
+ title: 'Enter JDBC URL',
+ pattern: '^jdbc:.*:.*$'"/>
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Username*:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="text" id="addVirtualHost.username"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'username',
+ placeHolder: 'username',
+ required: true,
+ missingMessage: 'Username must be supplied',
+ title: 'Enter username'" />
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Password*:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="password" id="addVirtualHost.password"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'password',
+ placeHolder: 'password',
+ required: true,
+ missingMessage: 'Password must be supplied',
+ title: 'Enter password'" />
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Connection Pool*:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="text" id="addVirtualHost.connectionPoolType"
+ data-dojo-type="dijit/form/FilteringSelect"
+ data-dojo-props="
+ name: 'connectionPoolType',
+ required: true,
+ missingMessage: 'Connection Pool type must be supplied',
+ title: 'Select Connection Pool',
+ placeHolder: 'Select pool type'" />
+ </div>
+ </div>
+
+ <div style="clear:both"></div>
+ <div id="addVirtualHost.poolSpecificDiv"></div>
+</div>
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html Wed Jul 16 11:07:18 2014
@@ -20,36 +20,63 @@
-->
<div>
<div style="clear:both">
- <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Virtual Host Node Name*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div>
<div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.jdbcNodeName"
+ <input type="text" id="addVirtualHostNode.name"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'name',
- placeHolder: 'node name',
+ placeHolder: 'virtual host node name',
required: true,
- missingMessage: 'A node name must be supplied',
- title: 'Enter node name',
+ missingMessage: 'A virtual host node name must be supplied',
+ title: 'Enter virtual host node name',
pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
</div>
</div>
<div style="clear:both">
<div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">JDBC Url*:</div>
<div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.jdbcConnectionUrl"
+ <input type="text" id="addVirtualHostNode.connectionUrl"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'connectionUrl',
placeHolder: 'jdbc:provider:info',
required: true,
missingMessage: 'JDBC URL must be supplied',
- title: 'Enter JDBC URL'" />
+ title: 'Enter JDBC URL',
+ pattern: '^jdbc:.*:.*$'"/>
</div>
</div>
<div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Username*:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="text" id="addVirtualHostNode.username"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'username',
+ placeHolder: 'username',
+ required: true,
+ missingMessage: 'Username must be supplied',
+ title: 'Enter username'" />
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Password*:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="password" id="addVirtualHostNode.password"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'password',
+ placeHolder: 'password',
+ required: true,
+ missingMessage: 'Password must be supplied',
+ title: 'Enter password'" />
+ </div>
+ </div>
+ <div style="clear:both">
<div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Connection Pool*:</div>
<div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.jdbcConnectionPoolType"
+ <input type="text" id="addVirtualHostNode.connectionPoolType"
data-dojo-type="dijit/form/FilteringSelect"
data-dojo-props="
name: 'connectionPoolType',
@@ -59,17 +86,7 @@
placeHolder: 'Select pool type'" />
</div>
</div>
- <div style="clear:both;display:none">
- <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Combined store:</div>
- <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.derbyMessageStoreProvider"
- data-dojo-type="dijit/form/CheckBox"
- data-dojo-props="
- name: 'messageStoreProvider',
- required: true,
- checked: true" />
- </div>
- </div>
+
<div style="clear:both"></div>
- <div id="addVirtualHost.poolSpecificDiv"></div>
+ <div id="addVirtualHostNode.poolSpecificDiv"></div>
</div>
Copied: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/none/add.html (from r1610960, qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/none/add.html?p2=qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/none/add.html&p1=qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/store/memory/add.html&r1=1610960&r2=1610967&rev=1610967&view=diff
==============================================================================
(empty)
Added: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html?rev=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html (added)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html Wed Jul 16 11:07:18 2014
@@ -0,0 +1,82 @@
+<!--
+ -
+ - 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 class="dijitHidden">
+ <div data-dojo-type="dijit.Dialog" style="width:600px;" data-dojo-props="title:'Add'" id="addVirtualHostNodeAndVirtualHost">
+
+
+ <!-- VHN Form -->
+ <form id="addVirtualHostNode.form" method="post" data-dojo-type="dijit/form/Form">
+ <div class="formBox">
+ <fieldset>
+ <legend>Virtual Host Node</legend>
+ <div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Type*:</div>
+ <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell">
+ <select id="addVirtualHostNode.type" data-dojo-type="dijit/form/FilteringSelect"
+ data-dojo-props="
+ name: 'type',
+ required: true,
+ disabled: true,
+ placeHolder: 'select virtual host node type',
+ title: 'Select virtual host node type',
+ searchAttr: 'name'">
+ </select>
+ </div>
+ </div>
+ <div style="clear:both"></div>
+
+ <div id="addVirtualHostNode.typeFields"></div>
+ </fieldset>
+ </div>
+ </form>
+
+ <!-- VH Form -->
+ <form id="addVirtualHost.form" method="post" data-dojo-type="dijit/form/Form">
+ <div class="formBox">
+ <fieldset>
+ <legend>Virtual Host</legend>
+ <div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Type*:</div>
+ <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell">
+ <select id="addVirtualHost.type" data-dojo-type="dijit/form/FilteringSelect"
+ data-dojo-props="
+ name: 'type',
+ required: true,
+ disabled: true,
+ placeHolder: 'select virtual host type',
+ title: 'Select virtual host type',
+ searchAttr: 'name'">
+ </select>
+ </div>
+ </div>
+ <div style="clear:both"></div>
+
+ <div id="addVirtualHost.typeFields"></div>
+ </fieldset>
+ </div>
+ </form>
+
+ <div class="dijitDialogPaneActionBar">
+ <button data-dojo-type="dijit/form/Button" id="addVirtualHostNodeAndVirtualHost.addButton" data-dojo-props="label: 'Add'" type="submit"></button>
+ <button data-dojo-type="dijit/form/Button" id="addVirtualHostNodeAndVirtualHost.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
+ </div>
+ </div>
+</div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css Wed Jul 16 11:07:18 2014
@@ -90,10 +90,32 @@ div .messages {
height: 350px;
}
+.formBox {
+ border: .1em solid lightgrey;
+ margin: 10px 0px 20px 0px;
+ border-radius: 5px;
+}
+
+.formBox legend {
+ font-weight: bold;
+ margin-top: -10px;
+ margin-left: 5px;
+ background-color: white;
+}
+
+.formBox fieldset {
+ padding: 10px 0px 10px 0px;
+}
+
+.formBox .formLabel-labelCell {
+ margin-left: 5px;
+}
+
.formLabel-labelCell {
font-weight: bold;
}
+
.formLabel-controlCell {
padding: 1px;
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Wed Jul 16 11:07:18 2014
@@ -31,7 +31,7 @@ define(["dojo/_base/xhr",
"dijit/registry",
"dojox/html/entities",
"qpid/management/addAuthenticationProvider",
- "qpid/management/addVirtualHostNode",
+ "qpid/management/addVirtualHostNodeAndVirtualHost",
"qpid/management/addPort",
"qpid/management/addKeystore",
"qpid/management/addGroupProvider",
@@ -49,7 +49,7 @@ define(["dojo/_base/xhr",
"dijit/Menu",
"dijit/MenuItem",
"dojo/domReady!"],
- function (xhr, parser, query, json, connect, properties, updater, util, UpdatableStore, EnhancedGrid, registry, entities, addAuthenticationProvider, addVirtualHostNode, addPort, addKeystore, addGroupProvider, addAccessControlProvider) {
+ function (xhr, parser, query, json, connect, properties, updater, util, UpdatableStore, EnhancedGrid, registry, entities, addAuthenticationProvider, addVirtualHostNodeAndVirtualHost, addPort, addKeystore, addGroupProvider, addAccessControlProvider) {
function Broker(name, parent, controller) {
this.name = name;
@@ -198,8 +198,8 @@ define(["dojo/_base/xhr",
}
);
- var addHostButton = query(".addVirtualHost", contentPane.containerNode)[0];
- connect.connect(registry.byNode(addHostButton), "onClick", function(evt){ addVirtualHostNode.show(); });
+ var addVHNAndVHButton = query(".addVirtualHostNodeAndVirtualHostButton", contentPane.containerNode)[0];
+ connect.connect(registry.byNode(addVHNAndVHButton), "onClick", function(evt){ addVirtualHostNodeAndVirtualHost.show(); });
var addPortButton = query(".addPort", contentPane.containerNode)[0];
connect.connect(registry.byNode(addPortButton), "onClick", function(evt){
Added: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js (added)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js Wed Jul 16 11:07:18 2014
@@ -0,0 +1,285 @@
+/*
+ *
+ * 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.
+ *
+ */
+define(["dojo/_base/xhr",
+ "dojo/_base/event",
+ "dojo/_base/lang",
+ "dojo/_base/array",
+ "dojo/dom",
+ "dojo/dom-construct",
+ "dojo/json",
+ "dojo/parser",
+ "dojo/store/Memory",
+ "dijit/registry",
+ "dijit/Dialog",
+ "dijit/form/Button",
+ "dijit/form/FilteringSelect",
+ "qpid/common/properties",
+ "dojo/text!addVirtualHostNodeAndVirtualHost.html",
+ "dijit/form/Form",
+ "dijit/form/CheckBox",
+ "dijit/form/RadioButton",
+ "dojox/validate/us",
+ "dojox/validate/web",
+ "dojo/domReady!"],
+ function (xhr, event, lang, array, dom, domConstruct, json, parser, Memory, registry, Dialog, Button, FilteringSelect, properties, template)
+ {
+
+ var addVirtualHostNodeAndVirtualHost =
+ {
+ init: function()
+ {
+ var that=this;
+ this.containerNode = domConstruct.create("div", {innerHTML: template});
+ parser.parse(this.containerNode);
+
+ this.dialog = registry.byId("addVirtualHostNodeAndVirtualHost");
+ this.addButton = registry.byId("addVirtualHostNodeAndVirtualHost.addButton");
+ this.cancelButton = registry.byId("addVirtualHostNodeAndVirtualHost.cancelButton");
+ this.cancelButton.on("click", function(e){that._cancel(e);});
+ this.addButton.on("click", function(e){that._add(e);});
+
+ this.virtualHostNodeTypeFieldsContainer = dom.byId("addVirtualHostNode.typeFields");
+ this.virtualHostNodeForm = registry.byId("addVirtualHostNode.form");
+ this.virtualHostNodeType = registry.byId("addVirtualHostNode.type");
+ this.virtualHostNodeType.set("disabled", true);
+
+ this.virtualHostTypeFieldsContainer = dom.byId("addVirtualHost.typeFields");
+ this.virtualHostForm = registry.byId("addVirtualHost.form");
+ this.virtualHostType = registry.byId("addVirtualHost.type");
+ this.virtualHostType.set("disabled", true);
+
+ xhr.get({sync: properties.useSyncGet, handleAs: "json", url: "api/latest/broker?depth=0", load: function(data){that._onBrokerData(data[0]) }});
+ },
+ _makeTypeStore: function (types) {
+ var typeData = [];
+ for (var i = 0; i < types.length; i++) {
+ var type = types[i];
+ typeData.push({id: type, name: type});
+ }
+ return new Memory({ data: typeData });
+ },
+ _onBrokerData: function(brokerData)
+ {
+ var that=this;
+ this.supportedVirtualHostNodeTypes = brokerData.supportedVirtualHostNodeTypes;
+ this.supportedVirtualHostNodeTypes.sort();
+ this.supportedVirtualHostTypes = brokerData.supportedVirtualHostTypes;
+ this.supportedVirtualHostTypes.sort();
+
+ //VH Type BDB_HA_REPLICA is not user creatable. This is only needed until we have model meta data available.
+ this.supportedVirtualHostTypes = array.filter(this.supportedVirtualHostTypes, function(item){
+ return item != "BDB_HA_REPLICA";
+ });
+
+ var virtualHostNodeTypeStore = this._makeTypeStore(this.supportedVirtualHostNodeTypes);
+ this.virtualHostNodeType.set("store", virtualHostNodeTypeStore);
+ this.virtualHostNodeType.set("disabled", false);
+ this.virtualHostNodeType.on("change", function(type){that._typeChanged(type, that.virtualHostNodeTypeFieldsContainer, "qpid/management/virtualhostnode/");});
+
+ var virtualHostTypeStore = this._makeTypeStore(this.supportedVirtualHostTypes);
+ this.virtualHostType.set("store", virtualHostTypeStore);
+ this.virtualHostType.set("disabled", false);
+ this.virtualHostType.on("change", function(type){that._typeChanged(type, that.virtualHostTypeFieldsContainer, "qpid/management/virtualhost/");});
+ },
+ show: function()
+ {
+ this.virtualHostNodeForm.reset();
+ this.virtualHostNodeType.set("value", null);
+
+ this.virtualHostForm.reset();
+ this.virtualHostType.set("value", null);
+ this.dialog.show();
+ },
+ destroy: function()
+ {
+ if (this.dialog)
+ {
+ this.dialog.destroyRecursive();
+ this.dialog = null;
+ }
+
+ if (this.containerNode)
+ {
+ domConstruct.destroy(this.containerNode);
+ this.containerNode = null;
+ }
+ },
+ _typeChanged: function (type, typeFieldsContainer, urlStem)
+ {
+ var widgets = registry.findWidgets(typeFieldsContainer);
+ array.forEach(widgets, function(item) { item.destroyRecursive();});
+ domConstruct.empty(typeFieldsContainer);
+
+ if (type)
+ {
+ var that = this;
+ require([urlStem + type.toLowerCase() + "/add"],
+ function(TypeUI)
+ {
+ try
+ {
+ TypeUI.show({containerNode:typeFieldsContainer, parent: that});
+ }
+ catch(e)
+ {
+ console.warn(e);
+ }
+ }
+ );
+ }
+ },
+ _cancel: function(e)
+ {
+ this.dialog.hide();
+ },
+ _add: function(e)
+ {
+ event.stop(e);
+ this._submit();
+ },
+ _submit: function()
+ {
+ if(this.virtualHostNodeForm.validate() && this.virtualHostForm.validate())
+ {
+ var success = false,failureReason=null;
+
+ var virtualHostNodeData = this._getValues(this.virtualHostNodeForm);
+ var virtualHostData = this._getValues(this.virtualHostForm);
+
+ if (virtualHostNodeData["type"] == "JSON" && virtualHostData["type"] == "ProvidedStore")
+ {
+ alert('Cannot use a JSON Virtual Host Node with a ProvidedStore Virtual Host');
+ return;
+ }
+
+ //Default the VH name to be the same as the VHN name.
+ virtualHostData["name"] = virtualHostNodeData["name"];
+
+ var encodedVirtualHostNodeName = encodeURIComponent(virtualHostNodeData.name);
+ xhr.put({
+ url: "api/latest/virtualhostnode/" + encodedVirtualHostNodeName,
+ sync: true,
+ handleAs: "json",
+ headers: { "Content-Type": "application/json"},
+ putData: json.stringify(virtualHostNodeData),
+ load: function(x) {success = true; },
+ error: function(error) {success = false; failureReason = error;}
+ });
+
+ if(success === true)
+ {
+ var encodedVirtualHostName = encodeURIComponent(virtualHostData.name);
+ xhr.put({
+ url: "api/latest/virtualhost/" + encodedVirtualHostNodeName + "/" + encodedVirtualHostName,
+ sync: true,
+ handleAs: "json",
+ headers: { "Content-Type": "application/json"},
+ putData: json.stringify(virtualHostData),
+ load: function (x) {
+ success = true;
+ },
+ error: function (error) {
+ success = false;
+ failureReason = error;
+ }
+ });
+ }
+
+ if (success == true)
+ {
+ this.dialog.hide();
+ }
+ else
+ {
+ // What if VHN creation was successful but VH was not
+ alert("Error:" + failureReason);
+ }
+ }
+ else
+ {
+ alert('Form contains invalid data. Please correct first');
+ }
+ },
+ _getValues: function (form)
+ {
+ var values = {};
+ var contextMap = {};
+
+ var formWidgets = form.getChildren();
+ for(var i in formWidgets)
+ {
+ var widget = formWidgets[i];
+ var value = widget.value;
+ var propName = widget.name;
+ if (propName && (widget.required || value ))
+ {
+ if (widget.contextvar)
+ {
+ contextMap [propName] = String(value); // Broker requires that context values are Strings
+ }
+ else
+ {
+ if (widget instanceof dijit.form.CheckBox)
+ {
+ values[ propName ] = widget.checked;
+ }
+ else if (widget instanceof dijit.form.RadioButton && value)
+ {
+ var currentValue = values[propName];
+ if (currentValue)
+ {
+ if (lang.isArray(currentValue))
+ {
+ currentValue.push(value)
+ }
+ else
+ {
+ values[ propName ] = [currentValue, value];
+ }
+ }
+ else
+ {
+ values[ propName ] = value;
+ }
+ }
+ else
+ {
+ values[ propName ] = value ? value: null;
+ }
+
+ }
+ }
+ }
+
+ // One or more context variables were defined on form
+ if (Object.keys(contextMap).length > 0)
+ {
+ values ["context"] = contextMap;
+ }
+ return values;
+ }
+ };
+
+ addVirtualHostNodeAndVirtualHost.init();
+
+ return addVirtualHostNodeAndVirtualHost;
+ }
+);
Added: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js?rev=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js (added)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/derby/add.js Wed Jul 16 11:07:18 2014
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+define(["dojo/_base/xhr",
+ "dojo/parser",
+ "dojo/dom",
+ "dojo/dom-construct",
+ "dojo/json",
+ "dijit/registry",
+ "dojo/text!virtualhost/sizemonitoring/add.html",
+ "dijit/form/ValidationTextBox",
+ "dijit/form/NumberTextBox",
+ "dojo/domReady!"],
+ function (xhr, parser, dom, domConstruct, json, registry, template)
+ {
+ return {
+ show: function (data)
+ {
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode);
+ }
+ };
+ }
+);
Added: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js?rev=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js (added)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/add.js Wed Jul 16 11:07:18 2014
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+define(["dojo/_base/xhr",
+ "dojo/parser",
+ "dojo/dom",
+ "dojo/dom-construct",
+ "dojo/json",
+ "dijit/registry",
+ "dojo/text!virtualhost/providedstore/add.html",
+ "dijit/form/ValidationTextBox",
+ "dojo/domReady!"],
+ function (xhr, parser, dom, domConstruct, json, registry, template)
+ {
+ return {
+ show: function (data)
+ {
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode);
+ }
+ };
+ }
+);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html Wed Jul 16 11:07:18 2014
@@ -73,7 +73,7 @@
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Hosts'">
<div class="broker-virtualhosts"></div>
- <button data-dojo-type="dijit.form.Button" class="addVirtualHost">Add Virtual Host</button>
+ <button data-dojo-type="dijit.form.Button" class="addVirtualHostNodeAndVirtualHostButton">Add</button>
<div data-dojo-type="dijit.form.DropDownButton" class="virtualHostNodeMenuButton" data-dojo-props="iconClass: 'dijitIconConnector',disabled:true">
<span>Virtual Host Node</span>
<div data-dojo-type="dijit.Menu">
Added: 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=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html (added)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html Wed Jul 16 11:07:18 2014
@@ -0,0 +1,46 @@
+<!--
+ ~ 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 tableContainer-labelCell" style="float:left; width: 300px;">Store overfull size:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="text" id="addVirtualHost.storeOverfullSize"
+ data-dojo-type="dijit/form/NumberTextBox"
+ data-dojo-props="
+ name: 'storeOverfullSize',
+ required: false,
+ title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages',
+ constraints:{min:0,places:0}" />
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store underfull size:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="text" id="addVirtualHost.storeUnderfullSize"
+ data-dojo-type="dijit/form/NumberTextBox"
+ data-dojo-props="
+ name: 'storeUnderfullSize',
+ required: false,
+ title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages',
+ constraints:{min:0,places:0}" />
+ </div>
+ </div>
+ <div style="clear:both"></div>
+</div>
Added: 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=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html (added)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html Wed Jul 16 11:07:18 2014
@@ -0,0 +1,59 @@
+<!--
+ ~ 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 tableContainer-labelCell" style="float:left; width: 300px;">Message store path*:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="text" id="addVirtualHost.storePath"
+ data-dojo-type="dijit/form/ValidationTextBox"
+ data-dojo-props="
+ name: 'storePath',
+ placeHolder: 'path/to/store',
+ required: true,
+ missingMessage: 'Store path must be supplied',
+ title: 'Enter message store path'" />
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store overfull size:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="text" id="addVirtualHost.storeOverfullSize"
+ data-dojo-type="dijit/form/NumberTextBox"
+ data-dojo-props="
+ name: 'storeOverfullSize',
+ required: false,
+ title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages',
+ constraints:{min:0,places:0}" />
+ </div>
+ </div>
+ <div style="clear:both">
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store underfull size:</div>
+ <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
+ <input type="text" id="addVirtualHost.storeUnderfullSize"
+ data-dojo-type="dijit/form/NumberTextBox"
+ data-dojo-props="
+ name: 'storeUnderfullSize',
+ required: false,
+ title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages',
+ constraints:{min:0,places:0}" />
+ </div>
+ </div>
+ <div style="clear:both"></div>
+</div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html Wed Jul 16 11:07:18 2014
@@ -20,7 +20,7 @@
-->
<div>
<div style="clear:both">
- <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Virtual Host Node Name*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div>
<div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
<input type="text" id="addVirtualHostNode.jsonNodeName"
data-dojo-type="dijit/form/ValidationTextBox"
Added: qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/add.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/add.js?rev=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/add.js (added)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/js/qpid/management/virtualhost/memory/add.js Wed Jul 16 11:07:18 2014
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+define(["dojo/_base/xhr",
+ "dojo/parser",
+ "dojo/dom",
+ "dojo/dom-construct",
+ "dojo/json",
+ "dijit/registry",
+ "dojo/text!virtualhost/memory/add.html",
+ "dijit/form/ValidationTextBox",
+ "dojo/domReady!"],
+ function (xhr, parser, dom, domConstruct, json, registry, template)
+ {
+ return {
+ show: function (data)
+ {
+ this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode);
+ parser.parse(this.containerNode);
+ }
+ };
+ }
+);
Added: qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html?rev=1610967&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html (added)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhost/memory/add.html Wed Jul 16 11:07:18 2014
@@ -0,0 +1,21 @@
+<!--
+ ~ 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>
+</div>
Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html?rev=1610967&r1=1610966&r2=1610967&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html Wed Jul 16 11:07:18 2014
@@ -20,29 +20,18 @@
-->
<div>
<div style="clear:both">
- <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Virtual Host Node Name*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div>
<div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.derbyNodeName"
+ <input type="text" id="addVirtualHostNode.name"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
name: 'name',
- placeHolder: 'node name',
+ placeHolder: 'virtual host node name',
required: true,
- missingMessage: 'A node name must be supplied',
- title: 'Enter node name',
+ missingMessage: 'A virtual host node name must be supplied',
+ title: 'Enter virtual host node name',
pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
</div>
</div>
- <div style="clear:both;display:none">
- <div class="formLabel-labelCell" style="float:left; width: 300px;">Combined store:</div>
- <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;">
- <input type="text" id="addVirtualHostNode.derbyMessageStoreProvider"
- data-dojo-type="dijit/form/CheckBox"
- data-dojo-props="
- name: 'messageStoreProvider',
- required: true,
- checked: true" />
- </div>
- </div>
<div style="clear:both"></div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org