QPID-5918: [Java Broker] Use the interpolation of file.separator to build paths within Broker's initial-config

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1613056 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 9 insertions, 9 deletions

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 5922ba0319..74aedd14af 100644
--- a/qpid/java/broker-core/src/main/resources/initial-config.json
+++ b/qpid/java/broker-core/src/main/resources/initial-config.json
@@ -26,11 +26,11 @@
   "authenticationproviders" : [ {
     "name" : "passwordFile",
     "type" : "PlainPasswordFile",
-    "path" : "${qpid.home_dir}/etc/passwd",
+    "path" : "${qpid.home_dir}${file.separator}etc${file.separator}passwd",
     "preferencesproviders" : [{
         "name": "fileSystemPreferences",
         "type": "FileSystemPreferences",
-        "path" : "${qpid.work_dir}/user.preferences.json"
+        "path" : "${qpid.work_dir}${file.separator}user.preferences.json"
     }]
   } ],
   "ports" : [  {
@@ -55,9 +55,9 @@
   "virtualhostnodes" : [ {
     "name" : "default",
     "type" : "JSON",
-    "storePath" : "${qpid.work_dir}/default/config",
+    "storePath" : "${qpid.work_dir}${file.separator}default${file.separator}config",
     "context" : {
-        "virtualhostBlueprint" : "{ \"type\" : \"DERBY\", \"storePath\" : \"${json:qpid.work_dir}/default/messages\" }"
+        "virtualhostBlueprint" : "{ \"type\" : \"DERBY\", \"storePath\" : \"${json:qpid.work_dir}${json:file.separator}default${json:file.separator}messages\" }"
     }
   } ],
   "plugins" : [ {
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml
index 29a6574289..7ce629dc15 100644
--- a/qpid/java/pom.xml
+++ b/qpid/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}{json: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}{json:file.separator}${dollar.sign}{this:name}${dollar.sign}{json:file.separator}derby"}</profile.virtualhostnode.context.blueprint>
       </properties>
     </profile>
 
diff --git a/qpid/java/systests/etc/config-systests.json b/qpid/java/systests/etc/config-systests.json
index 27124de1fb..4375f258e8 100644
--- a/qpid/java/systests/etc/config-systests.json
+++ b/qpid/java/systests/etc/config-systests.json
@@ -26,16 +26,16 @@
   "authenticationproviders" : [ {
     "name" : "plain",
     "type" : "PlainPasswordFile",
-    "path" : "${QPID_HOME}/etc/passwd"
+    "path" : "${QPID_HOME}${file.separator}etc${file.separator}passwd"
   } ],
   "keystores" : [ {
     "name" : "systestsKeyStore",
-    "path" : "${QPID_HOME}/../test-profiles/test_resources/ssl/java_broker_keystore.jks",
+    "path" : "${QPID_HOME}${file.separator}..${file.separator}test-profiles${file.separator}test_resources${file.separator}ssl${file.separator}java_broker_keystore.jks",
     "password" : "password"
   } ],
   "truststores" : [ {
     "name" : "systestsTrustStore",
-    "path" : "${QPID_HOME}/../test-profiles/test_resources/ssl/java_broker_truststore.jks",
+    "path" : "${QPID_HOME}${file.separator}..${file.separator}test-profiles${file.separator}test_resources${file.separator}ssl${file.separator}java_broker_truststore.jks",
     "password" : "password"
   } ],
   "ports" : [  {
@@ -60,7 +60,7 @@
   "virtualhostnodes" : [ {
     "name" : "test",
     "type" : "${virtualhostnode.type}",
-    "storePath" : "${QPID_WORK}/${test.port}/test/config",
+    "storePath" : "${QPID_WORK}${file.separator}${test.port}${file.separator}test${file.separator}config",
     "context" : {
       "virtualhostBlueprint" : "${virtualhostnode.context.blueprint}"
     }