From 7d193fef0a947cb71e8f9de93d90f26d4f11ca2d Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Mon, 11 Aug 2014 16:55:15 +0000
Subject: QPID-5988: [Java Broker] Default VHN/VH store paths to path location
 based on QPID_WORK

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1617325 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java    | 2 +-
 .../qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java       | 2 +-
 .../src/main/java/resources/virtualhostnode/derby/add.html            | 4 +---
 .../src/main/java/resources/virtualhost/sizemonitoring/add.html       | 4 +---
 .../src/main/java/resources/virtualhost/sizemonitoring/edit.html      | 4 +---
 .../src/main/java/resources/virtualhostnode/filebased/edit.html       | 4 +---
 .../src/main/java/resources/virtualhostnode/json/add.html             | 4 +---
 7 files changed, 7 insertions(+), 17 deletions(-)

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

diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
index 9411d7906d..4935d5e707 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
@@ -29,7 +29,7 @@ public interface DerbyVirtualHost<X extends DerbyVirtualHost<X>> extends Virtual
 {
     String STORE_PATH = "storePath";
 
-    @ManagedAttribute(mandatory = true)
+    @ManagedAttribute(mandatory = true, defaultValue = "${qpid.work_dir}${file.separator}${this:name}${file.separator}messages")
     String getStorePath();
 
     @ManagedAttribute(mandatory = true, defaultValue = "0")
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
index 3b31f4e7e0..81a9167924 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
@@ -26,6 +26,6 @@ public interface DerbyVirtualHostNode<X extends DerbyVirtualHostNode<X>> extends
 {
     String STORE_PATH = "storePath";
 
-    @ManagedAttribute(mandatory = true)
+    @ManagedAttribute(mandatory = true, defaultValue = "${qpid.work_dir}${file.separator}${this:name}${file.separator}config")
     String getStorePath();
 }
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
index fa4f0d64f1..0ec1e89c24 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html
@@ -20,15 +20,13 @@
  -->
 <div>
     <div class="clear">
-      <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div>
+      <div class="formLabel-labelCell tableContainer-labelCell">Store path:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.storePath"
                           data-dojo-type="dijit/form/ValidationTextBox"
                           data-dojo-props="
                               name: 'storePath',
                               placeHolder: 'path/to/store',
-                              required: true,
-                              missingMessage: 'Store path must be supplied',
                               title: 'Enter store path'" />
       </div>
     </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
index 7cf789e520..88ca0b3807 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html
@@ -19,15 +19,13 @@
 
 <div>
     <div class="clear">
-        <div class="formLabel-labelCell tableContainer-labelCell">Message store path*:</div>
+        <div class="formLabel-labelCell tableContainer-labelCell">Message store path:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="addVirtualHost.storePath"
                    data-dojo-type="dijit/form/ValidationTextBox"
                    data-dojo-props="
                               name: 'storePath',
                               placeHolder: 'path/to/store',
-                              required: true,
-                              missingMessage: 'Store path must be supplied',
                               title: 'Enter message store path'" />
         </div>
     </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html
index 9e240a83c4..60b8faef56 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/edit.html
@@ -20,15 +20,13 @@
 <div>
 
     <div class="clear">
-        <div class="formLabel-labelCell tableContainer-labelCell">Message store path*:</div>
+        <div class="formLabel-labelCell tableContainer-labelCell">Message store path:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="editVirtualHost.storePath"
                    data-dojo-type="dijit/form/ValidationTextBox"
                    data-dojo-props="
                               name: 'storePath',
                               placeHolder: 'path/to/store',
-                              required: true,
-                              missingMessage: 'Store path must be supplied',
                               disabled: true,
                               title: 'Enter message store path'" />
         </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html
index a132444268..2f0d72fe9a 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/filebased/edit.html
@@ -20,15 +20,13 @@
 <div>
 
     <div class="clear">
-        <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path*:</div>
+        <div class="formLabel-labelCell tableContainer-labelCell">Configuration store path:</div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <input type="text" id="editVirtualHostNode.storePath"
                    data-dojo-type="dijit/form/ValidationTextBox"
                    data-dojo-props="
                               name: 'storePath',
                               placeHolder: 'path/to/store',
-                              required: true,
-                              missingMessage: 'Store path must be supplied',
                               title: 'Enter configuration store path'" />
         </div>
     </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
index 622eb17b63..ec3ef79fa0 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html
@@ -20,15 +20,13 @@
  -->
 <div>
     <div class="clear">
-      <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div>
+      <div class="formLabel-labelCell tableContainer-labelCell">Store path:</div>
       <div class="formLabel-controlCell tableContainer-valueCell">
           <input type="text" id="addVirtualHostNode.jsonStorePath"
                           data-dojo-type="dijit/form/ValidationTextBox"
                           data-dojo-props="
                               name: 'storePath',
                               placeHolder: 'path/to/store',
-                              required: true,
-                              missingMessage: 'Store path must be supplied',
                               title: 'Enter store path'" />
       </div>
     </div>
-- 
cgit v1.2.1