You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/04/29 13:04:44 UTC
svn commit: r1741609 [28/31] - in /qpid/java/trunk:
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/virtual...
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js Fri Apr 29 11:04:40 2016
@@ -25,77 +25,82 @@ define(["dojo/dom",
"qpid/common/util",
"dojo/parser",
"dojo/text!store/filekeystore/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addKeyStore =
- {
- show: function(data)
- {
- var that=this;
- this.metadata = data.metadata;
- this.containerNode = data.containerNode;
- data.containerNode.innerHTML = template;
- parser.parse(this.containerNode).then(function(instances)
- {
- that.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addKeyStore = {
+ show: function (data)
+ {
+ var that = this;
+ this.metadata = data.metadata;
+ this.containerNode = data.containerNode;
+ data.containerNode.innerHTML = template;
+ parser.parse(this.containerNode).then(function (instances)
+ {
+ that.keyStoreOldBrowserWarning =
+ dom.byId("addStore.oldBrowserWarning");
- if (!window.FileReader)
- {
- that.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
- that.keyStoreOldBrowserWarning.className = that.keyStoreOldBrowserWarning.className.replace("hidden", "");
- }
+ if (!window.FileReader)
+ {
+ that.keyStoreOldBrowserWarning.innerHTML =
+ "File upload requires a more recent browser with HTML5 support";
+ that.keyStoreOldBrowserWarning.className =
+ that.keyStoreOldBrowserWarning.className.replace(
+ "hidden",
+ "");
+ }
- if (data.effectiveData)
- {
- that.update(data.effectiveData);
- }
+ if (data.effectiveData)
+ {
+ that.update(data.effectiveData);
+ }
- util.applyMetadataToWidgets(data.containerNode, "KeyStore", "FileKeyStore", data.metadata);
- });
- },
- update: function(effectiveData)
- {
- var attributes = this.metadata.getMetaData("KeyStore", "FileKeyStore").attributes;
- var widgets = registry.findWidgets(this.containerNode);
- array.forEach(widgets, function(item)
- {
- var name = item.id.replace("addStore.","");
- if (name in attributes )
- {
- var attribute = attributes[name];
- var value = effectiveData[name];
- if (value)
- {
- if (attribute.secure)
- {
- if (!/^\*+/.test(value) )
- {
- item.set("value", value);
- }
- else
- {
- item.set("required", false);
- if (name == "storeUrl")
- {
- item.set("uploaded", true)
- }
- else
- {
- item.set("placeHolder", value);
- }
- }
- }
- else
- {
- item.set("value", value);
- }
- }
- }
- });
- }
- };
+ util.applyMetadataToWidgets(data.containerNode,
+ "KeyStore",
+ "FileKeyStore",
+ data.metadata);
+ });
+ },
+ update: function (effectiveData)
+ {
+ var attributes = this.metadata.getMetaData("KeyStore", "FileKeyStore").attributes;
+ var widgets = registry.findWidgets(this.containerNode);
+ array.forEach(widgets, function (item)
+ {
+ var name = item.id.replace("addStore.", "");
+ if (name in attributes)
+ {
+ var attribute = attributes[name];
+ var value = effectiveData[name];
+ if (value)
+ {
+ if (attribute.secure)
+ {
+ if (!/^\*+/.test(value))
+ {
+ item.set("value", value);
+ }
+ else
+ {
+ item.set("required", false);
+ if (name == "storeUrl")
+ {
+ item.set("uploaded", true)
+ }
+ else
+ {
+ item.set("placeHolder", value);
+ }
+ }
+ }
+ else
+ {
+ item.set("value", value);
+ }
+ }
+ }
+ });
+ }
+ };
- return addKeyStore;
- }
-);
+ return addKeyStore;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/show.js Fri Apr 29 11:04:40 2016
@@ -17,26 +17,24 @@
* under the License.
*/
-define(["qpid/common/util", "dojo/domReady!"],
- function (util)
- {
+define(["qpid/common/util", "dojo/domReady!"], function (util)
+{
function FileKeyStoreProvider(data)
{
this.fields = [];
var attributes = data.parent.management.metadata.getMetaData("KeyStore", "FileKeyStore").attributes;
- for(var name in attributes)
+ for (var name in attributes)
{
this.fields.push(name);
}
util.buildUI(data.containerNode, data.parent, "store/filekeystore/show.html", this.fields, this);
}
- FileKeyStoreProvider.prototype.update = function(data)
+ FileKeyStoreProvider.prototype.update = function (data)
{
util.updateUI(data, this.fields, this);
}
return FileKeyStoreProvider;
- }
-);
+});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js Fri Apr 29 11:04:40 2016
@@ -25,72 +25,77 @@ define(["dojo/dom",
"qpid/common/util",
"dojo/parser",
"dojo/text!store/filetruststore/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addTrustStore =
- {
- show: function(data)
- {
- var that=this;
- this.metadata = data.metadata;
- this.containerNode = data.containerNode;
- data.containerNode.innerHTML = template;
- parser.parse(this.containerNode).then(function(instances)
- {
- that.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addTrustStore = {
+ show: function (data)
+ {
+ var that = this;
+ this.metadata = data.metadata;
+ this.containerNode = data.containerNode;
+ data.containerNode.innerHTML = template;
+ parser.parse(this.containerNode).then(function (instances)
+ {
+ that.keyStoreOldBrowserWarning =
+ dom.byId("addStore.oldBrowserWarning");
- if (!window.FileReader)
- {
- // Fall back for IE8/9 which do not support FileReader
- that.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
- that.keyStoreOldBrowserWarning.className = that.keyStoreOldBrowserWarning.className.replace("hidden", "");
- }
+ if (!window.FileReader)
+ {
+ // Fall back for IE8/9 which do not support FileReader
+ that.keyStoreOldBrowserWarning.innerHTML =
+ "File upload requires a more recent browser with HTML5 support";
+ that.keyStoreOldBrowserWarning.className =
+ that.keyStoreOldBrowserWarning.className.replace(
+ "hidden",
+ "");
+ }
- if (data.effectiveData)
- {
- that.update(data.effectiveData);
- }
+ if (data.effectiveData)
+ {
+ that.update(data.effectiveData);
+ }
- util.applyMetadataToWidgets(data.containerNode, "TrustStore", "FileTrustStore", data.metadata);
- });
- },
- update: function(effectiveData)
- {
- var attributes = this.metadata.getMetaData("TrustStore", "FileTrustStore").attributes;
- var widgets = registry.findWidgets(this.containerNode);
- array.forEach(widgets, function(item)
- {
- var name = item.id.replace("addStore.","");
- if (name in attributes )
- {
- var attribute = attributes[name];
- var value = effectiveData[name];
- if (value)
- {
- if (attribute.secure)
- {
- if (!/^\*+/.test(value) )
- {
- item.set("value", value);
- }
- else
- {
- item.set("placeHolder", value);
- item.set("required", false);
- }
- }
- else
- {
- item.set("value", value);
- }
- }
- }
- });
+ util.applyMetadataToWidgets(data.containerNode,
+ "TrustStore",
+ "FileTrustStore",
+ data.metadata);
+ });
+ },
+ update: function (effectiveData)
+ {
+ var attributes = this.metadata.getMetaData("TrustStore", "FileTrustStore").attributes;
+ var widgets = registry.findWidgets(this.containerNode);
+ array.forEach(widgets, function (item)
+ {
+ var name = item.id.replace("addStore.", "");
+ if (name in attributes)
+ {
+ var attribute = attributes[name];
+ var value = effectiveData[name];
+ if (value)
+ {
+ if (attribute.secure)
+ {
+ if (!/^\*+/.test(value))
+ {
+ item.set("value", value);
+ }
+ else
+ {
+ item.set("placeHolder", value);
+ item.set("required", false);
+ }
+ }
+ else
+ {
+ item.set("value", value);
+ }
+ }
+ }
+ });
- }
- };
+ }
+ };
- return addTrustStore;
- }
-);
+ return addTrustStore;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/show.js Fri Apr 29 11:04:40 2016
@@ -17,26 +17,24 @@
* under the License.
*/
-define(["qpid/common/util", "dojo/domReady!"],
- function (util)
- {
+define(["qpid/common/util", "dojo/domReady!"], function (util)
+{
function FileTrustStoreProvider(data)
{
this.fields = [];
var attributes = data.parent.management.metadata.getMetaData("TrustStore", "FileTrustStore").attributes;
- for(var name in attributes)
+ for (var name in attributes)
{
this.fields.push(name);
}
util.buildUI(data.containerNode, data.parent, "store/filetruststore/show.html", this.fields, this);
}
- FileTrustStoreProvider.prototype.update = function(data)
+ FileTrustStoreProvider.prototype.update = function (data)
{
util.updateUI(data, this.fields, this);
}
return FileTrustStoreProvider;
- }
-);
+});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/managedcertificatestore/show.js Fri Apr 29 11:04:40 2016
@@ -23,157 +23,214 @@ define(["dojo/query",
"dojox/grid/EnhancedGrid",
"qpid/common/UpdatableStore",
"dijit/registry",
- "dojo/domReady!"],
- function (query, lang, util, EnhancedGrid, UpdatableStore, registry)
- {
- function addIdToCertificates(obj) {
- var certItems = [];
- var certDetails = obj.certificateDetails;
- for (var idx in certDetails)
- {
- var item = lang.mixin(certDetails[idx], {id: certDetails[idx].serialNumber + '|' + certDetails[idx].issuerName});
- certItems.push(item);
- }
- return certItems;
- }
-
-
- function ManagedCertificateStore(data)
- {
- this.fields = [];
- this.management = data.parent.management;
- this.modelObj = data.parent.modelObj;
- var containerNode = data.containerNode;
- var attributes = this.management.metadata.getMetaData("TrustStore", "ManagedCertificateStore").attributes;
- for(var name in attributes)
- {
- this.fields.push(name);
- }
- var that = this;
- var gridProperties = {
- height: 400,
- selectionMode: "extended",
- plugins: {
- indirectSelection: true,
- pagination: {
- pageSizes: [10, 25, 50, 100],
- description: true,
- sizeSwitch: true,
- pageStepper: true,
- gotoButton: true,
- maxPageStep: 4,
- position: "bottom"
- }
- }};
-
-
- util.buildUI(data.containerNode, data.parent, "store/managedcertificatestore/show.html", this.fields, this, function() {
- that.certificates = addIdToCertificates(that);
- that.certificatesGrid = new UpdatableStore(that.certificates, query(".managedCertificatesGrid", containerNode)[0],
- [
- { name: "Subject Name", field: "subjectName", width: "25%"},
- { name: "Issuer Name", field: "issuerName", width: "25%"},
- { name: "Serial #", field: "serialNumber", width: "10%"},
- { name: "Valid From", field: "validFrom", width: "20%",
- formatter: function(val)
- {
- return that.management.userPreferences.formatDateTime(val, {addOffset: true, appendTimeZone: true});
- }
- },
- { name: "Valid Until", field: "validUntil", width: "20%",
- formatter: function(val)
- {
- return that.management.userPreferences.formatDateTime(val, {addOffset: true, appendTimeZone: true});
- }
- }
- ], null, gridProperties, EnhancedGrid);
- });
-
- this.removeButton = registry.byNode(query(".removeCertificates", containerNode)[0]);
- this.removeButton.on("click", function(e) {that.removeCertificates()} );
-
- this.addButton = registry.byNode(query(".addCertificate", containerNode)[0]);
- var addButton = this.addButton;
- var that = this;
-
- function uploadCertificate(cert) {
- var parentModelObj = that.modelObj;
- var modelObj = {type: parentModelObj.type, name: "addCertificate", parent: parentModelObj};
- var url = that.management.buildObjectURL(modelObj);
-
- that.management.post({url: url}, {certificate: cert}).then(uploadComplete, uploadError);
- }
-
- function uploadComplete() {
- addButton.set("disabled", false);
- addButton.reset();
- }
-
- function uploadError(error) {
- that.management.errorHandler(error);
- addButton.set("disabled", false);
- addButton.reset();
- }
-
- function onFileSelected() {
- if(addButton.domNode.children[0].files) {
- addButton.set("disabled", true);
- var file = addButton.domNode.children[0].files[0];
- var fileReader = new FileReader();
- fileReader.onload = function (evt) {
- var result = fileReader.result;
- if(result.indexOf("-----BEGIN CERTIFICATE-----") != -1) {
- uploadCertificate(result);
-
- } else {
- fileReader.onload = function (evt) {
- var binresult = fileReader.result;
- binresult = binresult.substring(binresult.indexOf(",")+1);
- uploadCertificate(binresult);
- };
- fileReader.readAsDataURL(file);
- }
- };
- fileReader.readAsText(file);
- }
- }
-
- if( window.FileReader ) {
- this.addButton.on("change", onFileSelected);
- } else {
- this.addButton.set("disabled", true);
- this.addButton.domNode.style.display = "none";
- }
-
- }
-
- ManagedCertificateStore.prototype.removeCertificates = function ()
- {
- var data = this.certificatesGrid.grid.selection.getSelected();
-
- if(data.length)
- {
- var parentModelObj = this.modelObj;
- var modelObj = {type: parentModelObj.type, name: "removeCertificates", parent: parentModelObj};
- var items = [];
- for(var i = 0; i < data.length; i++)
- {
- var parts = data[i].id.split("|");
- items.push({ issuerName: parts[1], serialNumber: parts[0] });
- }
- var url = this.management.buildObjectURL(modelObj);
- this.management.post({url: url}, {certificates: items});
- }
- };
-
-
- ManagedCertificateStore.prototype.update = function(data)
- {
- util.updateUI(data, this.fields, this);
- this.certificates = addIdToCertificates(data);
- this.certificatesGrid.update(this.certificates)
- };
-
- return ManagedCertificateStore;
- }
-);
+ "dojo/domReady!"], function (query, lang, util, EnhancedGrid, UpdatableStore, registry)
+ {
+ function addIdToCertificates(obj)
+ {
+ var certItems = [];
+ var certDetails = obj.certificateDetails;
+ for (var idx in certDetails)
+ {
+ var item = lang.mixin(certDetails[idx],
+ {id: certDetails[idx].serialNumber + '|' + certDetails[idx].issuerName});
+ certItems.push(item);
+ }
+ return certItems;
+ }
+
+ function ManagedCertificateStore(data)
+ {
+ this.fields = [];
+ this.management = data.parent.management;
+ this.modelObj = data.parent.modelObj;
+ var containerNode = data.containerNode;
+ var attributes = this.management.metadata.getMetaData("TrustStore",
+ "ManagedCertificateStore").attributes;
+ for (var name in attributes)
+ {
+ this.fields.push(name);
+ }
+ var that = this;
+ var gridProperties = {
+ height: 400,
+ selectionMode: "extended",
+ plugins: {
+ indirectSelection: true,
+ pagination: {
+ pageSizes: [10, 25, 50, 100],
+ description: true,
+ sizeSwitch: true,
+ pageStepper: true,
+ gotoButton: true,
+ maxPageStep: 4,
+ position: "bottom"
+ }
+ }
+ };
+
+ util.buildUI(data.containerNode,
+ data.parent,
+ "store/managedcertificatestore/show.html",
+ this.fields,
+ this,
+ function ()
+ {
+ that.certificates = addIdToCertificates(that);
+ that.certificatesGrid = new UpdatableStore(that.certificates, query(
+ ".managedCertificatesGrid",
+ containerNode)[0], [{
+ name: "Subject Name",
+ field: "subjectName",
+ width: "25%"
+ },
+ {
+ name: "Issuer Name",
+ field: "issuerName",
+ width: "25%"
+ },
+ {
+ name: "Serial #",
+ field: "serialNumber",
+ width: "10%"
+ },
+ {
+ name: "Valid From",
+ field: "validFrom",
+ width: "20%",
+ formatter: function (val)
+ {
+ return that.management.userPreferences.formatDateTime(val,
+ {
+ addOffset: true,
+ appendTimeZone: true
+ });
+ }
+ },
+ {
+ name: "Valid Until",
+ field: "validUntil",
+ width: "20%",
+ formatter: function (val)
+ {
+ return that.management.userPreferences.formatDateTime(val,
+ {
+ addOffset: true,
+ appendTimeZone: true
+ });
+ }
+ }], null, gridProperties, EnhancedGrid);
+ });
+
+ this.removeButton = registry.byNode(query(".removeCertificates", containerNode)[0]);
+ this.removeButton.on("click", function (e)
+ {
+ that.removeCertificates()
+ });
+
+ this.addButton = registry.byNode(query(".addCertificate", containerNode)[0]);
+ var addButton = this.addButton;
+ var that = this;
+
+ function uploadCertificate(cert)
+ {
+ var parentModelObj = that.modelObj;
+ var modelObj = {
+ type: parentModelObj.type,
+ name: "addCertificate",
+ parent: parentModelObj
+ };
+ var url = that.management.buildObjectURL(modelObj);
+
+ that.management.post({url: url}, {certificate: cert}).then(uploadComplete, uploadError);
+ }
+
+ function uploadComplete()
+ {
+ addButton.set("disabled", false);
+ addButton.reset();
+ }
+
+ function uploadError(error)
+ {
+ that.management.errorHandler(error);
+ addButton.set("disabled", false);
+ addButton.reset();
+ }
+
+ function onFileSelected()
+ {
+ if (addButton.domNode.children[0].files)
+ {
+ addButton.set("disabled", true);
+ var file = addButton.domNode.children[0].files[0];
+ var fileReader = new FileReader();
+ fileReader.onload = function (evt)
+ {
+ var result = fileReader.result;
+ if (result.indexOf("-----BEGIN CERTIFICATE-----") != -1)
+ {
+ uploadCertificate(result);
+
+ }
+ else
+ {
+ fileReader.onload = function (evt)
+ {
+ var binresult = fileReader.result;
+ binresult = binresult.substring(binresult.indexOf(",") + 1);
+ uploadCertificate(binresult);
+ };
+ fileReader.readAsDataURL(file);
+ }
+ };
+ fileReader.readAsText(file);
+ }
+ }
+
+ if (window.FileReader)
+ {
+ this.addButton.on("change", onFileSelected);
+ }
+ else
+ {
+ this.addButton.set("disabled", true);
+ this.addButton.domNode.style.display = "none";
+ }
+
+ }
+
+ ManagedCertificateStore.prototype.removeCertificates = function ()
+ {
+ var data = this.certificatesGrid.grid.selection.getSelected();
+
+ if (data.length)
+ {
+ var parentModelObj = this.modelObj;
+ var modelObj = {
+ type: parentModelObj.type,
+ name: "removeCertificates",
+ parent: parentModelObj
+ };
+ var items = [];
+ for (var i = 0; i < data.length; i++)
+ {
+ var parts = data[i].id.split("|");
+ items.push({
+ issuerName: parts[1],
+ serialNumber: parts[0]
+ });
+ }
+ var url = this.management.buildObjectURL(modelObj);
+ this.management.post({url: url}, {certificates: items});
+ }
+ };
+
+ ManagedCertificateStore.prototype.update = function (data)
+ {
+ util.updateUI(data, this.fields, this);
+ this.certificates = addIdToCertificates(data);
+ this.certificatesGrid.update(this.certificates)
+ };
+
+ return ManagedCertificateStore;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js Fri Apr 29 11:04:40 2016
@@ -26,77 +26,82 @@ define(["dojo/dom",
"dojo/parser",
"dojo/text!store/nonjavakeystore/add.html",
"qpid/common/ResourceWidget",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addKeyStore =
- {
- show: function(data)
- {
- var that=this;
- this.metadata=data.metadata;
- this.containerNode = data.containerNode;
- data.containerNode.innerHTML = template;
- parser.parse(this.containerNode).then(function(instances)
- {
- that.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addKeyStore = {
+ show: function (data)
+ {
+ var that = this;
+ this.metadata = data.metadata;
+ this.containerNode = data.containerNode;
+ data.containerNode.innerHTML = template;
+ parser.parse(this.containerNode).then(function (instances)
+ {
+ that.keyStoreOldBrowserWarning =
+ dom.byId("addStore.oldBrowserWarning");
- if (!window.FileReader)
- {
- that.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
- that.keyStoreOldBrowserWarning.className = that.keyStoreOldBrowserWarning.className.replace("hidden", "");
- }
+ if (!window.FileReader)
+ {
+ that.keyStoreOldBrowserWarning.innerHTML =
+ "File upload requires a more recent browser with HTML5 support";
+ that.keyStoreOldBrowserWarning.className =
+ that.keyStoreOldBrowserWarning.className.replace(
+ "hidden",
+ "");
+ }
- if (data.effectiveData)
- {
- that.update(data.effectiveData);
- }
+ if (data.effectiveData)
+ {
+ that.update(data.effectiveData);
+ }
- util.applyMetadataToWidgets(data.containerNode, "KeyStore", "NonJavaKeyStore", data.metadata);
- });
- },
- update: function(effectiveData)
- {
- var attributes = this.metadata.getMetaData("KeyStore", "NonJavaKeyStore").attributes;
- var widgets = registry.findWidgets(this.containerNode);
- array.forEach(widgets, function(item)
- {
- var name = item.id.replace("addStore.","");
- if (name in attributes )
- {
- var attribute = attributes[name];
- var value = effectiveData[name];
- if (value)
- {
- if (attribute.secure)
- {
- if (!/^\*+/.test(value) )
- {
- item.set("value", value);
- }
- else
- {
- item.set("required", false);
- if (name == "privateKeyUrl")
- {
- item.set("uploaded", true)
- }
- else
- {
- item.set("placeHolder", value);
- }
- }
- }
- else
- {
- item.set("value", value);
- }
- }
- }
- });
- }
- };
+ util.applyMetadataToWidgets(data.containerNode,
+ "KeyStore",
+ "NonJavaKeyStore",
+ data.metadata);
+ });
+ },
+ update: function (effectiveData)
+ {
+ var attributes = this.metadata.getMetaData("KeyStore", "NonJavaKeyStore").attributes;
+ var widgets = registry.findWidgets(this.containerNode);
+ array.forEach(widgets, function (item)
+ {
+ var name = item.id.replace("addStore.", "");
+ if (name in attributes)
+ {
+ var attribute = attributes[name];
+ var value = effectiveData[name];
+ if (value)
+ {
+ if (attribute.secure)
+ {
+ if (!/^\*+/.test(value))
+ {
+ item.set("value", value);
+ }
+ else
+ {
+ item.set("required", false);
+ if (name == "privateKeyUrl")
+ {
+ item.set("uploaded", true)
+ }
+ else
+ {
+ item.set("placeHolder", value);
+ }
+ }
+ }
+ else
+ {
+ item.set("value", value);
+ }
+ }
+ }
+ });
+ }
+ };
- return addKeyStore;
- }
-);
+ return addKeyStore;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js Fri Apr 29 11:04:40 2016
@@ -17,30 +17,35 @@
* under the License.
*/
-define(["qpid/common/util", "dojox/html/entities", "dojo/domReady!"],
- function (util, entities)
- {
+define(["qpid/common/util", "dojox/html/entities", "dojo/domReady!"], function (util, entities)
+{
function NonJavaKeyStore(data)
{
var that = this;
this.fields = [];
this.management = data.parent.management;
- this.dateTimeFormatter = function(value){ return value ? that.management.userPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true}) : "";};
+ this.dateTimeFormatter = function (value)
+ {
+ return value ? that.management.userPreferences.formatDateTime(value,
+ {
+ addOffset: true,
+ appendTimeZone: true
+ }) : "";
+ };
var attributes = this.management.metadata.getMetaData("KeyStore", "NonJavaKeyStore").attributes;
- for(var name in attributes)
+ for (var name in attributes)
{
- this.fields.push(name);
+ this.fields.push(name);
}
util.buildUI(data.containerNode, data.parent, "store/nonjavakeystore/show.html", this.fields, this);
}
- NonJavaKeyStore.prototype.update = function(data)
+ NonJavaKeyStore.prototype.update = function (data)
{
util.updateUI(data, this.fields, this, {datetime: this.dateTimeFormatter});
}
return NonJavaKeyStore;
- }
-);
+});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js Fri Apr 29 11:04:40 2016
@@ -25,70 +25,75 @@ define(["dojo/dom",
"qpid/common/util",
"dojo/parser",
"dojo/text!store/nonjavatruststore/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addKeyStore =
- {
- show: function(data)
- {
- var that=this;
- this.metadata = data.metadata
- this.containerNode = data.containerNode;
- data.containerNode.innerHTML = template;
- parser.parse(this.containerNode).then(function(instances)
- {
- that.keyStoreOldBrowserWarning = dom.byId("addStore.oldBrowserWarning");
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addKeyStore = {
+ show: function (data)
+ {
+ var that = this;
+ this.metadata = data.metadata
+ this.containerNode = data.containerNode;
+ data.containerNode.innerHTML = template;
+ parser.parse(this.containerNode).then(function (instances)
+ {
+ that.keyStoreOldBrowserWarning =
+ dom.byId("addStore.oldBrowserWarning");
- if (!window.FileReader)
- {
- that.keyStoreOldBrowserWarning.innerHTML = "File upload requires a more recent browser with HTML5 support";
- that.keyStoreOldBrowserWarning.className = that.keyStoreOldBrowserWarning.className.replace("hidden", "");
- }
+ if (!window.FileReader)
+ {
+ that.keyStoreOldBrowserWarning.innerHTML =
+ "File upload requires a more recent browser with HTML5 support";
+ that.keyStoreOldBrowserWarning.className =
+ that.keyStoreOldBrowserWarning.className.replace(
+ "hidden",
+ "");
+ }
- if (data.effectiveData)
- {
- that.update(data.effectiveData);
- }
+ if (data.effectiveData)
+ {
+ that.update(data.effectiveData);
+ }
- util.applyMetadataToWidgets(data.containerNode, "TrustStore", "NonJavaTrustStore", data.metadata);
- });
- },
- update: function(effectiveData)
- {
- var attributes = this.metadata.getMetaData("TrustStore", "NonJavaTrustStore").attributes;
- var widgets = registry.findWidgets(this.containerNode);
- array.forEach(widgets, function(item)
- {
- var name = item.id.replace("addStore.","");
- if (name in attributes )
- {
- var attribute = attributes[name];
- var value = effectiveData[name];
- if (value)
- {
- if (attribute.secure)
- {
- if (!/^\*+/.test(value) )
- {
- item.set("value", value);
- }
- else
- {
- item.set("placeHolder", value);
- item.set("required", false);
- }
- }
- else
- {
- item.set("value", value);
- }
- }
- }
- });
- }
- };
+ util.applyMetadataToWidgets(data.containerNode,
+ "TrustStore",
+ "NonJavaTrustStore",
+ data.metadata);
+ });
+ },
+ update: function (effectiveData)
+ {
+ var attributes = this.metadata.getMetaData("TrustStore", "NonJavaTrustStore").attributes;
+ var widgets = registry.findWidgets(this.containerNode);
+ array.forEach(widgets, function (item)
+ {
+ var name = item.id.replace("addStore.", "");
+ if (name in attributes)
+ {
+ var attribute = attributes[name];
+ var value = effectiveData[name];
+ if (value)
+ {
+ if (attribute.secure)
+ {
+ if (!/^\*+/.test(value))
+ {
+ item.set("value", value);
+ }
+ else
+ {
+ item.set("placeHolder", value);
+ item.set("required", false);
+ }
+ }
+ else
+ {
+ item.set("value", value);
+ }
+ }
+ }
+ });
+ }
+ };
- return addKeyStore;
- }
-);
+ return addKeyStore;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/show.js Fri Apr 29 11:04:40 2016
@@ -17,53 +17,75 @@
* under the License.
*/
-define(["dojo/query",
- "qpid/common/util",
- "dojox/grid/DataGrid",
- "qpid/common/UpdatableStore",
- "dojo/domReady!"],
- function (query, util, DataGrid, UpdatableStore)
- {
+define(["dojo/query", "qpid/common/util", "dojox/grid/DataGrid", "qpid/common/UpdatableStore", "dojo/domReady!"],
+ function (query, util, DataGrid, UpdatableStore)
+ {
+ function NonJavaTrustStore(data)
+ {
+ this.fields = [];
+ this.management = data.parent.management;
+ var attributes = this.management.metadata.getMetaData("TrustStore", "NonJavaTrustStore").attributes;
+ for (var name in attributes)
+ {
+ this.fields.push(name);
+ }
+ var that = this;
+ util.buildUI(data.containerNode,
+ data.parent,
+ "store/nonjavatruststore/show.html",
+ this.fields,
+ this,
+ function ()
+ {
+ var gridNode = query(".details", data.containerNode)[0];
+ var dateTimeFormatter = function (value)
+ {
+ return value ? that.management.userPreferences.formatDateTime(value,
+ {
+ addOffset: true,
+ appendTimeZone: true
+ }) : "";
+ };
+ that.detailsGrid = new UpdatableStore([], gridNode, [{
+ name: 'Subject',
+ field: 'SUBJECT_NAME',
+ width: '25%'
+ },
+ {
+ name: 'Issuer',
+ field: 'ISSUER_NAME',
+ width: '25%'
+ },
+ {
+ name: 'Valid from',
+ field: 'VALID_START',
+ width: '25%',
+ formatter: dateTimeFormatter
+ },
+ {
+ name: 'Valid to',
+ field: 'VALID_END',
+ width: '25%',
+ formatter: dateTimeFormatter
+ }]);
+ });
+ }
- function NonJavaTrustStore(data)
- {
- this.fields = [];
- this.management = data.parent.management;
- var attributes = this.management.metadata.getMetaData("TrustStore", "NonJavaTrustStore").attributes;
- for(var name in attributes)
- {
- this.fields.push(name);
- }
- var that = this;
- util.buildUI(data.containerNode, data.parent, "store/nonjavatruststore/show.html", this.fields, this, function()
- {
- var gridNode = query(".details", data.containerNode)[0];
- var dateTimeFormatter = function(value){ return value ? that.management.userPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true}) : "";};
- that.detailsGrid = new UpdatableStore([],
- gridNode,
- [
- { name: 'Subject', field: 'SUBJECT_NAME', width: '25%' },
- { name: 'Issuer', field: 'ISSUER_NAME', width: '25%' },
- { name: 'Valid from', field: 'VALID_START', width: '25%', formatter: dateTimeFormatter },
- { name: 'Valid to', field: 'VALID_END', width: '25%', formatter: dateTimeFormatter}
- ]);
- });
- }
+ NonJavaTrustStore.prototype.update = function (data)
+ {
+ util.updateUI(data, this.fields, this);
+ var details = data.certificateDetails;
+ for (var i = 0; i < details.length; i++)
+ {
+ details[i].id =
+ details[i].SUBJECT_NAME + "_" + details[i].ISSUER_NAME + "_" + details[i].VALID_START + "_"
+ + details[i].VALID_END;
+ }
+ this.detailsGrid.grid.beginUpdate();
+ this.detailsGrid.update(details);
+ this.detailsGrid.grid.endUpdate();
+ }
- NonJavaTrustStore.prototype.update = function(data)
- {
- util.updateUI(data, this.fields, this);
- var details = data.certificateDetails;
- for(var i=0; i < details.length; i++)
- {
- details[i].id = details[i].SUBJECT_NAME + "_" + details[i].ISSUER_NAME + "_" + details[i].VALID_START + "_" + details[i].VALID_END;
- }
- this.detailsGrid.grid.beginUpdate();
- this.detailsGrid.update(details);
- this.detailsGrid.grid.endUpdate();
- }
-
- return NonJavaTrustStore;
- }
-);
+ return NonJavaTrustStore;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/add.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/add.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/add.js Fri Apr 29 11:04:40 2016
@@ -25,67 +25,70 @@ define(["dojo/dom",
"qpid/common/util",
"dojo/parser",
"dojo/text!store/sitespecifictruststore/add.html",
- "dojo/domReady!"],
- function (dom, query, array, registry, util, parser, template)
- {
- var addKeyStore =
- {
- show: function(data)
- {
- var that=this;
- this.metadata = data.metadata
- this.containerNode = data.containerNode;
- data.containerNode.innerHTML = template;
- parser.parse(this.containerNode).then(function(instances)
- {
+ "dojo/domReady!"], function (dom, query, array, registry, util, parser, template)
+ {
+ var addKeyStore = {
+ show: function (data)
+ {
+ var that = this;
+ this.metadata = data.metadata
+ this.containerNode = data.containerNode;
+ data.containerNode.innerHTML = template;
+ parser.parse(this.containerNode).then(function (instances)
+ {
- if (data.effectiveData)
- {
- that.update(data.effectiveData);
- }
+ if (data.effectiveData)
+ {
+ that.update(data.effectiveData);
+ }
- util.applyMetadataToWidgets(data.containerNode, "TrustStore", "SiteSpecificTrustStore", data.metadata);
- if (data.effectiveData)
- {
- util.disableWidgetsForImmutableFields(data.containerNode, "TrustStore", "SiteSpecificTrustStore", data.metadata);
- }
- });
- },
- update: function(effectiveData)
- {
- var attributes = this.metadata.getMetaData("TrustStore", "SiteSpecificTrustStore").attributes;
- var widgets = registry.findWidgets(this.containerNode);
- array.forEach(widgets, function(item)
- {
- var name = item.id.replace("addStore.","");
- if (name in attributes )
- {
- var attribute = attributes[name];
- var value = effectiveData[name];
- if (value)
- {
- if (attribute.secure)
- {
- if (!/^\*+/.test(value) )
- {
- item.set("value", value);
- }
- else
- {
- item.set("placeHolder", value);
- item.set("required", false);
- }
- }
- else
- {
- item.set("value", value);
- }
- }
- }
- });
- }
- };
+ util.applyMetadataToWidgets(data.containerNode,
+ "TrustStore",
+ "SiteSpecificTrustStore",
+ data.metadata);
+ if (data.effectiveData)
+ {
+ util.disableWidgetsForImmutableFields(data.containerNode,
+ "TrustStore",
+ "SiteSpecificTrustStore",
+ data.metadata);
+ }
+ });
+ },
+ update: function (effectiveData)
+ {
+ var attributes = this.metadata.getMetaData("TrustStore", "SiteSpecificTrustStore").attributes;
+ var widgets = registry.findWidgets(this.containerNode);
+ array.forEach(widgets, function (item)
+ {
+ var name = item.id.replace("addStore.", "");
+ if (name in attributes)
+ {
+ var attribute = attributes[name];
+ var value = effectiveData[name];
+ if (value)
+ {
+ if (attribute.secure)
+ {
+ if (!/^\*+/.test(value))
+ {
+ item.set("value", value);
+ }
+ else
+ {
+ item.set("placeHolder", value);
+ item.set("required", false);
+ }
+ }
+ else
+ {
+ item.set("value", value);
+ }
+ }
+ }
+ });
+ }
+ };
- return addKeyStore;
- }
-);
+ return addKeyStore;
+ });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js?rev=1741609&r1=1741608&r2=1741609&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/sitespecifictruststore/show.js Fri Apr 29 11:04:40 2016
@@ -17,34 +17,39 @@
* under the License.
*/
-define(["dojo/query",
- "qpid/common/util",
- "dojox/grid/DataGrid",
- "qpid/common/UpdatableStore",
- "dojo/domReady!"],
- function (query, util, DataGrid, UpdatableStore)
- {
+define(["dojo/query", "qpid/common/util", "dojox/grid/DataGrid", "qpid/common/UpdatableStore", "dojo/domReady!"],
+ function (query, util, DataGrid, UpdatableStore)
+ {
+ function SiteSpecificTrustStore(data)
+ {
+ var that = this;
+ this.fields = [];
+ this.management = data.parent.management;
+ this.dateTimeFormatter = function (value)
+ {
+ return value ? that.management.userPreferences.formatDateTime(value,
+ {
+ addOffset: true,
+ appendTimeZone: true
+ }) : "";
+ };
+ var attributes = this.management.metadata.getMetaData("TrustStore", "SiteSpecificTrustStore").attributes;
+ for (var name in attributes)
+ {
+ this.fields.push(name);
+ }
+ util.buildUI(data.containerNode,
+ data.parent,
+ "store/sitespecifictruststore/show.html",
+ this.fields,
+ this);
+ }
- function SiteSpecificTrustStore(data)
- {
- var that = this;
- this.fields = [];
- this.management = data.parent.management;
- this.dateTimeFormatter = function(value){ return value ? that.management.userPreferences.formatDateTime(value, {addOffset: true, appendTimeZone: true}) : "";};
- var attributes = this.management.metadata.getMetaData("TrustStore", "SiteSpecificTrustStore").attributes;
- for(var name in attributes)
- {
- this.fields.push(name);
- }
- util.buildUI(data.containerNode, data.parent, "store/sitespecifictruststore/show.html", this.fields, this);
- }
+ SiteSpecificTrustStore.prototype.update = function (data)
+ {
+ util.updateUI(data, this.fields, this, {datetime: this.dateTimeFormatter});
+ }
- SiteSpecificTrustStore.prototype.update = function(data)
- {
- util.updateUI(data, this.fields, this, {datetime: this.dateTimeFormatter});
- }
-
- return SiteSpecificTrustStore;
- }
-);
+ return SiteSpecificTrustStore;
+ });
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org