2 files changed, 53 insertions, 38 deletions
diff --git a/release-infos/handbook/conf/moa-spss/log4j.properties b/release-infos/handbook/conf/moa-spss/log4j.properties
deleted file mode 100644
index 562d450..0000000
--- a/release-infos/handbook/conf/moa-spss/log4j.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Sample log4j configuration for the MOA-SPSS web service
-#
-
-# commons-logging setup
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-
-# Configure root logger and loggers for moa-spss
-log4j.rootLogger=info, stdout
-log4j.logger.at.gv.egovernment.moa.spss=info, moaspss
-log4j.logger.at.gv.egovernment.moa.sig=info, moaspss
-log4j.logger.iaik.server=warn, moaspss
-
-# Configure the 'stdout' appender to write logging output to the console
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c |  %10t | %m%n
-
-# Configure the 'moaspss' appender to write moa-spss related logging output
-# to the file '${catalina.base}/logs/moa-spss.log'. The file is rolled over every 1000KB,
-# and a maximum history of 10 log files is being kept.
-log4j.appender.moaspss=org.apache.log4j.RollingFileAppender
-log4j.appender.moaspss.File=${catalina.base}/logs/moa-spss.log
-log4j.appender.moaspss.MaxFileSize=1000KB
-log4j.appender.moaspss.MaxBackupIndex=10
-log4j.appender.moaspss.layout=org.apache.log4j.PatternLayout
-log4j.appender.moaspss.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20c |  %10t | %m%n
-
-# Configure the jdbc appender 'JDBC' to write logging output
-# to the given PostgreSQL database
-# a suitable table called 'spss_log' must have been created in the
-# database using the command:
-# create table spss_log (log_time timestamp, log_level char(5), log_msg text)
-#log4j.appender.JDBC=org.apache.log4j.jdbc.JDBCAppender
-#log4j.appender.JDBC.driver=org.postgresql.Driver
-#log4j.appender.JDBC.URL=jdbc:postgresql://10.16.46.108/moa?user=moa&password=moatest
-#log4j.appender.JDBC.layout=org.apache.log4j.PatternLayout
-#log4j.appender.JDBC.sql=INSERT INTO spss_log (log_time, log_level, log_msg) VALUES ('%d{ yyyy-MM-dd HH:mm:ss.SSS}', '%5p', '%m')
diff --git a/release-infos/handbook/conf/moa-spss/logback.xml b/release-infos/handbook/conf/moa-spss/logback.xml
new file mode 100644
index 0000000..4d0b34b
--- /dev/null
+++ b/release-infos/handbook/conf/moa-spss/logback.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- For assistance related to logback-translator or configuration  -->
+<!-- files in general, please contact the logback user mailing list -->
+<!-- at http://www.qos.ch/mailman/listinfo/logback-user             -->
+<!--                                                                -->
+<!-- For professional support please see                            -->
+<!--    http://www.qos.ch/shop/products/professionalSupport         -->
+<!--                                                                -->
+<configuration>
+  <appender name="moaspss" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+    <File>${catalina.base}/logs/moa-spss.log</File>
+    <encoder>
+      <pattern>logback | %5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n</pattern>
+    </encoder>
+    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <maxIndex>10</maxIndex>
+      <FileNamePattern>${catalina.base}/logs/moa-spss.log.%i</FileNamePattern>
+    </rollingPolicy>
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <MaxFileSize>1000KB</MaxFileSize>
+    </triggeringPolicy>
+  </appender>
+  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>logback | %5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n</pattern>
+    </encoder>
+  </appender>
+  <logger name="moa.spss.server" level="info">
+    <appender-ref ref="moaspss"/>
+    <appender-ref ref="stdout"/>
+  </logger>
+  <logger name="iaik.pki" level="info">
+    <appender-ref ref="moaspss"/>
+    <appender-ref ref="stdout"/>
+  </logger>
+  <logger name="at.gv.egovernment.moa.spss" level="info">
+    <appender-ref ref="moaspss"/>
+    <appender-ref ref="stdout"/>
+  </logger>
+  <logger name="at.gv.egovernment.moa.sig.tsl" level="info">
+    <appender-ref ref="SPSS"/>
+    <appender-ref ref="stdout"/>
+  </logger>
+  <logger name="iaik.server" level="info">
+    <appender-ref ref="moaspss"/>
+    <appender-ref ref="stdout"/>
+  </logger>
+  <root level="warn">
+    <appender-ref ref="stdout"/>
+  </root>
+</configuration>