Added various log4j2 configurations.
Change-Id: I638d2dd0e1edd80006d0c8d476505f2bc43931e2
diff --git a/full/src/main/resources/default-config.xml b/full/src/main/resources/default-config.xml
index 0c14584..d67d911 100644
--- a/full/src/main/resources/default-config.xml
+++ b/full/src/main/resources/default-config.xml
@@ -247,13 +247,13 @@
ref="kustvakt_config" />
</bean>
- <bean id="openid_auth"
+ <!-- <bean id="openid_auth"
class="de.ids_mannheim.korap.authentication.OpenIDconnectAuthentication">
<constructor-arg type="de.ids_mannheim.korap.config.KustvaktConfiguration"
ref="kustvakt_config" />
<constructor-arg
type="de.ids_mannheim.korap.interfaces.db.PersistenceClient" ref="kustvakt_db" />
- </bean>
+ </bean> -->
<bean id="session_auth"
class="de.ids_mannheim.korap.authentication.SessionAuthentication">
@@ -271,7 +271,7 @@
<ref bean="ldap_auth" />
<ref bean="session_auth" />
<!-- <ref bean="api_auth" /> -->
- <ref bean="openid_auth" />
+ <!-- <ref bean="openid_auth" /> -->
<ref bean="oauth2_auth" />
</util:list>
diff --git a/full/src/main/resources/ehcache.xml b/full/src/main/resources/ehcache.xml
index 8cddd0e..27a4b56 100644
--- a/full/src/main/resources/ehcache.xml
+++ b/full/src/main/resources/ehcache.xml
@@ -34,8 +34,7 @@
diskSpoolBufferSizeMB="30"
diskExpiryThreadIntervalSeconds="120"
memoryStoreEvictionPolicy="LRU"
- statistics="false"/>
-
+ />
<!-- EM -->
<cache name='authorization'
diff --git a/full/src/main/resources/log4j2-debug.properties b/full/src/main/resources/log4j2-debug.properties
new file mode 100644
index 0000000..817e355
--- /dev/null
+++ b/full/src/main/resources/log4j2-debug.properties
@@ -0,0 +1,31 @@
+appenders = console, debugFile
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
+
+appender.debugFile.type = File
+appender.debugFile.name = DEBUGLOG
+appender.debugFile.fileName=./logs/debug.log
+appender.debugFile.layout.type=PatternLayout
+appender.debugFile.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
+
+rootLogger.level = warn
+rootLogger.appenderRefs = debugFile
+rootLogger.appenderRef.file.ref = DEBUGLOG
+rootLogger.additivity=false
+
+loggers=file
+logger.file.name=de.ids_mannheim.korap
+logger.file.level = debug
+logger.file.appenderRefs = debugFile
+logger.file.appenderRef.file.ref = DEBUGLOG
+logger.file.additivity=false
+
+
+#loggers=file
+#logger.file.name=com.sun.jersey.test.framework.spi.container
+#logger.file.level = info
+#logger.file.appenderRefs = file
+#logger.file.appenderRef.file.ref = ERRORLOG
+#logger.file.additivity=false
\ No newline at end of file
diff --git a/full/src/main/resources/log4j2.properties b/full/src/main/resources/log4j2.properties
index b616418..1acd50c 100644
--- a/full/src/main/resources/log4j2.properties
+++ b/full/src/main/resources/log4j2.properties
@@ -1,29 +1,16 @@
-appenders = console, file
+appenders = console, mainFile
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
-appender.file.type = File
-appender.file.name = ERRORLOG
-appender.file.fileName=./logs/errors.log
-appender.file.layout.type=PatternLayout
-appender.file.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
+appender.mainFile.type = File
+appender.mainFile.name = MAINLOG
+appender.mainFile.fileName=./logs/main.log
+appender.mainFile.layout.type=PatternLayout
+appender.mainFile.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
-rootLogger.level = error
-rootLogger.appenderRefs = stdout
-rootLogger.appenderRef.stdout.ref = STDOUT
-
-loggers=file
-logger.file.name=de.ids_mannheim.korap
-logger.file.level = error
-logger.file.appenderRefs = file
-logger.file.appenderRef.file.ref = ERRORLOG
-logger.file.additivity=true
-
-#loggers=file
-#logger.file.name=com.sun.jersey.test.framework.spi.container
-#logger.file.level = info
-#logger.file.appenderRefs = file
-#logger.file.appenderRef.file.ref = ERRORLOG
-#logger.file.additivity=false
\ No newline at end of file
+rootLogger.level = warn
+rootLogger.appenderRefs = mainFile
+rootLogger.appenderRef.file.ref = MAINLOG
+rootLogger.additivity=false
\ No newline at end of file