Updates to config for different environments

2026-04-20 00:01:51 +08:00 · 2015-11-02 20:36:50 +00:00 · 2015-11-02 20:36:50 +00:00 · f55fcded37
commit f55fcded37
parent 0e3fdfedf0
6 changed files with 9 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -33,4 +33,6 @@ overridedb.*
 .idea
 .DS_Store
 .factorypath
-davos.log
+davos.log
+src/main/resources/application.properties
+src/main/resources/log4j2.xml
--- a/build.gradle
+++ b/build.gradle
@ -93,8 +93,11 @@ task updateBuildVersion << {

 task copyConfig(type: Copy) {
 	
-	from 'conf/app/application.${env}.properties'
-	from 'conf/app/log4j2.${env}.xml'
+	def location = project.hasProperty('env') ? "$env" : 'local'
 	
-	to 'src/main/resources/'
+	from "conf/${location}"
+	into "src/main/resources/"
 }
+
+build.dependsOn copyConfig
+build.mustRunAfter copyConfig
--- a/conf/app/application.local.properties
+++ b/conf/app/application.local.properties
--- a/conf/logging/log4j2.local.xml
+++ b/conf/logging/log4j2.local.xml
--- a/conf/app/application.release.properties
+++ b/conf/app/application.release.properties
--- a/conf/logging/log4j2.release.xml
+++ b/conf/logging/log4j2.release.xml