summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-07-22 10:12:46 +0000
committerKeith Wall <kwall@apache.org>2014-07-22 10:12:46 +0000
commitebc6fa08b6ee5fb693da1443285c8da7daa1d0f2 (patch)
tree58d9eaf4fef91b7fd313b65e35dbd59fbb704472 /java
parentcbc9c9f2384cd07db7a120f94f81f54e3bd303a1 (diff)
downloadqpid-python-ebc6fa08b6ee5fb693da1443285c8da7daa1d0f2.tar.gz
QPID-5903: Apply json escaping mechanism to virtualhost blueprints used in initial-config.json and test-profiles
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1612530 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/broker-core/src/main/resources/initial-config.json2
-rw-r--r--java/pom.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/broker-core/src/main/resources/initial-config.json b/java/broker-core/src/main/resources/initial-config.json
index a7c00da02e..5922ba0319 100644
--- a/java/broker-core/src/main/resources/initial-config.json
+++ b/java/broker-core/src/main/resources/initial-config.json
@@ -57,7 +57,7 @@
"type" : "JSON",
"storePath" : "${qpid.work_dir}/default/config",
"context" : {
- "virtualhostBlueprint" : "{ \"type\" : \"DERBY\", \"storePath\" : \"${qpid.work_dir}/default/messages\" }"
+ "virtualhostBlueprint" : "{ \"type\" : \"DERBY\", \"storePath\" : \"${json:qpid.work_dir}/default/messages\" }"
}
} ],
"plugins" : [ {
diff --git a/java/pom.xml b/java/pom.xml
index 3d77e8c8d0..29a6574289 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -635,7 +635,7 @@
<profile.qpid.broker_default_amqp_protocol_excludes>AMQP_1_0,AMQP_0_10</profile.qpid.broker_default_amqp_protocol_excludes>
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
- <profile.virtualhostnode.context.blueprint>{"type":"DERBY","storePath":"${dollar.sign}{QPID_WORK}/${dollar.sign}{this:name}/derby"}</profile.virtualhostnode.context.blueprint>
+ <profile.virtualhostnode.context.blueprint>{"type":"DERBY","storePath":"${dollar.sign}{json:QPID_WORK}/${dollar.sign}{this:name}/derby"}</profile.virtualhostnode.context.blueprint>
</properties>
</profile>