Improve and simplify OSGi Boot

[lgpl/argeo-commons.git] / org.argeo.security.ui.admin / META-INF / spring / common.xml

diff --git a/org.argeo.security.ui.admin/META-INF/spring/common.xml b/org.argeo.security.ui.admin/META-INF/spring/common.xml
index 737f30430f1de0eb82592c291808f9d754fd163f..f3b7ecb01c1d94ef62be53ab317dcde9797a633a 100644 (file)
--- a/org.argeo.security.ui.admin/META-INF/spring/common.xml
+++ b/org.argeo.security.ui.admin/META-INF/spring/common.xml
@@ -3,6 +3,19 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
+       <bean id="userTransactionProvider"\r
+               class="org.argeo.security.ui.admin.internal.providers.UserTransactionProvider"\r
+               scope="singleton" lazy-init="false">\r
+               <property name="userTransaction" ref="userTransaction" />\r
+       </bean>\r
+\r
+       <bean id="userAdminWrapper" class="org.argeo.security.ui.admin.internal.UserAdminWrapper"\r
+               scope="singleton" lazy-init="false">\r
+               <property name="userTransaction" ref="userTransaction" />\r
+               <property name="userAdmin" ref="userAdmin" />\r
+               <property name="userAdminServiceReference" ref="userAdmin" />\r
+       </bean>\r
+\r
        <bean\r
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />\r
@@ -11,10 +24,4 @@
                </property>\r
        </bean>\r
 \r
-       <!-- FIXME Hard-coded dependency to Jackrabbit for user management -->\r
-       <bean name="jcrSecurityModel" class="org.argeo.security.jackrabbit.JackrabbitSecurityModel" />\r
-\r
-       <!-- Old deprecated way. -->\r
-       <!-- <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession"> \r
-               <property name="repository" ref="nodeRepository" /> </bean> -->\r
 </beans>
\ No newline at end of file