X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.server.jackrabbit.repo%2FMETA-INF%2Fspring%2Fjackrabbit.xml;h=c56a03f59d53c59107de9db254a79bf32c093bb4;hb=bf61aea62d1cb0f17edddd454f86348d5a64465c;hp=85df7980d047ebbf52bad5ffb7ac4e44425ab029;hpb=efb67124bb84e5e71089979cc9e9ff43ca84be91;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml
index 85df7980d..c56a03f59 100644
--- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml
+++ b/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml
@@ -7,26 +7,24 @@
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
-		<!-- 
 		<property name="locations">
-			<value>osgibundle:jackrabbit.properties </value>
+			<value>osgibundle:jackrabbit.properties</value>
 		</property>
-		 -->
 	</bean>
 
-	<bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl"
-		factory-method="create">
-		<constructor-arg ref="repositoryConfig" />
+	<bean id="repository" class="org.argeo.server.jackrabbit.JackrabbitContainer">
+		<property name="homeDirectory" value="${argeo.osgi.data.dir}/jackrabbit" />
+		<property name="configuration" value="${argeo.jackrabbit.repo.configuration}" />
 	</bean>
-
-	<bean id="repositoryConfig" class="org.apache.jackrabbit.core.config.RepositoryConfig"
-		factory-method="create">
-		<!--  -->
-		<constructor-arg value="osgibundle:repository.xml"
-			type="java.io.InputStream" />
-		<constructor-arg value="${argeo.osgi.data.dir}/jackrabbit" type="java.lang.String" />
-		
-		<!-- <constructor-arg value="${osgi.instance.area}" type="java.io.File" />-->
-	</bean>
-
+	<!--
+		<bean id="repository"
+		class="org.apache.jackrabbit.core.RepositoryImpl"
+		factory-method="create"> <constructor-arg ref="repositoryConfig" />
+		</bean> <bean id="repositoryConfig"
+		class="org.apache.jackrabbit.core.config.RepositoryConfig"
+		factory-method="create"> <constructor-arg
+		value="osgibundle:repository.xml" type="java.io.InputStream" />
+		<constructor-arg value="${argeo.osgi.data.dir}/jackrabbit"
+		type="java.lang.String" /> </bean>
+	-->
 </beans>
\ No newline at end of file