Move security admin services

[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 92b4129fd8ba6f8800c94b19ce3fd369791feed6..2ee9bf3f569ef5ecd90d45d949f0a811bbcf55da 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,14 +7,8 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
        <!-- REFERENCES -->\r
-       <reference id="passwordEncoder"\r
-               interface="org.springframework.security.providers.encoding.PasswordEncoder" />\r
+       <reference id="currentUserDao" interface="org.argeo.security.CurrentUserDao" />\r
 \r
-       <reference id="securityDao" interface="org.argeo.security.ArgeoSecurityDao" />\r
-\r
-       <!-- <reference id="authenticationProvider" -->\r
-       <!-- interface="org.springframework.security.providers.AuthenticationProvider" \r
-               /> -->\r
        <list id="authenticationProviders"\r
                interface="org.springframework.security.providers.AuthenticationProvider"\r
                cardinality="0..N">\r
@@ -23,9 +17,7 @@
        </list>\r
 \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