Author: orudyy
Date: Fri Jan 30 16:49:59 2015
New Revision: 1656055
URL: http://svn.apache.org/r1656055
Log:
QPID-6346: Display subject and certificate validity period for non java
keystores
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js?rev=1656055&r1=1656054&r2=1656055&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/show.js
Fri Jan 30 16:49:59 2015
@@ -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;
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html?rev=1656055&r1=1656054&r2=1656055&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/store/nonjavakeystore/show.html
Fri Jan 30 16:49:59 2015
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
