Moves Spring Security / Jackrabbit synchronization in JcrSecurityModel

[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 376a8e914ec8bd1834a9aa560affb2872123ebba..b7b3bf3ee55ace2de2970e0631e68f63613a76be 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">
@@ -17,6 +17,16 @@
                        </list>
                </property>
                <property name="repository" ref="nodeRepository" />
+               <property name="bundleContext" ref="bundleContext" />
+       </bean>
+       <bean class="org.argeo.jackrabbit.JackrabbitAuthorizations"
+               init-method="run">
+               <property name="principalPrivileges">
+                       <map>
+                               <entry key="jcr:all" value="ROLE_ADMIN" />
+                       </map>
+               </property>
+               <property name="repository" ref="argeoDataModel" />
        </bean>
 
        <bean id="jcrLdapSynchronizer" class="org.argeo.security.ldap.jcr.JcrLdapSynchronizer"
@@ -36,10 +46,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">