X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.services%2FMETA-INF%2Fspring%2Fosgi.xml;h=91f2e84290a897a1a5e4879569970ed5b96e5ec8;hb=2745f0c8c57d9468855179d56f858fb2448f779c;hp=4cd0f21f1e5894178bdf03c6ee0ee1ea92695fe0;hpb=4a045d66694bcb80968158dc82344f3906fce530;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 4cd0f21f1..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
@@ -6,9 +6,24 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<service ref="jsonObjectFactory" interface="org.argeo.server.json.JsonObjectFactory" />
-	<service ref="securityService" interface="org.argeo.security.ArgeoSecurityService" />
+	<!-- REFERENCES -->
+	<!-- 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"
-		context-class-loader="service-provider" />
+	<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.CurrentUserService" />
+	<service ref="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />
+
+	<service ref="authenticationManager"
+		interface="org.springframework.security.AuthenticationManager" />
 </beans:beans>
\ No newline at end of file