X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.services%2FMETA-INF%2Fspring%2Fservices.xml;h=f49de0914e5a51963f7f6732f1e307764f015690;hb=019e0f2af17286be08ab17c1c9e1d8ba871ec9b2;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..f49de0914 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,16 +8,12 @@
 		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 id="securityService" class="org.argeo.security.core.DefaultCurrentUserService">
+		<property name="currentUserDao" ref="currentUserDao" />
 	</bean>
 
 	<bean id="systemExecutionService" class="org.argeo.security.core.KeyBasedSystemExecutionService">
@@ -25,8 +21,14 @@
 		<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}" />
@@ -38,11 +40,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