From d476d340b2fb6694eac18d94e6c0ddbaad5b7545 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 24 Feb 2016 12:16:05 +0100
Subject: move bean definitions

---
 .../auth/src/main/webapp/WEB-INF/applicationContext.xml    | 14 --------------
 .../src/main/resources/moaid.authentication.beans.xml      | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'id/server')

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 da5bf98ab..948cd3a24 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -17,9 +17,6 @@
 
 	<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/>
@@ -28,16 +25,5 @@
   	<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>
-	
-	<!-- import auth modules -->
-	<import resource="classpath*:**/*.authmodule.beans.xml" />
-
-	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.auth.modules.registration.ModuleRegistration" factory-method="getInstance" />
 	
 </beans>
diff --git a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
index be4402a03..11d92cea3 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -9,6 +9,20 @@
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
  
+ 	<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>
+	
+	<!-- import auth modules -->
+	<import resource="classpath*:**/*.authmodule.beans.xml" />
+
+	<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.auth.modules.registration.ModuleRegistration" factory-method="getInstance" />
+	
+	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.servlet" />
+	<context:component-scan base-package="at.gv.egovernment.moa.id.protocols" />
+ 
 	<bean id="MOAID_AuthenticationManager" 
 				class="at.gv.egovernment.moa.id.moduls.AuthenticationManager"/>
 
-- 
cgit v1.2.3