From d003a873fdeec22b1dd57d61590a12a1691ae137 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 23 Nov 2020 14:28:04 +0100
Subject: change logging model

---
 moaSig/build.gradle                                | 2 +-
 moaSig/common/build.gradle                         | 2 +-
 moaSig/moa-sig/build.gradle                        | 5 +++--
 moaSig/moa-sig/src/main/resources/log4j.properties | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/moaSig/build.gradle b/moaSig/build.gradle
index 50b50df..c52b4c9 100644
--- a/moaSig/build.gradle
+++ b/moaSig/build.gradle
@@ -22,7 +22,7 @@ subprojects {
         testCompile 'junit:junit:4.12'
     }
 
-    version = '3.1.3'
+    version = '3.1.4-Snapshot'
 
     jar { manifest.attributes provider: 'EGIZ', 'Specification-Version': getCheckedOutGitCommitHash(), 'Implementation-Version': project.version  }
     
diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle
index 88ff053..c5c7435 100644
--- a/moaSig/common/build.gradle
+++ b/moaSig/common/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-	compile files('../libs/iaik_jce_full-5.52_moa.jar')
+	compile files('../libs/iaik_jce_full_signed-5.61_MOA.jar')
 
 	compile 'org.slf4j:slf4j-api:1.7.30'
 	compile 'xerces:xercesImpl:2.12.0'
diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle
index 1ce801c..b3574e6 100644
--- a/moaSig/moa-sig/build.gradle
+++ b/moaSig/moa-sig/build.gradle
@@ -17,6 +17,7 @@ dependencies {
 	providedCompile 'javax.servlet:servlet-api:2.4'
 	compile 'commons-discovery:commons-discovery:0.5'
 	compile 'org.slf4j:slf4j-log4j12:1.7.30'
+	//compile group: 'org.slf4j', name: 'log4j-over-slf4j', version: '1.7.30'
 	
 	//compile 'org.apache.cxf:cxf-rt-frontend-jaxws:3.1.4'
 	//compile 'org.apache.cxf:cxf-rt-transports-http:3.1.4'
@@ -46,8 +47,8 @@ configurations {
 
 dependencies {
     jaxb group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.2.4-1'
-    //compile 'ch.qos.logback:logback-classic:1.1.5'
-    //compile 'ch.qos.logback:logback-core:1.1.5'
+    compile group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'
+    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
     //def tomcatVersion = '7.0.59'
     //tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
     //       "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
diff --git a/moaSig/moa-sig/src/main/resources/log4j.properties b/moaSig/moa-sig/src/main/resources/log4j.properties
index 7beb0c5..8cd351c 100644
--- a/moaSig/moa-sig/src/main/resources/log4j.properties
+++ b/moaSig/moa-sig/src/main/resources/log4j.properties
@@ -6,9 +6,9 @@
 org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
 
 # Configure root logger and loggers for moa-spss
-log4j.rootLogger=TRACE, stdout
-log4j.logger.moa.spss.server=TRACE, stdout, moaspss
-log4j.logger.iaik.server=TRACE, stdout, moaspss
+log4j.rootLogger=warn, stdout
+log4j.logger.moa.spss.server=info, stdout, moaspss
+log4j.logger.iaik.server=info, stdout, moaspss
 log4j.logger.at.gv.egovernment.moa.spss=TRACE, stdout, moaspss
 
 # Configure the 'stdout' appender to write logging output to the console
-- 
cgit v1.2.3