From 24769034a411b5e8bae445c6366db93848340cba Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Tue, 26 Feb 2019 09:42:53 +0100
Subject: [PATCH] prepare for docker build

---
 .../config/application-demo.properties        |  4 +-
 src/main/resources/logback-spring.xml         | 42 +++++++++++++++++++
 src/main/resources/logback.xml                | 20 ---------
 3 files changed, 43 insertions(+), 23 deletions(-)
 create mode 100644 src/main/resources/logback-spring.xml
 delete mode 100644 src/main/resources/logback.xml

diff --git a/src/main/resources/config/application-demo.properties b/src/main/resources/config/application-demo.properties
index 18c241ad..54366104 100644
--- a/src/main/resources/config/application-demo.properties
+++ b/src/main/resources/config/application-demo.properties
@@ -9,7 +9,6 @@ spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.platform=demo
 
 sebserver.webservice.api.admin.clientId=guiClient
-sebserver.webservice.api.admin.clientSecret=guiClient
 sebserver.webservice.api.admin.endpoint=/admin-api/v1
 sebserver.webservice.api.admin.accessTokenValiditySeconds=1800
 sebserver.webservice.api.admin.refreshTokenValiditySeconds=-1
@@ -26,7 +25,6 @@ sebserver.gui.webservice.protocol=http
 sebserver.gui.webservice.address=0.0.0.0
 sebserver.gui.webservice.port=8080
 sebserver.gui.webservice.apipath=/admin-api/v1
-
-
 sebserver.gui.theme=css/sebserver.css
+sebserver.gui.list.page.size=20
 sebserver.gui.date.displayformat=EEEE, dd MMMM yyyy - HH:mm
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 00000000..f4b4db35
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+      <encoder>
+        <pattern>%d{HH:mm:ss.SSS} %-5level [%thread]:[%logger] %msg%n</pattern>
+      </encoder>
+    </appender>
+    
+    <appender name="DEMO" class="ch.qos.logback.core.FileAppender">
+      <file> log-${byDay}.txt </file>
+      <append>true</append>
+      <encoder>
+         <pattern>%d{HH:mm:ss.SSS} %-5level [%thread]:[%logger] %msg%n</pattern>
+      </encoder>
+   </appender>
+
+  <springProfile name="dev">
+
+    <root level="INFO" additivity="true">
+      <appender-ref ref="STDOUT" />
+    </root>
+
+<!--     <Logger name="ch.ethz.seb.sebserver" level="DEBUG" additivity="true" /> -->
+<!--     <Logger name="org.mybatis.generator" level="INFO" additivity="true" /> -->
+<!--     <Logger name="org.springframework.boot" level="INFO" additivity="true" /> -->
+<!--     <Logger name="org.springframework.security" level="DEBUG" additivity="true" /> -->
+
+<!--     <Logger name="org.springframework.web" level="DEBUG" additivity="true" /> -->
+<!--     <Logger name="org.springframework.security.oauth2" level="DEBUG" additivity="true" /> -->
+
+    
+  </springProfile>
+  
+  <springProfile name="demo">
+
+    <root level="INFO" additivity="true">
+      <appender-ref ref="STDOUT" />
+    </root>
+ 
+  </springProfile>
+</configuration>
\ No newline at end of file
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
deleted file mode 100644
index ecdb6cd3..00000000
--- a/src/main/resources/logback.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false" scan="false">
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} %-5level [%thread]:[%logger] %msg%n</pattern>
-        </encoder>
-    </appender>
- 
-    <Logger name="ch.ethz.seb.sebserver" level="DEBUG" additivity="true" />
-    <Logger name="org.mybatis.generator" level="INFO" additivity="true" />
-    <Logger name="org.springframework.boot" level="INFO" additivity="true" />
-    <Logger name="org.springframework.security" level="DEBUG" additivity="true" />
-    
-    <Logger name="org.springframework.web" level="DEBUG" additivity="true" />
-    <Logger name="org.springframework.security.oauth2" level="DEBUG" additivity="true" />
-
-    <root level="INFO" additivity="true">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>
\ No newline at end of file