clean RAP file upload classes

[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 80e86bd7b2887083c2f24e1c50563d9facf48cca..62872b1c0ac2335d679e3bf23ffc5eccf879840a 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
@@ -6,18 +6,21 @@
        http://www.springframework.org/schema/beans   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
-       <service ref="jsonObjectFactory" interface="org.argeo.server.json.JsonObjectFactory" />\r
-       <service ref="securityService" interface="org.argeo.security.ArgeoSecurityService" />\r
+       <!-- REFERENCES -->\r
+       <reference id="passwordEncoder"\r
+               interface="org.springframework.security.providers.encoding.PasswordEncoder" />\r
 \r
-       <reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao"\r
-               context-class-loader="service-provider" />\r
+       <reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao" />\r
 \r
-       <service interface="org.argeo.security.ldap.UserNatureMapper">\r
-               <beans:bean class="org.argeo.security.ldap.nature.SimpleUserNatureMapper" />\r
-       </service>\r
+       <reference id="authenticationProvider"\r
+               interface="org.springframework.security.providers.AuthenticationProvider" />\r
 \r
-       <service interface="org.argeo.security.ldap.UserNatureMapper">\r
-               <beans:bean class="org.argeo.security.ldap.nature.CoworkerUserNatureMapper" />\r
-       </service>\r
+       <!-- SERVICES -->\r
+       <service ref="securityService" interface="org.argeo.security.ArgeoSecurityService" />\r
+       <service ref="securityService" interface="org.argeo.security.CurrentUserService" />\r
+       <service ref="securityService" interface="org.argeo.security.UserAdminService" />\r
+       <service ref="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />\r
 \r
+       <service ref="authenticationManager"\r
+               interface="org.springframework.security.AuthenticationManager" />\r
 </beans:beans>
\ No newline at end of file