summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/derby-store/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/broker-plugins/derby-store/src/main/java')
-rw-r--r--qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java2
-rw-r--r--qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java2
-rw-r--r--qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html4
3 files changed, 3 insertions, 5 deletions
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>