diff options
| author | Alex Rudyy <orudyy@apache.org> | 2015-01-30 16:49:59 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2015-01-30 16:49:59 +0000 |
| commit | e15a326b853e12c34144e27ec313415b0a8242f9 (patch) | |
| tree | 078d3d0f696c677c826c9292e3afb809c6eb6d88 /qpid/java | |
| parent | 2e61366ced5d8126426c14ff08c7c7b38cca659b (diff) | |
| download | qpid-python-e15a326b853e12c34144e27ec313415b0a8242f9.tar.gz | |
QPID-6346: Display subject and certificate validity period for non java keystores
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1656055 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 35 insertions, 4 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js index 1985410e57..292169e93c 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js @@ -17,24 +17,43 @@ * under the License. */ -define(["qpid/common/util", "qpid/common/metadata", "dojo/domReady!"], - function (util, metadata) +define(["qpid/common/util", "qpid/common/metadata", "qpid/management/UserPreferences", "dojox/html/entities", "dojo/domReady!"], + function (util, metadata, UserPreferences, entities) { + function toDate(value) + { + return value ? entities.encode(String(UserPreferences.formatDateTime(value))) : ""; + } + + var dateFields = ["certificateValidEnd","certificateValidStart"]; + function NonJavaKeyStore(data) { this.fields = []; var attributes = metadata.getMetaData("KeyStore", "NonJavaKeyStore").attributes; for(var name in attributes) { - this.fields.push(name); + if (dateFields.indexOf(name) == -1) + { + this.fields.push(name); + } } - util.buildUI(data.containerNode, data.parent, "store/nonjavakeystore/show.html", this.fields, this); + var allFields = this.fields.concat(dateFields); + util.buildUI(data.containerNode, data.parent, "store/nonjavakeystore/show.html",allFields, this); } NonJavaKeyStore.prototype.update = function(data) { util.updateUI(data, this.fields, this); + if (data) + { + for(var idx in dateFields) + { + var name = dateFields[idx]; + this[name].innerHTML = toDate(data[name]); + } + } } return NonJavaKeyStore; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html index e0dd896d7b..51ebd06012 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html @@ -30,6 +30,18 @@ <div class="formLabel-labelCell">Intermediate Certificate:</div> <div><span class="intermediateCertificateUrl" ></span></div> </div> + <div class="clear"> + <div class="formLabel-labelCell">Subject:</div> + <div><span class="subjectName" ></span></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Certificate valid to:</div> + <div><span class="certificateValidEnd" ></span></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Certificate valid from:</div> + <div><span class="certificateValidStart" ></span></div> + </div> <div class="clear"></div> </div> |