From 34be99015cbc990af2206f354dbffcacd69ba1c3 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 20 May 2014 08:17:56 +0200
Subject: Signed-off-by: Thomas Lenz <thomas.lenz@egiz.gv.at> Fix STORK
 NullPointerException

---
 id/server/data/deploy/conf/moa-id/log4j.properties | 4 ++--
 id/server/idserverlib/pom.xml                      | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'id/server')

diff --git a/id/server/data/deploy/conf/moa-id/log4j.properties b/id/server/data/deploy/conf/moa-id/log4j.properties
index 310b58a3d..c7dece5c5 100644
--- a/id/server/data/deploy/conf/moa-id/log4j.properties
+++ b/id/server/data/deploy/conf/moa-id/log4j.properties
@@ -2,11 +2,11 @@
 org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
 
 # define log4j root loggers
-log4j.rootLogger=info, stdout, R
+log4j.rootLogger=info, stdout
 log4j.logger.at.gv.egovernment.moa=info
 log4j.logger.at.gv.egovernment.moa.spss=info
 log4j.logger.iaik.server=info
-log4j.logger.at.gv.egovernment.moa.id=info
+log4j.logger.at.gv.egovernment.moa.id=info,R
 log4j.logger.at.gv.egovernment.moa.id.proxy=info
 log4j.logger.eu.stork=info
 log4j.logger.org.hibernate=warn
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index f1518951f..687c8843e 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -238,6 +238,12 @@
 			<groupId>com.googlecode.jsontoken</groupId>
 			<artifactId>jsontoken</artifactId>
 			<version>1.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
-- 
cgit v1.2.3