X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.services%2FMETA-INF%2Fspring%2Fosgi.xml;h=62872b1c0ac2335d679e3bf23ffc5eccf879840a;hb=955f75aa71d14ca569c0207d7c176c2780a6880d;hp=80e86bd7b2887083c2f24e1c50563d9facf48cca;hpb=2101bfb7ae055b0e18fbb0001e278aeba13af346;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 80e86bd7b..62872b1c0 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,18 +6,21 @@
        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 -->
+	<reference id="passwordEncoder"
+		interface="org.springframework.security.providers.encoding.PasswordEncoder" />
 
-	<reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao"
-		context-class-loader="service-provider" />
+	<reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao" />
 
-	<service interface="org.argeo.security.ldap.UserNatureMapper">
-		<beans:bean class="org.argeo.security.ldap.nature.SimpleUserNatureMapper" />
-	</service>
+	<reference id="authenticationProvider"
+		interface="org.springframework.security.providers.AuthenticationProvider" />
 
-	<service interface="org.argeo.security.ldap.UserNatureMapper">
-		<beans:bean class="org.argeo.security.ldap.nature.CoworkerUserNatureMapper" />
-	</service>
+	<!-- 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"
+		interface="org.springframework.security.AuthenticationManager" />
 </beans:beans>
\ No newline at end of file