Adapt after refactoring

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

diff --git a/org.argeo.slc.agent/META-INF/spring/osgi.xml b/org.argeo.slc.agent/META-INF/spring/osgi.xml
index f22371189d8ceb7b4c4d203f0e6cf4afb9570aee..b3e9aebe267c23ca448b6a8ce037455959f1a67f 100644 (file)
--- a/org.argeo.slc.agent/META-INF/spring/osgi.xml
+++ b/org.argeo.slc.agent/META-INF/spring/osgi.xml
@@ -32,21 +32,25 @@
                cardinality="0..N">\r
                <listener ref="modulesManager" />\r
        </list>\r
+       <reference id="userTransaction" interface="javax.transaction.UserTransaction" />\r
+       <reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />\r
 \r
        <!-- SERVICES -->\r
        <service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
 \r
        <!-- LABEL -->\r
-       <beans:bean class="org.argeo.security.core.OsgiModuleLabel">\r
+       <beans:bean class="org.argeo.cms.spring.osgi.OsgiModuleLabel">\r
                <beans:property name="bundleContext" ref="bundleContext" />\r
        </beans:bean>\r
 \r
        <!-- ROLES -->\r
-       <reference id="userAdminService" interface="org.argeo.security.UserAdminService" />\r
+<!--   <reference id="userAdminService" interface="org.argeo.security.UserAdminService" /> -->\r
 \r
-       <beans:bean class="org.argeo.security.core.SimpleRoleRegistration"\r
+       <beans:bean class="org.argeo.cms.spring.SimpleRoleRegistration"\r
                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:property name="userAdminService" ref="userAdminService" /> -->\r
        </beans:bean>\r
 </beans:beans>
\ No newline at end of file