diff options
| author | Keith Wall <kwall@apache.org> | 2014-08-11 16:55:15 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-08-11 16:55:15 +0000 |
| commit | 7d193fef0a947cb71e8f9de93d90f26d4f11ca2d (patch) | |
| tree | 2f59930e9adca2331e7c0455326005951aba6356 /qpid/java/broker-core | |
| parent | 19d06780b7d15bd68d7f451ede011adf40cbf381 (diff) | |
| download | qpid-python-7d193fef0a947cb71e8f9de93d90f26d4f11ca2d.tar.gz | |
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
Diffstat (limited to 'qpid/java/broker-core')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java | 2 | ||||
| -rw-r--r-- | qpid/java/broker-core/src/main/resources/initial-config.json | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java index 34a18c884f..58fd8d73d0 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java @@ -26,6 +26,6 @@ public interface JsonVirtualHostNode<X extends JsonVirtualHostNode<X>> extends o 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-core/src/main/resources/initial-config.json b/qpid/java/broker-core/src/main/resources/initial-config.json index 74aedd14af..9f1f779559 100644 --- a/qpid/java/broker-core/src/main/resources/initial-config.json +++ b/qpid/java/broker-core/src/main/resources/initial-config.json @@ -55,9 +55,8 @@ "virtualhostnodes" : [ { "name" : "default", "type" : "JSON", - "storePath" : "${qpid.work_dir}${file.separator}default${file.separator}config", "context" : { - "virtualhostBlueprint" : "{ \"type\" : \"DERBY\", \"storePath\" : \"${json:qpid.work_dir}${json:file.separator}default${json:file.separator}messages\" }" + "virtualhostBlueprint" : "{ \"type\" : \"DERBY\" }" } } ], "plugins" : [ { |