diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-06-15 13:16:19 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-06-15 13:16:19 +0200 |
| commit | 5d46366bfebd7bc38d7df3d648bf03bd29700a2e (patch) | |
| tree | b0f9a299ce15c154b6337603634ec792a24c8697 /id/server/idserverlib/src/main/resources | |
| parent | 6b38531ef2a829e3dab513ae8c679511a848421d (diff) | |
| download | moa-id-spss-5d46366bfebd7bc38d7df3d648bf03bd29700a2e.tar.gz moa-id-spss-5d46366bfebd7bc38d7df3d648bf03bd29700a2e.tar.bz2 moa-id-spss-5d46366bfebd7bc38d7df3d648bf03bd29700a2e.zip | |
fix first refactoring problems
Diffstat (limited to 'id/server/idserverlib/src/main/resources')
| -rw-r--r-- | id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml | 26 | ||||
| -rw-r--r-- | id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml | 2 |
2 files changed, 7 insertions, 21 deletions
diff --git a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml index ba8c47304..d8565112b 100644 --- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml +++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml @@ -15,18 +15,10 @@ <task:annotation-driven executor="MOA-ID-Auth_TaskExecutor" scheduler="MOA-ID-Auth_Scheduler"/> <task:executor id="MOA-ID-Auth_TaskExecutor" pool-size="5"/> <task:scheduler id="MOA-ID-Auth_Scheduler" pool-size="10"/> - - <bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl"> - <property name="transitionConditionExpressionEvaluator"> - <bean class="at.gv.egovernment.moa.id.process.springweb.SpringWebExpressionEvaluator" /> - </property> - </bean> - + <!-- import auth modules --> <import resource="classpath*:**/*.authmodule.beans.xml" /> - <bean id="moduleRegistration" class="at.gv.egovernment.moa.id.auth.modules.registration.ModuleRegistration" factory-method="getInstance" /> - <context:component-scan base-package="at.gv.egovernment.moa.id.auth.servlet" /> <context:component-scan base-package="at.gv.egovernment.moa.id.protocols" /> @@ -42,17 +34,13 @@ <bean id="MOAID_SSOManager" class="at.gv.egovernment.moa.id.moduls.SSOManager"/> + <bean id="moaGUIConfigurationFactory" + class="at.gv.egovernment.moa.id.auth.frontend.MOAIDGuiBilderConfigurationFactory" /> <bean id="AuthenticationSessionStoreage" class="at.gv.egovernment.moa.id.storage.DBAuthenticationSessionStoreage"/> - - <bean id="RequestStorage" - class="at.gv.egovernment.moa.id.moduls.RequestStorage"/> - - <bean id="ProcessInstanceStoreage" - class="at.gv.egovernment.moa.id.process.dao.ProcessInstanceStoreDAOImpl"/> - + <bean id="MOAReversionLogger" class="at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger"/> @@ -80,11 +68,7 @@ <bean id="RestartAuthProzessManagement" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.RestartAuthProzessManagement" scope="prototype"/> - - <bean id="FinalizeAuthenticationTask" - class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.FinalizeAuthenticationTask" - scope="prototype"/> - + <bean id="GenerateSSOConsentEvaluatorFrameTask" class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateSSOConsentEvaluatorFrameTask" scope="prototype"/> diff --git a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml index 9c27ba581..b23948688 100644 --- a/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml +++ b/id/server/idserverlib/src/main/resources/moaid.configuration.beans.xml @@ -11,6 +11,8 @@ <context:property-placeholder location="${moa.id.configuration}"/> + <bean id="MOAIDMessageProvider" class="at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider" /> + <bean id="moaidauthconfig" class="at.gv.egovernment.moa.id.config.auth.PropertyBasedAuthConfigurationProvider"> <constructor-arg value="#{systemProperties['moa.id.configuration']}"/> </bean> |