MOTECH-2037: Make motech directory configerable

matkwiatkowski · matkwiatkowski · commit 0cdecda3e16c · 2016-02-24T15:18:19.000+01:00
diff --git a/maven.properties b/maven.properties
@@ -4,7 +4,7 @@ motech.sql.password=password
 motech.sql.driver=com.mysql.jdbc.Driver
 motech.sql.url=jdbc:mysql://localhost:3306/
 
-motech.dir=${sys:user.home}/.motech
+motech.dir=${user.home}/.motech
 
 # Controls Which bootstrap file from testdata will be copied to ~/motech/config before ITs.
 # The file is copied from testdata/${motech.sql.dbtype}
diff --git a/platform/config-core/src/main/resources/config-locations.properties b/platform/config-core/src/main/resources/config-locations.properties
@@ -1 +1 @@
-config.location=${motech.dir}/config/, /etc/motech/, \\${motech.dir}/config/
+config.location=${sys:user.home}/.motech/config/, /etc/motech/, \\${sys:user.home}/.motech/config/
diff --git a/platform/config-core/src/test/resources/config-locations.properties b/platform/config-core/src/test/resources/config-locations.properties
@@ -1 +1 @@
-config.location=${motech.dir}/configtest, ${motech.dir}
+config.location=${sys:user.home}/.motech/configtest, ${sys:user.home}/.motech
diff --git a/platform/server-config/src/test/resources/config-locations.properties b/platform/server-config/src/test/resources/config-locations.properties
@@ -1 +1 @@
-config.location=${motech.dir}/configtest/config/, ${motech.dir}/config/, /etc/motech/
+config.location=${sys:user.home}/.motech/configtest/config/, ${sys:user.home}/.motech/config/, /etc/motech/
diff --git a/platform/server/src/test/resources/config-locations.properties b/platform/server/src/test/resources/config-locations.properties
@@ -1 +1 @@
-config.location=${motech.dir}/config/
+config.location=${sys:user.home}/.motech/config/
diff --git a/testdata/config-locations.properties b/testdata/config-locations.properties
@@ -1 +1 @@
-config.location=${motech.dir}/configtest/config/, ${motech,dir}/config/, /etc/motech/
+config.location=${sys:user.home}/.motech/configtest/config/, ${sys:user.home}/.motech/config/, /etc/motech/

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-config.location=${motech.dir}/config/, /etc/motech/, \\${motech.dir}/config/`
	`1`	`+config.location=${sys:user.home}/.motech/config/, /etc/motech/, \\${sys:user.home}/.motech/config/`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-config.location=${motech.dir}/configtest, ${motech.dir}`
	`1`	`+config.location=${sys:user.home}/.motech/configtest, ${sys:user.home}/.motech`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-config.location=${motech.dir}/config/`
	`1`	`+config.location=${sys:user.home}/.motech/config/`