summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/management-http
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2015-02-05 22:53:16 +0000
committerAlex Rudyy <orudyy@apache.org>2015-02-05 22:53:16 +0000
commit0f1feb11d7cbbe40de10a680eb22b28918608615 (patch)
treec26efb56e1cfcead60de40531c922b5e186ef2cb /qpid/java/broker-plugins/management-http
parentd3f445a199c0ed050bd4fa4bc00f331111a7a64d (diff)
downloadqpid-python-0f1feb11d7cbbe40de10a680eb22b28918608615.tar.gz
QPID-6364: Add a secure attribute 'storeUrl' into Keystore for specifying store content location and make attribute 'path' derived. Rename Trsuststore attribute 'path' into 'storeUrl' for consistency.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1657708 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-http')
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html4
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html4
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html4
3 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
index 2356accbd4..676ae4007b 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filekeystore/add.html
@@ -22,10 +22,10 @@
<div class="clear">
<div id="addStore.serverPathLabel" class="formLabel-labelCell tableContainer-labelCell">Server path or upload*:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
- <input type="text" id="addStore.path"
+ <input type="text" id="addStore.storeUrl"
data-dojo-type="qpid/common/ResourceWidget"
data-dojo-props="
- name: 'path',
+ name: 'storeUrl',
placeHolder: 'key store file server path',
required: true,
promptMessage: 'Location of the key store file on the server',
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html
index 4fbf9f953a..15b1692300 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/add.html
@@ -22,10 +22,10 @@
<div class="clear">
<div id="addStore.serverPathLabel" class="formLabel-labelCell tableContainer-labelCell">Server path or upload*:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
- <input type="text" id="addStore.path"
+ <input type="text" id="addStore.storeUrl"
data-dojo-type="qpid/common/ResourceWidget"
data-dojo-props="
- name: 'path',
+ name: 'storeUrl',
placeHolder: 'trust store file server path',
required: true,
promptMessage: 'Location of the trust store file on the server',
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html
index 1c3744b83c..99190d1f90 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/store/filetruststore/show.html
@@ -19,8 +19,8 @@
<div>
<div class="clear">
- <div class="formLabel-labelCell">Path:</div>
- <div ><span class="path" ></span></div>
+ <div class="formLabel-labelCell">Store Url:</div>
+ <div ><span class="storeUrl" ></span></div>
</div>
<div class="clear">
<div class="formLabel-labelCell">Peers only:</div>