diff options
Diffstat (limited to 'connector/src/main/resources')
3 files changed, 5 insertions, 111 deletions
diff --git a/connector/src/main/resources/applicationContext.xml b/connector/src/main/resources/applicationContext.xml index 15ce0a55..ec8e79f4 100644 --- a/connector/src/main/resources/applicationContext.xml +++ b/connector/src/main/resources/applicationContext.xml @@ -15,16 +15,10 @@ <context:annotation-config /> <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" /> + class="at.asitplus.eidas.specific.core.interceptor.WebFrontEndSecurityInterceptor" /> <bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor"> <property name="paramName" value="lang" /> @@ -32,22 +26,17 @@ </mvc:interceptors> <bean id="springContextClosingHandler" - class="at.asitplus.eidas.specific.connector.SpringContextCloseHandler" /> - -<!-- - <context:property-placeholder - location="${eidas.ms.configuration}" /> - --> + class="at.asitplus.eidas.specific.core.SpringContextCloseHandler" /> <beans profile="deprecatedConfig"> <bean id="BasicMSSpecificNodeConfig" - class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider"> + 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.connector.config.SpringBootBasicConfigurationProvider" /> + class="at.asitplus.eidas.specific.core.config.SpringBootBasicConfigurationProvider" /> </beans> diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml index 34fd088b..7ac6236c 100644 --- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml +++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml @@ -11,10 +11,8 @@ 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"> - <import resource="common_gui.beans.xml"/> + <import resource="specific_eIDAS_core.beans.xml"/> - <bean id="WebResourceConfiguration" - class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" /> <bean id="processEngineSignalController" class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" /> @@ -24,15 +22,6 @@ <property name="pvpIdpCredentials" ref="PVPEndPointCredentialProvider" /> </bean> - <bean id="eidasNodeMetadata" - class="at.asitplus.eidas.specific.connector.health.EidasNodeMetadataHealthIndicator" /> - - <bean id="AuthenticationManager" - class="at.asitplus.eidas.specific.connector.auth.AuthenticationManager" /> - - <bean id="AuthenticationDataBuilder" - class="at.asitplus.eidas.specific.connector.builder.AuthenticationDataBuilder" /> - <bean id="PVPEndPointConfiguration" class="at.asitplus.eidas.specific.connector.config.PvpEndPointConfiguration" /> @@ -66,44 +55,12 @@ <property name="metadataProvider" ref="PVPMetadataProvider" /> </bean> - <bean id="eaafProtocolAuthenticationService" - class="at.gv.egiz.eaaf.core.impl.idp.auth.services.ProtocolAuthenticationService"> - <property name="guiBuilder" ref="mvcGUIBuilderImpl" /> - </bean> - - <bean id="securePendingRequestIdGeneration" - class="at.gv.egiz.eaaf.core.impl.utils.SecurePendingRequestIdGenerationStrategy" /> - <bean id="PVPMetadataProvider" class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" /> <bean id="PVPSubjectNameGenerator" class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" /> - <bean id="LoALevelMapper" - class="at.asitplus.eidas.specific.connector.mapper.LoALevelMapper" /> - - <bean id="GUIBuilderConfigurationFactory" - class="at.asitplus.eidas.specific.connector.gui.GuiBuilderConfigurationFactory" /> - - <bean id="velocityGUIBuilderImpl" - class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGuiBuilderImpl" /> - - <bean id="mvcGUIBuilderImpl" - class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" /> - - <bean id="StatusMessageProvider" - class="at.asitplus.eidas.specific.connector.provider.StatusMessageProvider" /> - - <bean id="eidasRevisionLogger" - class="at.asitplus.eidas.specific.connector.logger.RevisionLogger" /> - - <bean id="eidasStatisticLogger" - class="at.asitplus.eidas.specific.connector.logger.StatisticLogger" /> - - <bean id="defaultErrorHandler" - class="at.gv.egiz.eaaf.core.impl.idp.auth.services.DefaultErrorService"/> - <!-- Tasks --> <bean id="GenerateCountrySelectionFrameTask" diff --git a/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml deleted file mode 100644 index 2e4d1742..00000000 --- a/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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" - xmlns:tx="http://www.springframework.org/schema/tx" - xmlns:aop="http://www.springframework.org/schema/aop" - xmlns:mvc="http://www.springframework.org/schema/mvc" - xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.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-3.1.xsd - 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"> - - <import - resource="classpath:specificCommunicationDefinitionApplicationContext.xml" /> - - <!-- <bean id="SimpleInMemoryTransactionStorage" class="at.asitplus.eidas.specific.connector.storage.SimpleInMemoryTransactionStorage" - /> --> - - <bean id="eIDASCacheTransactionStoreDecorator" - class="at.asitplus.eidas.specific.connector.storage.EidasCacheTransactionStoreDecorator" /> - - <bean id="CacheWitheIDASBackend" - class="at.asitplus.eidas.specific.connector.storage.CacheWithEidasBackend"> - <constructor-arg ref="msNodeCacheImpl" /> - </bean> - - <bean id="msNodeCacheImpl" - class="eu.eidas.auth.cache.ConcurrentCacheServiceIgniteSpecificCommunicationImpl"> - <property name="igniteInstanceInitializerSpecificCommunication" ref="eidasIgniteInstanceInitializerSpecificCommunication" /> - <property name="cacheName" value="msConnectorCache" /> - </bean> - - <bean id="IgniteClusterState" - class="at.asitplus.eidas.specific.connector.health.IgniteClusterHealthIndicator"> - <property name="igniteInstanceInitializerSpecificCommunication" ref="eidasIgniteInstanceInitializerSpecificCommunication" /> - </bean> - - - <!-- bean id="defaultHazelcastInstance" class="java.lang.String"> <constructor-arg - value="eidasHazelcastInstance"/> </bean> <bean id="eidasHazelcastInstanceInitializer" - class=" eu.eidas.auth.commons.cache.HazelcastInstanceInitializer" init-method="initializeInstance" - lazy-init="true"> <property name="hazelcastConfigfileName" value="#{eidasConfigRepository}hazelcast.xml"/> - <property name="hazelcastInstanceName" ref="defaultHazelcastInstance"/> </bean> - <bean id="springServiceCMapspecificMSSpCorProviderProd" class="eu.eidas.auth.commons.cache.ConcurrentMapServiceDistributedImpl" - lazy-init="true"> <property name="hazelcastInstanceInitializer" ref="eidasHazelcastInstanceInitializer"/> - <property name="cacheName" value="specificSpRequestCorrelationCacheService"/> - </bean> <bean id="springServiceCMapspecificMSSpCorProviderDev" class="eu.eidas.auth.commons.cache.ConcurrentMapServiceDefaultImpl"> - <property name="expireAfterAccess" value="1800"/> <property name="maximumSize" - value="1000"/> </bean --> - -</beans>
\ No newline at end of file |