X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.services%2FMETA-INF%2Fspring%2Fservices.xml;h=1a56b85230196c18ca8c6d0b40af7929c08d9327;hb=875f68b1da16d72d847c27af3349e71672853c61;hp=c602a6bc53f53dd7d96bb02a74a83f815ea72aca;hpb=10c220cf49f5b146bac50ed7fe2578135cd466f1;p=lgpl%2Fargeo-commons.git

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 c602a6bc5..1a56b8523 100644
--- 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,29 +8,28 @@
 		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}" />
 	</bean>
 
-	<bean id="authenticationManager" class="org.argeo.security.core.ArgeoAuthenticationManager">
+	<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.anonymous.AnonymousAuthenticationProvider">
 					<property name="key" value="${argeo.security.systemKey}" />
@@ -38,11 +37,4 @@
 			</list>
 		</property>
 	</bean>
-
-
-	<!-- <bean id="rememberMeAuthenticationProvider" -->
-	<!-- class="org.springframework.security.providers.rememberme.RememberMeAuthenticationProvider"> -->
-	<!-- <property name="key" value="${argeo.security.systemKey}" /> -->
-	<!-- </bean> -->
-
 </beans>
\ No newline at end of file