Fixes for remote, but will not work with the current version of Jackrabbit.

[gpl/argeo-slc.git] / modules / org.argeo.slc.node.jackrabbit / META-INF / spring / jackrabbit.xml

diff --git a/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml b/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
index 311698e8f7c5c183283fc66006f213c4c1e694c9..f41c5f11539c403e3b66f1b34d5b96a2ffb63445 100644 (file)
--- a/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
+++ b/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
@@ -3,20 +3,11 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-       <bean
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="locations">
-                       <value>osgibundle:jackrabbit.properties</value>
-               </property>
-       </bean>
-
-       <bean id="jcrRepository" class="org.argeo.jackrabbit.JackrabbitContainer"
+       <bean id="jcrRepository" class="org.argeo.jackrabbit.JackrabbitWrapper"
                init-method="init" destroy-method="destroy">
                <property name="cndFiles">
                        <list>
                                <value>/org/argeo/slc/jcr/slc.cnd</value>
-<!--                           <value>/org/argeo/slc/repo/repo.cnd</value> -->
                        </list>
                </property>
                <property name="repository" ref="nodeRepository" />
@@ -24,15 +15,15 @@
        </bean>
 
        <!-- Security -->
-       <bean class="org.argeo.jackrabbit.JackrabbitAuthorizations"
-               init-method="run">
-               <property name="principalPrivileges">
-                       <map>
-                               <entry key="jcr:all" value="ROLE_SLC" />
-                       </map>
-               </property>
-               <property name="repository" ref="jcrRepository" />
-       </bean>
+<!--   <bean class="org.argeo.jackrabbit.JackrabbitAuthorizations" -->
+<!--           init-method="run"> -->
+<!--           <property name="principalPrivileges"> -->
+<!--                   <map> -->
+<!--                           <entry key="jcr:all" value="ROLE_SLC" /> -->
+<!--                   </map> -->
+<!--           </property> -->
+<!--           <property name="repository" ref="jcrRepository" /> -->
+<!--   </bean> -->
 
        <bean
                class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">