From d15fe159dfee37f209b66aa896e4b901e901b241 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Thu, 24 Jul 2014 10:02:09 +0000
Subject: 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/qpid@1613056 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker-core/src/main/resources/initial-config.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'java/broker-core/src')

diff --git a/java/broker-core/src/main/resources/initial-config.json b/java/broker-core/src/main/resources/initial-config.json
index 5922ba0319..74aedd14af 100644
--- a/java/broker-core/src/main/resources/initial-config.json
+++ b/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" : [ {
-- 
cgit v1.2.1