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

---
 .../at/gv/egovernment/moa/id/configuration/auth/pvp2/Authenticate.java  | 2 ++
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp                  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'id/ConfigWebTool')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/Authenticate.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/Authenticate.java
index 5fa6f3531..abcfd67e9 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/Authenticate.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/Authenticate.java
@@ -211,6 +211,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,
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index b58b997ec..4e8dfc259 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -585,7 +585,7 @@
 								<div id="formCustomPreview">
 										<iframe scrolling="none" 
 														title="BKUForm Preview"
-														height="220"
+														height="260"
 														width="250">
 										</iframe>
 								</div>
-- 
cgit v1.2.3