Adapt to changes in Commons Security

[gpl/argeo-slc.git] / org.argeo.slc.server.repo / META-INF / spring / repo-osgi.xml

diff --git a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index aaaa924f04427170bf08ea432662c112d38ef4ef..c821088da62341e4f74cfbac8715ad36b76fbbf3 100644 (file)
--- a/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -9,8 +9,8 @@
        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">\r
 \r
        <!-- REFERENCES -->\r
-       <reference id="authenticationManager"\r
-               interface="org.springframework.security.authentication.AuthenticationManager" />\r
+       <reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />\r
+       <reference id="userTransaction" interface="javax.transaction.UserTransaction" />\r
 \r
        <set id="defaultRpmRepositories" cardinality="0..N"\r
                interface="org.argeo.slc.rpmfactory.RpmRepository" />\r
@@ -48,17 +48,15 @@
        </beans:bean>\r
 \r
        <!-- ROLES -->\r
-       <reference id="userAdminService" interface="org.argeo.security.UserAdminService" />\r
-\r
        <beans:bean id="ROLE_SLC"\r
                class="org.argeo.security.core.SimpleRoleRegistration" init-method="run">\r
-               <beans:property name="role" value="ROLE_SLC" />\r
-               <beans:property name="userAdminService" ref="userAdminService" />\r
+               <beans:property name="role" value="org.argeo.slc.user" />\r
+               <beans:property name="userAdmin" ref="userAdmin" />\r
+               <beans:property name="userTransaction" ref="userTransaction" />\r
        </beans:bean>\r
 \r
        <beans:bean\r
                class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">\r
-               <beans:property name="authenticationManager" ref="authenticationManager" />\r
        </beans:bean>\r
 </beans:beans>\r
 \r