1 files changed, 24 insertions, 4 deletions
diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
index a3f834457..da5bf98ab 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -2,19 +2,39 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans 
+		http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context 
+		http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/mvc
+		http://www.springframework.org/schema/mvc/spring-mvc.xsd
+		http://www.springframework.org/schema/tx
+		http://www.springframework.org/schema/tx/spring-tx.xsd
+	"
+>
 
 	<context:annotation-config />
 
+	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.servlet" />
+	<context:component-scan base-package="at.gv.egovernment.moa.id.protocols" />
+
+	<mvc:annotation-driven />
+
+	<mvc:default-servlet-handler/>
+
+  <mvc:interceptors>
+  	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.WebFrontEndSecurityInterceptor" />
+  	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.UniqueSessionIdentifierInterceptor" />
+  </mvc:interceptors> 
+
 	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
 		<property name="transitionConditionExpressionEvaluator">
 			<bean class="at.gv.egovernment.moa.id.process.springweb.SpringWebExpressionEvaluator" />
 		</property>
 	</bean>
 	
-	<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
-
 	<!-- import auth modules -->
 	<import resource="classpath*:**/*.authmodule.beans.xml" />