Fix issues with admin

[lgpl/argeo-commons.git] / security / modules / org.argeo.security.dao.ldap / META-INF / spring / security-ldap-jcr.xml

diff --git a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml
index ef18e04197b162d43a3a132f0ec93ab22009a1ae..3235e66f4c445c9c726aa9dd80fbaf9983fce1fe 100644 (file)
--- a/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml
+++ b/security/modules/org.argeo.security.dao.ldap/META-INF/spring/security-ldap-jcr.xml
@@ -8,7 +8,7 @@
                http://www.springframework.org/schema/util
                http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
-       <bean id="argeoDataModel" class="org.argeo.jackrabbit.JackrabbitContainer"
+       <bean id="argeoDataModel" class="org.argeo.jackrabbit.JackrabbitWrapper"
                init-method="init" destroy-method="destroy">
                <description><![CDATA[Make sure that Argeo base data model is registered]]></description>
                <property name="cndFiles">
@@ -37,10 +37,12 @@
                <property name="rawLdapTemplate" ref="rawLdapTemplate" />
                <!-- JCR -->
                <property name="repository" ref="nodeRepository" />
-               <property name="securityWorkspace" value="${argeo.node.repo.securityWorkspace}" />
+               <property name="jcrSecurityModel" ref="jcrSecurityModel" />
                <property name="propertyToAttributes" ref="propertyToAttributes" />
        </bean>
 
+       <bean name="jcrSecurityModel" class="org.argeo.security.jackrabbit.JackrabbitSecurityModel" />
+
        <!-- LDAP / JCR mapping -->
        <util:map id="propertyToAttributes">
                <entry value="cn">