Fix various issues with security

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

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 2ee9bf3f569ef5ecd90d45d949f0a811bbcf55da..91f2e84290a897a1a5e4879569970ed5b96e5ec8 100644 (file)
--- 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,12 +7,16 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
        <!-- REFERENCES -->\r
-       <reference id="currentUserDao" interface="org.argeo.security.CurrentUserDao" />\r
+       <!-- Cardinality is 0, in order to let a bundle providing the DAO while \r
+               depending on the system execution service. The dependency will then have \r
+               been satisfied when the first user tries to log-in. -->\r
+       <reference id="currentUserDao" interface="org.argeo.security.CurrentUserDao"\r
+               cardinality="0..1" />\r
 \r
        <list id="authenticationProviders"\r
                interface="org.springframework.security.providers.AuthenticationProvider"\r
                cardinality="0..N">\r
-               <listener ref="authenticationManager" bind-method="register"\r
+               <listener ref="authenticationProvidersRegister" bind-method="register"\r
                        unbind-method="unregister" />\r
        </list>\r
 \r