diff options
Diffstat (limited to 'connector/src/main/resources')
6 files changed, 298 insertions, 260 deletions
diff --git a/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider b/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider index d68a187a..4c2aef74 100644 --- a/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider +++ b/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider @@ -1 +1 @@ -at.asitplus.eidas.specific.connector.MSSpecificeIDASNodeSpringResourceProvider
\ No newline at end of file +at.asitplus.eidas.specific.connector.MsSpecificEidasNodeSpringResourceProvider
\ No newline at end of file diff --git a/connector/src/main/resources/applicationContext.xml b/connector/src/main/resources/applicationContext.xml index 9105bb56..76682a2e 100644 --- a/connector/src/main/resources/applicationContext.xml +++ b/connector/src/main/resources/applicationContext.xml @@ -1,37 +1,39 @@ <?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:mvc="http://www.springframework.org/schema/mvc" - 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 - " -> + 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" + 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"> - <context:annotation-config /> - <mvc:annotation-driven /> - - <mvc:default-servlet-handler/> - - <mvc:interceptors> - <bean class="at.asitplus.eidas.specific.connector.interceptor.WebFrontEndSecurityInterceptor" /> - <bean class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor"> - <property name="paramName" value="lang" /> - </bean> - </mvc:interceptors> + <context:annotation-config /> + <mvc:annotation-driven /> - <context:property-placeholder location="${eidas.ms.configuration}"/> + <mvc:default-servlet-handler /> + + <mvc:interceptors> + <bean + class="at.asitplus.eidas.specific.connector.interceptor.WebFrontEndSecurityInterceptor" /> + <bean + class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor"> + <property name="paramName" value="lang" /> + </bean> + </mvc:interceptors> + + <context:property-placeholder + location="${eidas.ms.configuration}" /> + + <bean id="BasicMSSpecificNodeConfig" + class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider"> + <constructor-arg + value="#{systemProperties['eidas.ms.configuration']}" /> + </bean> - <bean id="BasicMSSpecificNodeConfig" - class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider"> - <constructor-arg value="#{systemProperties['eidas.ms.configuration']}"/> - </bean> - </beans> diff --git a/connector/src/main/resources/logback.xml b/connector/src/main/resources/logback.xml index b46c95de..a0a9995e 100644 --- a/connector/src/main/resources/logback.xml +++ b/connector/src/main/resources/logback.xml @@ -1,105 +1,131 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- For assistance related to logback-translator or configuration --> +<!-- For assistance related to logback-translator or configuration --> <!-- files in general, please contact the logback user mailing list --> -<!-- at http://www.qos.ch/mailman/listinfo/logback-user --> -<!-- --> -<!-- For professional support please see --> -<!-- http://www.qos.ch/shop/products/professionalSupport --> -<!-- --> +<!-- at http://www.qos.ch/mailman/listinfo/logback-user --> +<!-- --> +<!-- For professional support please see --> +<!-- http://www.qos.ch/shop/products/professionalSupport --> +<!-- --> <configuration> - <appender name="msnode" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender--> + <appender name="msnode" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender --> <File>${catalina.base}/logs/eidas-ms-reversion.log</File> <encoder> <pattern>%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n</pattern> </encoder> - <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <rollingPolicy + class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <maxIndex>9999</maxIndex> - <FileNamePattern>${catalina.base}/logs/eidas-ms-reversion.log.%i</FileNamePattern> + <FileNamePattern>${catalina.base}/logs/eidas-ms-reversion.log.%i + </FileNamePattern> </rollingPolicy> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <triggeringPolicy + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <MaxFileSize>10000KB</MaxFileSize> </triggeringPolicy> </appender> - <appender name="EIDASNODE" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender--> + <appender name="EIDASNODE" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender --> <File>${catalina.base}/logs/eIDAS_node.log</File> <encoder> <pattern>%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n</pattern> </encoder> - <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <rollingPolicy + class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <maxIndex>9999</maxIndex> - <FileNamePattern>${catalina.base}/logs/eIDAS_node.log.%i</FileNamePattern> + <FileNamePattern>${catalina.base}/logs/eIDAS_node.log.%i + </FileNamePattern> </rollingPolicy> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <triggeringPolicy + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <MaxFileSize>10000KB</MaxFileSize> </triggeringPolicy> </appender> - <appender name="reversion" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender--> + <appender name="reversion" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender --> <File>${catalina.base}/logs/eidas-ms-reversion.log</File> <encoder> <pattern>%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n</pattern> </encoder> - <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <rollingPolicy + class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <maxIndex>9999</maxIndex> - <FileNamePattern>${catalina.base}/logs/eidas-ms-reversion.log.%i</FileNamePattern> + <FileNamePattern>${catalina.base}/logs/eidas-ms-reversion.log.%i + </FileNamePattern> </rollingPolicy> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <triggeringPolicy + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <MaxFileSize>10000KB</MaxFileSize> </triggeringPolicy> </appender> - <appender name="statistic" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender--> + <appender name="statistic" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender --> <File>${catalina.base}/logs/eidas-ms-statistic.log</File> <encoder> <pattern>%m%n</pattern> </encoder> - <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <rollingPolicy + class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <maxIndex>9999</maxIndex> - <FileNamePattern>${catalina.base}/logs/eidas-ms-statistic.log.%i</FileNamePattern> + <FileNamePattern>${catalina.base}/logs/eidas-ms-statistic.log.%i + </FileNamePattern> </rollingPolicy> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <triggeringPolicy + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <MaxFileSize>10000KB</MaxFileSize> </triggeringPolicy> </appender> - <appender name="stdout" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender--> + <appender name="stdout" + class="ch.qos.logback.core.rolling.RollingFileAppender"> + <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender --> <File>${catalina.base}/logs/console.log</File> <encoder> <pattern>%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n</pattern> </encoder> - <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> + <rollingPolicy + class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <maxIndex>9999</maxIndex> - <FileNamePattern>${catalina.base}/logs/console.log.%i</FileNamePattern> + <FileNamePattern>${catalina.base}/logs/console.log.%i + </FileNamePattern> </rollingPolicy> - <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + <triggeringPolicy + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <MaxFileSize>10000KB</MaxFileSize> </triggeringPolicy> </appender> - <appender name="console" class="ch.qos.logback.core.ConsoleAppender"> + <appender name="console" + class="ch.qos.logback.core.ConsoleAppender"> <encoder> <pattern>%5p | %d{dd HH:mm:ss,SSS} | %20c | %10t | %m%n</pattern> </encoder> </appender> <logger name="at.gv.egiz.eaaf" level="info"> - <appender-ref ref="msnode"/> + <appender-ref ref="msnode" /> </logger> <logger name="eu.eidas" additivity="false" level="info"> - <appender-ref ref="EIDASNODE"/> + <appender-ref ref="EIDASNODE" /> </logger> - <logger name="at.gv.egiz.eidas.specific" additivity="false" level="info"> - <appender-ref ref="msnode"/> + <logger name="at.gv.egiz.eidas.specific" additivity="false" + level="info"> + <appender-ref ref="msnode" /> </logger> - <logger name="at.gv.egiz.eidas.specific.connector.logger.RevisionLogger" additivity="false" level="info"> - <appender-ref ref="reversion"/> + <logger + name="at.gv.egiz.eidas.specific.connector.logger.RevisionLogger" + additivity="false" level="info"> + <appender-ref ref="reversion" /> </logger> - <logger name="at.gv.egiz.eidas.specific.connector.logger.StatisticLogger" additivity="false" level="info"> - <appender-ref ref="statistic"/> + <logger + name="at.gv.egiz.eidas.specific.connector.logger.StatisticLogger" + additivity="false" level="info"> + <appender-ref ref="statistic" /> </logger> <root level="info"> - <appender-ref ref="stdout"/> - <appender-ref ref="console"/> + <appender-ref ref="stdout" /> + <appender-ref ref="console" /> </root> </configuration> diff --git a/connector/src/main/resources/processes/CountrySelection.process.xml b/connector/src/main/resources/processes/CountrySelection.process.xml index 575bbf0d..9c76e9a9 100644 --- a/connector/src/main/resources/processes/CountrySelection.process.xml +++ b/connector/src/main/resources/processes/CountrySelection.process.xml @@ -1,17 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<pd:ProcessDefinition id="CountrySelectionProcess" xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"> +<pd:ProcessDefinition id="CountrySelectionProcess" + xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"> - <pd:Task id="initializeCountrySelection" class="GenerateCountrySelectionFrameTask"/> - <pd:Task id="parseCountrySelection" class="EvaluateCountrySelectionTask" async="true"/> - <pd:Task id="restartAuthProzessManagement" class="RestartAuthProzessManagement"/> + <pd:Task id="initializeCountrySelection" + class="GenerateCountrySelectionFrameTask" /> + <pd:Task id="parseCountrySelection" + class="EvaluateCountrySelectionTask" async="true" /> + <pd:Task id="restartAuthProzessManagement" + class="RestartAuthProzessManagement" /> - <pd:StartEvent id="start" /> - <pd:Transition from="start" to="initializeCountrySelection" /> - <pd:Transition from="initializeCountrySelection" to="parseCountrySelection" /> - - <pd:Transition from="parseCountrySelection" to="initializeCountrySelection" conditionExpression="ctx['changeLanguage']"/> - <pd:Transition from="parseCountrySelection" to="restartAuthProzessManagement" /> - <pd:Transition from="restartAuthProzessManagement" to="end" /> - <pd:EndEvent id="end" /> + <pd:StartEvent id="start" /> + + <pd:Transition from="start" + to="initializeCountrySelection" /> + <pd:Transition from="initializeCountrySelection" + to="parseCountrySelection" /> + + <pd:Transition from="parseCountrySelection" + to="initializeCountrySelection" + conditionExpression="ctx['changeLanguage']" /> + <pd:Transition from="parseCountrySelection" + to="restartAuthProzessManagement" /> + <pd:Transition from="restartAuthProzessManagement" + to="end" /> + + <pd:EndEvent id="end" /> </pd:ProcessDefinition> diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml index 32b1685d..e7a46657 100644 --- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml +++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml @@ -1,129 +1,129 @@ <?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"> - - <context:annotation-config /> - <mvc:annotation-driven /> - <mvc:default-servlet-handler/> - - <bean id="WebResourceConfiguration" - class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" /> - - <bean id="ProcessEngineSignalController" - class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" /> - - <bean id="MonitoringController" - class="at.asitplus.eidas.specific.connector.controller.MonitoringController"> - <property name="pvpIDPCredentials"> - <ref bean="PVPEndPointCredentialProvider" /> - </property> - </bean> - - <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"/> - - <bean id="PVPEndPointCredentialProvider" - class="at.asitplus.eidas.specific.connector.provider.PVPEndPointCredentialProvider" /> - - <bean id="PVPMetadataConfigurationFactory" - class="at.asitplus.eidas.specific.connector.provider.PVPMetadataConfigurationFactory" /> - - <bean id="PVP2XProtocol" - class="at.asitplus.eidas.specific.connector.controller.PVP2SProfileEndpoint"> - <property name="pvpIDPCredentials"> - <ref bean="PVPEndPointCredentialProvider" /> - </property> - </bean> - - <bean id="AuthnRequestValidator" - class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" /> - - <bean id="SAMLVerificationEngine" - class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SAMLVerificationEngine" /> - - <bean id="pvpMetadataService" - class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction"> - <property name="pvpIDPCredentials"> - <ref bean="PVPEndPointCredentialProvider" /> - </property> - </bean> - - <bean id="PVPAuthenticationRequestAction" - class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction"> - <property name="pvpIDPCredentials"> - <ref bean="PVPEndPointCredentialProvider" /> - </property> - </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.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" /> - - <bean id="eidasRevisionLogger" - class="at.asitplus.eidas.specific.connector.logger.RevisionLogger" /> - - <bean id="eidasStatisticLogger" - class="at.asitplus.eidas.specific.connector.logger.StatisticLogger" /> - - - <!-- Tasks --> - <bean id="GenerateCountrySelectionFrameTask" - class="at.asitplus.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask" - scope="prototype"/> - - <bean id="EvaluateCountrySelectionTask" - class="at.asitplus.eidas.specific.connector.processes.tasks.EvaluateCountrySelectionTask" - scope="prototype"/> - + 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"> + + <context:annotation-config /> + <mvc:annotation-driven /> + <mvc:default-servlet-handler /> + + <bean id="WebResourceConfiguration" + class="at.asitplus.eidas.specific.connector.config.StaticResourceConfiguration" /> + + <bean id="ProcessEngineSignalController" + class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" /> + + <bean id="MonitoringController" + class="at.asitplus.eidas.specific.connector.controller.MonitoringController"> + <property name="pvpIDPCredentials"> + <ref bean="PVPEndPointCredentialProvider" /> + </property> + </bean> + + <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" /> + + <bean id="PVPEndPointCredentialProvider" + class="at.asitplus.eidas.specific.connector.provider.PVPEndPointCredentialProvider" /> + + <bean id="PVPMetadataConfigurationFactory" + class="at.asitplus.eidas.specific.connector.provider.PVPMetadataConfigurationFactory" /> + + <bean id="PVP2XProtocol" + class="at.asitplus.eidas.specific.connector.controller.PVP2SProfileEndpoint"> + <property name="pvpIDPCredentials"> + <ref bean="PVPEndPointCredentialProvider" /> + </property> + </bean> + + <bean id="AuthnRequestValidator" + class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" /> + + <bean id="SAMLVerificationEngine" + class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SAMLVerificationEngine" /> + + <bean id="pvpMetadataService" + class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.MetadataAction"> + <property name="pvpIDPCredentials"> + <ref bean="PVPEndPointCredentialProvider" /> + </property> + </bean> + + <bean id="PVPAuthenticationRequestAction" + class="at.gv.egiz.eaaf.modules.pvp2.idp.impl.AuthenticationAction"> + <property name="pvpIDPCredentials"> + <ref bean="PVPEndPointCredentialProvider" /> + </property> + </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.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" /> + + <bean id="eidasRevisionLogger" + class="at.asitplus.eidas.specific.connector.logger.RevisionLogger" /> + + <bean id="eidasStatisticLogger" + class="at.asitplus.eidas.specific.connector.logger.StatisticLogger" /> + + + <!-- Tasks --> + <bean id="GenerateCountrySelectionFrameTask" + class="at.asitplus.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask" + scope="prototype" /> + + <bean id="EvaluateCountrySelectionTask" + class="at.asitplus.eidas.specific.connector.processes.tasks.EvaluateCountrySelectionTask" + scope="prototype" /> + </beans>
\ No newline at end of file diff --git a/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml index a460dea6..9ee5cf88 100644 --- a/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml +++ b/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml @@ -1,51 +1,49 @@ <?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="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 --> - + 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="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 |