Author: kwall
Date: Tue Jul 22 10:12:46 2014
New Revision: 1612530
URL: http://svn.apache.org/r1612530
Log:
QPID-5903: Apply json escaping mechanism to virtualhost blueprints used in
initial-config.json and test-profiles
Modified:
qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json
qpid/trunk/qpid/java/pom.xml
Modified:
qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json?rev=1612530&r1=1612529&r2=1612530&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json
(original)
+++ qpid/trunk/qpid/java/broker-core/src/main/resources/initial-config.json Tue
Jul 22 10:12:46 2014
@@ -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" : [ {
Modified: qpid/trunk/qpid/java/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1612530&r1=1612529&r2=1612530&view=diff
==============================================================================
--- qpid/trunk/qpid/java/pom.xml (original)
+++ qpid/trunk/qpid/java/pom.xml Tue Jul 22 10:12:46 2014
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
