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/27 18:03:25 UTC
svn commit: r1553695 - in /qpid/branches/java-broker-bdb-ha/qpid/java:
bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/
bdbstore/src/main/java/resources/virtualhost/bdb_ha/
broker-plugins/management-http/src/main/java/resources/j...
Author: orudyy
Date: Fri Dec 27 17:03:24 2013
New Revision: 1553695
URL: http://svn.apache.org/r1553695
Log:
QPID-5413: Improve Ha virtual host UI
Modified:
qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js
qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html
qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js?rev=1553695&r1=1553694&r2=1553695&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/addVirtualHost.js Fri Dec 27 17:03:24 2013
@@ -56,35 +56,61 @@ define(["dojo/_base/xhr",
}
}});
},
- save: function(virtualHostName)
+ save: function()
{
- var node = {};
- for(var i = 0; i < nodeFields.length; i++)
- {
- var fieldName = nodeFields[i];
- var widget = this[fieldName];
- if (widget)
- {
- node[fieldName] = widget.type=="checkbox"? widget.get("checked"): widget.value;
- }
- }
- node.name = this.nodeName.value;
+ this.success = false;
var that = this;
- xhr.put({url: "rest/replicationnode/" + encodeURIComponent(virtualHostName) + "/" + encodeURIComponent(this.nodeName.value),
+ var virtualHostName = registry.byId("formAddVirtualHost.name").get("value");
+ var virtualHostNameEncoded = encodeURIComponent(virtualHostName);
+
+
+ // create virtual host in QUIESCED state
+ var hostData =
+ {
+ state: "QUIESCED",
+ name: virtualHostName,
+ type: registry.byId("addVirtualHost.type").get("value"),
+ };
+
+ xhr.put({url: "rest/virtualhost/" + virtualHostNameEncoded,
sync: true, handleAs: "json",
headers: { "Content-Type": "application/json"},
- putData: json.stringify(node),
+ putData: json.stringify(hostData),
load: function(x) { that.success = true; },
error: function(error) {that.success = false; that.failureReason = error;}});
+ // if success, create node
if (this.success)
{
- xhr.put({url: "rest/virtualhost/" + encodeURIComponent(virtualHostName),
+ var node = {};
+ for(var i = 0; i < nodeFields.length; i++)
+ {
+ var fieldName = nodeFields[i];
+ var widget = this[fieldName];
+ if (widget)
+ {
+ node[fieldName] = widget.type=="checkbox"? widget.get("checked"): widget.get("value");
+ }
+ }
+
+ node.name = this.nodeName.value;
+ xhr.put({url: "rest/replicationnode/" + virtualHostNameEncoded + "/" + encodeURIComponent(this.nodeName.value),
sync: true, handleAs: "json",
headers: { "Content-Type": "application/json"},
- putData: json.stringify({state: "ACTIVE"}),
+ putData: json.stringify(node),
load: function(x) { that.success = true; },
error: function(error) {that.success = false; that.failureReason = error;}});
+
+ // if success, change virtual host state to ACTIVE
+ if (this.success)
+ {
+ xhr.put({url: "rest/virtualhost/" + virtualHostNameEncoded,
+ sync: true, handleAs: "json",
+ headers: { "Content-Type": "application/json"},
+ putData: json.stringify({state: "ACTIVE"}),
+ load: function(x) { that.success = true; },
+ error: function(error) {that.success = false; that.failureReason = error;}});
+ }
}
return this.success;
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js?rev=1553695&r1=1553694&r2=1553695&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/show.js Fri Dec 27 17:03:24 2013
@@ -44,6 +44,19 @@ define(["dojo/_base/xhr",
return query("." + nodeClass, containerNode)[0];
}
+ function convertMap(map)
+ {
+ var data =[];
+ for(var propName in map)
+ {
+ if(map.hasOwnProperty(propName))
+ {
+ data.push({id: propName, name: propName, value: map[propName]});
+ }
+ }
+ return data;
+ }
+
function BDBHA(containerNode) {
var that = this;
xhr.get({url: "virtualhost/bdb_ha/show.html",
@@ -74,6 +87,8 @@ define(["dojo/_base/xhr",
var name = nodeFields[i];
this[name].innerHTML = entities.encode(String(localNode[name]));
}
+ this.parametersGrid.update(convertMap(localNode.parameters));
+ this.replicationParametersGrid.update(convertMap(localNode.replicationParameters));
if (nodes.length < 3)
{
this.designatedPrimaryContainer.style.display="block";
@@ -138,6 +153,22 @@ define(["dojo/_base/xhr",
}
},
EnhancedGrid, true );
+
+ this.parametersGrid = new UpdatableStore([],
+ findNode("parameters", containerNode),
+ [
+ { name: 'Name', field: 'name', width: '50%' },
+ { name: 'Value', field: 'value', width: '50%' }
+ ],
+ null, null, null, true );
+
+ this.replicationParametersGrid = new UpdatableStore([],
+ findNode("replicationParameters", containerNode),
+ [
+ { name: 'Name', field: 'name', width: '50%' },
+ { name: 'Value', field: 'value', width: '50%' }
+ ],
+ null, null, null, true );
}
BDBHA.prototype._initFields = function(nodeFields, containerNode)
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html?rev=1553695&r1=1553694&r2=1553695&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/add.html Fri Dec 27 17:03:24 2013
@@ -72,6 +72,3 @@
</td>
</tr>
</table>
-
-<!-- set virtual host state to QUIESCED by default -->
-<input dojoType="dijit/form/TextBox" id="formAddVirtualHost.specific.state" type="hidden" name="state" value="QUIESCED"/>
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html?rev=1553695&r1=1553694&r2=1553695&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html Fri Dec 27 17:03:24 2013
@@ -90,6 +90,14 @@
</div>
</div>
<div style="clear:both"></div>
+ <div style="clear:both" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Parameters'">
+ <div class="parameters"></div>
+ </div>
+ <div style="clear:both"></div>
+ <div style="clear:both" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Replication Parameters'">
+ <div class="replicationParameters"></div>
+ </div>
+ <div style="clear:both"></div>
<div class="dijitDialogPaneActionBar">
<button data-dojo-type="dijit.form.Button" class="activateNodeButton" type="button" data-dojo-props="iconClass: 'dijitEditorIconCreateLink', disabled: true">Activate</button>
<button data-dojo-type="dijit.form.Button" class="stopNodeButton" type="button" data-dojo-props="iconClass: 'dijitEditorIconUnlink'">Stop</button>
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js?rev=1553695&r1=1553694&r2=1553695&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js Fri Dec 27 17:03:24 2013
@@ -123,30 +123,27 @@ define(["dojo/_base/xhr",
alert("Either configuration file or type have to be specified!");
return false;
}
- var newVirtualHost = convertToVirtualHost(formValues);
- var that = this;
- xhr.put({url: "rest/virtualhost/" + encodeURIComponent(newVirtualHost.name),
- sync: true, handleAs: "json",
- headers: { "Content-Type": "application/json"},
- putData: json.toJson(newVirtualHost),
- load: function(x)
- {
- if (addVirtualHost.typeSpecificWidget && addVirtualHost.typeSpecificWidget.save
- && typeof addVirtualHost.typeSpecificWidget.save == "function")
- {
- that.success = addVirtualHost.typeSpecificWidget.save(newVirtualHost.name);
- if (!that.success)
- {
- that.failureReason = addVirtualHost.failureReason
- }
- }
- else
- {
- that.success = true;
- }
- },
- error: function(error) {that.success = false; that.failureReason = error;}});
+ if (addVirtualHost.typeSpecificWidget && addVirtualHost.typeSpecificWidget.save
+ && typeof addVirtualHost.typeSpecificWidget.save == "function")
+ {
+ this.success = addVirtualHost.typeSpecificWidget.save();
+ if (!this.success)
+ {
+ this.failureReason = addVirtualHost.failureReason
+ }
+ }
+ else
+ {
+ var that = this;
+ var newVirtualHost = convertToVirtualHost(formValues);
+ xhr.put({url: "rest/virtualhost/" + encodeURIComponent(newVirtualHost.name),
+ sync: true, handleAs: "json",
+ headers: { "Content-Type": "application/json"},
+ putData: json.toJson(newVirtualHost),
+ load: function(){ that.success = true; },
+ error: function(error) {that.success = false; that.failureReason = error;}});
+ }
if(this.success === true)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org