From 6b098e7070dedb5692325f6d330a20de696b9edc Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 22 Dec 2020 15:36:42 +0100
Subject: switch from Spring to Spring-Boot

---
 .../src/main/resources/applicationContext.xml      | 23 ++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'connector/src/main/resources/applicationContext.xml')

diff --git a/connector/src/main/resources/applicationContext.xml b/connector/src/main/resources/applicationContext.xml
index 76682a2e..8a21e68f 100644
--- a/connector/src/main/resources/applicationContext.xml
+++ b/connector/src/main/resources/applicationContext.xml
@@ -14,10 +14,14 @@
     http://www.springframework.org/schema/tx/spring-tx.xsd">
 
   <context:annotation-config />
-  <mvc:annotation-driven />
+  <context:component-scan base-package="at.gv.egiz.eaaf.utils.springboot.ajp"/>
 
+<!--
+  <context:annotation-config />
+  <mvc:annotation-driven />
   <mvc:default-servlet-handler />
-
+-->
+    
   <mvc:interceptors>
     <bean
       class="at.asitplus.eidas.specific.connector.interceptor.WebFrontEndSecurityInterceptor" />
@@ -27,13 +31,24 @@
     </bean>
   </mvc:interceptors>
 
+  <bean id="springContextClosingHandler"
+        class="at.asitplus.eidas.specific.connector.SpringContextCloseHandler" />
+
+<!-- 
   <context:property-placeholder
     location="${eidas.ms.configuration}" />
+  -->
 
+  <beans profile="!springBoot">
   <bean id="BasicMSSpecificNodeConfig"
     class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider">
-    <constructor-arg
-      value="#{systemProperties['eidas.ms.configuration']}" />
+    <constructor-arg value="#{systemProperties['eidas.ms.configuration']}" />
   </bean>
+  </beans>
+  <beans profile="springBoot">
+    <bean id="springBootMsSpecificNodeConfig"
+          class="at.asitplus.eidas.specific.connector.config.SpringBootBasicConfigurationProvider" />
+          
+  </beans>
 
 </beans>
-- 
cgit v1.2.3