aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-08-09 17:14:09 +0200
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-08-09 17:14:09 +0200
commit499e4e89cb68c99547df5632df358847b62ccc3f (patch)
tree0861fc21c6ef79ff4b711bd3df6e9a16b3ff19d3 /src/test
parent22bda27545153fd0b1a8f6609867699b3ee23a75 (diff)
Fix logback.xml location
The logback.xml location was not working, it was not possible to specify an external logback.xml file. Now it works from application.properties Issue-ID: CLAMP-179 Change-Id: I87c9be70561fc0897b5c6499a431f7cd788c1867 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/resources/application.properties6
-rw-r--r--src/test/resources/https/https-test.properties6
2 files changed, 11 insertions, 1 deletions
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index d9d0f0ee..acf64521 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -62,7 +62,7 @@ server.port=8080
server.servlet.context-path=/
#Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-spring-authentication,clamp-sdc-controller
+spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller
#The max number of active threads in this pool
server.tomcat.max-threads=200
@@ -108,6 +108,10 @@ async.core.pool.size=10
async.max.pool.size=20
async.queue.capacity=500
+#For EELF logback file
+#com.att.eelf.logging.path=
+com.att.eelf.logging.file=logback-default.xml
+#The log folder that will be used in logback.xml file
clamp.config.log.path=log
clamp.config.files.systemProperties=classpath:/system.properties
clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
index 853466e1..e15ea6ed 100644
--- a/src/test/resources/https/https-test.properties
+++ b/src/test/resources/https/https-test.properties
@@ -87,3 +87,9 @@ camel.defaultthreadpool.rejectpolicy=CallerRuns
camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
#camel.springboot.typeConversion = false
+
+#For EELF logback file
+#com.att.eelf.logging.path=
+com.att.eelf.logging.file=logback-default.xml
+#The log folder that will be used in logback.xml file
+clamp.config.log.path=log \ No newline at end of file