Adapt to changes in Commons

[gpl/argeo-slc.git] / org.argeo.slc.server.repo / META-INF / spring / jcr.xml

diff --git a/org.argeo.slc.server.repo/META-INF/spring/jcr.xml b/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
index 0d48361681f4a7c96be4c2e14829323f0a63bf21..7ba658464da5b2eff082868bb65348b1cebbbec4 100644 (file)
--- a/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
+++ b/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
@@ -4,22 +4,30 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
        <!-- JCR repositories -->\r
-       <bean id="javaRepository" parent="template.jcrRepository">\r
-               <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/java" />\r
-               <property name="configuration" value="${slc.repo.jcr.configuration.java}" />\r
-       </bean>\r
-       <bean id="distRepository" parent="template.jcrRepository">\r
-               <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/dist" />\r
-               <property name="configuration" value="${slc.repo.jcr.configuration.dist}" />\r
-       </bean>\r
-       <bean id="rpmRepository" parent="template.jcrRepository">\r
-               <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/rpm" />\r
-               <property name="configuration" value="${slc.repo.jcr.configuration.rpm}" />\r
-       </bean>\r
-       <bean id="docsRepository" parent="template.jcrRepository">\r
-               <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/docs" />\r
-               <property name="configuration" value="${slc.repo.jcr.configuration.docs}" />\r
-       </bean>\r
+       <!-- <bean id="javaRepository" parent="template.jcrRepository"> -->\r
+       <!-- <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/java" \r
+               /> -->\r
+       <!-- <property name="configuration" value="${slc.repo.jcr.configuration.java}" \r
+               /> -->\r
+       <!-- </bean> -->\r
+       <!-- <bean id="distRepository" parent="template.jcrRepository"> -->\r
+       <!-- <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/dist" \r
+               /> -->\r
+       <!-- <property name="configuration" value="${slc.repo.jcr.configuration.dist}" \r
+               /> -->\r
+       <!-- </bean> -->\r
+       <!-- <bean id="rpmRepository" parent="template.jcrRepository"> -->\r
+       <!-- <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/rpm" \r
+               /> -->\r
+       <!-- <property name="configuration" value="${slc.repo.jcr.configuration.rpm}" \r
+               /> -->\r
+       <!-- </bean> -->\r
+       <!-- <bean id="docsRepository" parent="template.jcrRepository"> -->\r
+       <!-- <property name="homeDirectory" value="${slc.repo.jcr.reposBase}/docs" \r
+               /> -->\r
+       <!-- <property name="configuration" value="${slc.repo.jcr.configuration.docs}" \r
+               /> -->\r
+       <!-- </bean> -->\r
 \r
        <!-- JCR authorizations -->\r
        <bean parent="template.jcrAuthorizations">\r
@@ -36,26 +44,27 @@
        </bean>\r
 \r
        <!-- Templates -->\r
-       <bean id="template.jcrRepository" abstract="true"\r
-               class="org.argeo.jackrabbit.JackrabbitContainer" init-method="init"\r
-               destroy-method="destroy">\r
-               <property name="variables" value="osgibundle:/repo.properties" />\r
-               <property name="cndFiles">\r
-                       <list>\r
-                               <value>/org/argeo/jcr/argeo.cnd</value>\r
-                               <value>/org/argeo/slc/jcr/slc.cnd</value>\r
-                               <value>/org/argeo/slc/repo/repo.cnd</value>\r
-                       </list>\r
-               </property>\r
-               <property name="bundleContext" ref="bundleContext" />\r
-               <property name="forceCndImport" value="${slc.repo.jcr.forceCndImport}" />\r
-       </bean>\r
+       <!-- <bean id="template.jcrRepository" abstract="true" -->\r
+       <!-- class="org.argeo.jackrabbit.JackrabbitContainer" init-method="init" -->\r
+       <!-- destroy-method="destroy"> -->\r
+       <!-- <property name="variables" value="osgibundle:/repo.properties" /> -->\r
+       <!-- <property name="cndFiles"> -->\r
+       <!-- <list> -->\r
+       <!-- <value>/org/argeo/jcr/argeo.cnd</value> -->\r
+       <!-- <value>/org/argeo/slc/jcr/slc.cnd</value> -->\r
+       <!-- <value>/org/argeo/slc/repo/repo.cnd</value> -->\r
+       <!-- </list> -->\r
+       <!-- </property> -->\r
+       <!-- <property name="bundleContext" ref="bundleContext" /> -->\r
+       <!-- <property name="forceCndImport" value="${slc.repo.jcr.forceCndImport}" \r
+               /> -->\r
+       <!-- </bean> -->\r
 \r
        <bean id="template.jcrAuthorizations" abstract="true"\r
-               class="org.argeo.jackrabbit.JackrabbitAuthorizations" init-method="run">\r
+               class="org.argeo.jcr.security.JcrAuthorizations" init-method="run">\r
                <property name="principalPrivileges">\r
                        <map>\r
-                               <entry key="jcr:all" value="ROLE_SLC" />\r
+                               <entry key="jcr:all" value="org.argeo.slc.user" />\r
                        </map>\r
                </property>\r
                <property name="workspace" value="*" />\r