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=3baeb167c9a92d1f915904bb956632c0aff65b2b;hp=376a8e914ec8bd1834a9aa560affb2872123ebba;hpb=484dcb1507e4e35cc282e50522ea7eac7e99a7f9;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 376a8e914..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">
@@ -17,6 +17,7 @@
 			</list>
 		</property>
 		<property name="repository" ref="nodeRepository" />
+		<property name="bundleContext" ref="bundleContext" />
 	</bean>
 
 	<bean id="jcrLdapSynchronizer" class="org.argeo.security.ldap.jcr.JcrLdapSynchronizer"
@@ -36,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">