From bab05a25aa94c1a4a0d181c515ad93b12dde3578 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Mon, 8 May 2023 19:19:11 +0200
Subject: chore(core): add missing Spring task-sheduler configuration and
 enalbe task sheduling

---
 .../src/main/resources/applicationContext.xml      | 35 +++++++++++++---------
 .../src/main/resources/applicationContext.xml      | 31 +++++++++++--------
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/ms_specific_connector/src/main/resources/applicationContext.xml b/ms_specific_connector/src/main/resources/applicationContext.xml
index 5c5e245c..a7fc0c70 100644
--- a/ms_specific_connector/src/main/resources/applicationContext.xml
+++ b/ms_specific_connector/src/main/resources/applicationContext.xml
@@ -3,15 +3,13 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xmlns:mvc="http://www.springframework.org/schema/mvc"
+  xmlns:task="http://www.springframework.org/schema/task"
   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">
+    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
+    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
   <context:annotation-config />
   <context:component-scan base-package="at.gv.egiz.eaaf.utils.springboot.ajp"/>
@@ -30,16 +28,25 @@
 
   <bean class="at.asitplus.eidas.specific.core.controller.DataBinderControllerAdvice" />
 
-  <beans profile="deprecatedConfig">
-  <bean id="BasicMSSpecificNodeConfig"
-    class="at.asitplus.eidas.specific.core.config.BasicConfigurationProvider">
-    <constructor-arg value="#{systemProperties['eidas.ms.configuration']}" />
+  <bean id="basicTaskScheduler"
+    	class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
+    <property name="corePoolSize" value="5" />
+    <property name="maxPoolSize" value="25" />
+    <property name="queueCapacity" value="100" />
   </bean>
+
+  <task:annotation-driven executor="basicTaskScheduler" />
+
+  <beans profile="deprecatedConfig">
+  	<bean 	id="BasicMSSpecificNodeConfig"
+    		class="at.asitplus.eidas.specific.core.config.BasicConfigurationProvider">
+    	<constructor-arg value="#{systemProperties['eidas.ms.configuration']}" />
+  	</bean>
   </beans>
+  
   <beans profile="!deprecatedConfig">
     <bean id="springBootMsSpecificNodeConfig"
-          class="at.asitplus.eidas.specific.core.config.SpringBootBasicConfigurationProvider" />
-          
+          class="at.asitplus.eidas.specific.core.config.SpringBootBasicConfigurationProvider" />         
   </beans>
 
 </beans>
diff --git a/ms_specific_proxyservice/src/main/resources/applicationContext.xml b/ms_specific_proxyservice/src/main/resources/applicationContext.xml
index ec8e79f4..6b17f9cd 100644
--- a/ms_specific_proxyservice/src/main/resources/applicationContext.xml
+++ b/ms_specific_proxyservice/src/main/resources/applicationContext.xml
@@ -3,15 +3,13 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xmlns:mvc="http://www.springframework.org/schema/mvc"
+  xmlns:task="http://www.springframework.org/schema/task"
   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">
+    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
+    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
 
   <context:annotation-config />
   <context:component-scan base-package="at.gv.egiz.eaaf.utils.springboot.ajp"/>
@@ -28,11 +26,20 @@
   <bean id="springContextClosingHandler"
         class="at.asitplus.eidas.specific.core.SpringContextCloseHandler" />
 
-  <beans profile="deprecatedConfig">
-  <bean id="BasicMSSpecificNodeConfig"
-    class="at.asitplus.eidas.specific.core.config.BasicConfigurationProvider">
-    <constructor-arg value="#{systemProperties['eidas.ms.configuration']}" />
+  <bean id="basicTaskScheduler"
+    	class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
+    <property name="corePoolSize" value="5" />
+    <property name="maxPoolSize" value="25" />
+    <property name="queueCapacity" value="100" />
   </bean>
+
+  <task:annotation-driven executor="basicTaskScheduler" />
+
+  <beans profile="deprecatedConfig">
+  	<bean 	id="BasicMSSpecificNodeConfig"
+    		class="at.asitplus.eidas.specific.core.config.BasicConfigurationProvider">
+    	<constructor-arg value="#{systemProperties['eidas.ms.configuration']}" />
+  	</bean>
   </beans>
   <beans profile="!deprecatedConfig">
     <bean id="springBootMsSpecificNodeConfig"
-- 
cgit v1.2.3