X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=security%2Fmodules%2Forg.argeo.security.services%2FMETA-INF%2Fspring%2Fosgi.xml;h=91f2e84290a897a1a5e4879569970ed5b96e5ec8;hb=2745f0c8c57d9468855179d56f858fb2448f779c;hp=62872b1c0ac2335d679e3bf23ffc5eccf879840a;hpb=977a7a352131b082a98739f15e421f2bff747567;p=lgpl%2Fargeo-commons.git

diff --git a/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml b/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml
index 62872b1c0..91f2e8429 100644
--- a/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml
+++ b/security/modules/org.argeo.security.services/META-INF/spring/osgi.xml
@@ -7,18 +7,21 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<!-- REFERENCES -->
-	<reference id="passwordEncoder"
-		interface="org.springframework.security.providers.encoding.PasswordEncoder" />
+	<!-- Cardinality is 0, in order to let a bundle providing the DAO while 
+		depending on the system execution service. The dependency will then have 
+		been satisfied when the first user tries to log-in. -->
+	<reference id="currentUserDao" interface="org.argeo.security.CurrentUserDao"
+		cardinality="0..1" />
 
-	<reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao" />
-
-	<reference id="authenticationProvider"
-		interface="org.springframework.security.providers.AuthenticationProvider" />
+	<list id="authenticationProviders"
+		interface="org.springframework.security.providers.AuthenticationProvider"
+		cardinality="0..N">
+		<listener ref="authenticationProvidersRegister" bind-method="register"
+			unbind-method="unregister" />
+	</list>
 
 	<!-- SERVICES -->
-	<service ref="securityService" interface="org.argeo.security.ArgeoSecurityService" />
 	<service ref="securityService" interface="org.argeo.security.CurrentUserService" />
-	<service ref="securityService" interface="org.argeo.security.UserAdminService" />
 	<service ref="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />
 
 	<service ref="authenticationManager"