From 0f1feb11d7cbbe40de10a680eb22b28918608615 Mon Sep 17 00:00:00 2001
From: Alex Rudyy <orudyy@apache.org>
Date: Thu, 5 Feb 2015 22:53:16 +0000
Subject: 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
---
 .../src/main/java/resources/store/filekeystore/add.html               | 4 ++--
 .../src/main/java/resources/store/filetruststore/add.html             | 4 ++--
 .../src/main/java/resources/store/filetruststore/show.html            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'qpid/java/broker-plugins')

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>
-- 
cgit v1.2.1