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

---
 .../resources/specific_eIDAS_connector.beans.xml    | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

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

diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index 5cf0d5b8..aa5040fa 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -11,17 +11,15 @@
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
     http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
-  <context:annotation-config />
-  <mvc:annotation-driven />
-  <mvc:default-servlet-handler />
+  <import resource="common_gui.beans.xml"/>
 
   <bean id="WebResourceConfiguration"
     class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" />
 
-  <bean id="ProcessEngineSignalController"
+  <bean id="processEngineSignalController"
     class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
 
-  <bean id="MonitoringController"
+  <bean id="monitoringController"
     class="at.asitplus.eidas.specific.connector.controller.MonitoringController">
     <property name="pvpIdpCredentials">
       <ref bean="PVPEndPointCredentialProvider" />
@@ -43,7 +41,7 @@
   <bean id="PVPMetadataConfigurationFactory"
     class="at.asitplus.eidas.specific.connector.provider.PvpMetadataConfigurationFactory" />
 
-  <bean id="PVP2XProtocol"
+  <bean id="pvp2SProfileEndpoint"
     class="at.asitplus.eidas.specific.connector.controller.Pvp2SProfileEndpoint">
     <property name="pvpIdpCredentials">
       <ref bean="PVPEndPointCredentialProvider" />
@@ -96,17 +94,6 @@
   <bean id="mvcGUIBuilderImpl"
     class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl" />
 
-  <bean id="templateEngine"
-    class="org.thymeleaf.spring5.SpringTemplateEngine">
-    <property name="templateResolver" ref="templateResolver" />
-  </bean>
-
-  <bean class="org.thymeleaf.spring5.view.ThymeleafViewResolver">
-    <property name="order" value="2" />
-    <property name="templateEngine" ref="templateEngine" />
-    <property name="characterEncoding" value="UTF-8" />
-  </bean>
-
   <bean id="StatusMessageProvider"
     class="at.asitplus.eidas.specific.connector.provider.StatusMessageProvider" />
 
-- 
cgit v1.2.3