Merge branch 'eIDAS_node_implementation' of gitlab.iaik.tugraz.at:egiz/moa-idspss into eIDAS_node_implementation

1 files changed, 4 insertions, 2 deletions

diff --git a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/velocity/VelocityProvider.java b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/velocity/VelocityProvider.java
index 022c144f0..21fe110ca 100644
--- a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/velocity/VelocityProvider.java
+++ b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/velocity/VelocityProvider.java
@@ -50,6 +50,7 @@
  */

 package at.gv.egovernment.moa.id.auth.frontend.velocity;

 

+import org.apache.velocity.app.Velocity;

 import org.apache.velocity.app.VelocityEngine;

 import org.apache.velocity.runtime.RuntimeConstants;

 

@@ -104,8 +105,9 @@ public class VelocityProvider {
 		VelocityEngine velocityEngine = new VelocityEngine();

         velocityEngine.setProperty(RuntimeConstants.INPUT_ENCODING, "UTF-8");

         velocityEngine.setProperty(RuntimeConstants.OUTPUT_ENCODING, "UTF-8");

-        velocityEngine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,

-				"org.apache.velocity.runtime.log.SimpleLog4JLogSystem");

+//        velocityEngine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,

+//				"org.apache.velocity.runtime.log.SimpleLog4JLogSystem");

+        velocityEngine.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM, new VelocityLogAdapter() );

         

         return velocityEngine;

 	}