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/berkeleydb/BDBVirtualHost.java | 2 +-
 .../qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java    | 2 +-
 .../bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html     | 4 +---
 .../java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html  | 4 +---
 .../main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html  | 4 +---
 .../bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html | 4 +---
 6 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'qpid/java/bdbstore/src/main')

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
index 12511ad9e0..ac8d33685a 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
@@ -38,7 +38,7 @@ public interface BDBVirtualHost<X extends BDBVirtualHost<X>> extends VirtualHost
                                           Math.min(200l*1024l*1024l,
                                                    Runtime.getRuntime().maxMemory()/20l));
 
-    @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/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
index 763b59146b..61b0d1882a 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
@@ -26,6 +26,6 @@ public interface BDBVirtualHostNode<X extends BDBVirtualHostNode<X>> extends org
 {
     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/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
index f9e9d0a82f..9ce23084c5 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/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/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
index b08c734e35..820a94e754 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html
@@ -81,15 +81,13 @@
                 </div>
             </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/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
index 3d06d15d5c..1d3b2a1906 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html
@@ -45,15 +45,13 @@
       </div>
     </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/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
index c18ca34fdb..189eb6f7b6 100644
--- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
+++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
@@ -45,15 +45,13 @@
         </div>
     </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>
-- 
cgit v1.2.1