From ef35deb727190363d17d693d10f27171787cc92c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 3 Feb 2014 15:38:24 +0100
Subject: Solve some merge problems

---
 id/oa/pom.xml                                                           | 2 +-
 .../java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'id/oa')

diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index c5664c281..621c428bd 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -46,7 +46,7 @@
 			<dependency>
   			<groupId>org.opensaml</groupId>
   			<artifactId>opensaml</artifactId>
-  			<version>2.5.3</version>
+  			<version>2.6.0</version>
   		</dependency>  		
 			<dependency>
 				<groupId>org.opensaml</groupId>
diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
index 917493848..5bf9c4970 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/Authenticate.java
@@ -197,6 +197,8 @@ public class Authenticate extends HttpServlet {
 			engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
 			engine.setProperty("classpath.resource.loader.class",
 					"org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+			engine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
+					"org.apache.velocity.runtime.log.SimpleLog4JLogSystem");
 			engine.init();
 
 			HTTPPostEncoder encoder = new HTTPPostEncoder(engine,
-- 
cgit v1.2.3