X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fmodules%2Forg.argeo.security.dao.ldap%2FMETA-INF%2Fspring%2Fsecurity-ldap-jcr.xml;h=3235e66f4c445c9c726aa9dd80fbaf9983fce1fe;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=ef18e04197b162d43a3a132f0ec93ab22009a1ae;hpb=0f82096aecc32f674336405cb52f7796ed29d23c;p=lgpl%2Fargeo-commons.git

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 ef18e0419..3235e66f4 100644
--- 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">