Introduce OSAuthentication

[lgpl/argeo-commons.git] / security / modules / org.argeo.security.services / META-INF / spring / services.xml

diff --git a/security/modules/org.argeo.security.services/META-INF/spring/services.xml b/security/modules/org.argeo.security.services/META-INF/spring/services.xml
index bb79de26555d897065b83007998ea4afc2a8938e..1a56b85230196c18ca8c6d0b40af7929c08d9327 100644 (file)
--- a/security/modules/org.argeo.security.services/META-INF/spring/services.xml
+++ b/security/modules/org.argeo.security.services/META-INF/spring/services.xml
@@ -8,18 +8,10 @@
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
                <property name="locations">
-                       <value>osgibundle:security.properties
-                       </value>
+                       <value>osgibundle:security.properties</value>
                </property>
        </bean>
 
-       <bean id="securityService" class="org.argeo.security.core.DefaultSecurityService">
-               <property name="securityDao" ref="securityDao" />
-               <property name="passwordEncoder" ref="passwordEncoder" />
-               <property name="authenticationManager" ref="authenticationManager" />
-               <property name="systemAuthenticationKey" value="${argeo.security.systemKey}" />
-       </bean>
-
        <bean id="systemExecutionService" class="org.argeo.security.core.KeyBasedSystemExecutionService">
                <property name="authenticationManager" ref="authenticationManager" />
                <property name="systemAuthenticationKey" value="${argeo.security.systemKey}" />
@@ -27,15 +19,21 @@
 
        <bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
                <property name="providers">
+                       <bean factory-bean="authenticationProvidersRegister"
+                               factory-method="getProviders" />
+               </property>
+       </bean>
+       <bean id="authenticationProvidersRegister" class="org.argeo.security.core.AuthenticationProvidersRegister">
+               <property name="defaultProviders">
                        <list>
                                <bean class="org.springframework.security.adapters.AuthByAdapterProvider">
                                        <property name="key" value="${argeo.security.systemKey}" />
                                </bean>
+                               <bean class="org.argeo.security.core.OsAuthenticationProvider" />
                                <bean
-                                       class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider">
+                                       class="org.springframework.security.providers.anonymous.AnonymousAuthenticationProvider">
                                        <property name="key" value="${argeo.security.systemKey}" />
                                </bean>
-                               <ref bean="authenticationProvider" />
                        </list>
                </property>
        </bean>