From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 29 Aug 2012 10:02:31 +0000 (+0000)
Subject: Adapt to changes in Argeo Commons
X-Git-Tag: argeo-slc-2.1.7~633
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=ced37aae615452040684f57d5fa1f5aa2892406a;p=gpl%2Fargeo-slc.git

Adapt to changes in Argeo Commons

git-svn-id: https://svn.argeo.org/slc/trunk@5545 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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 311698e8f..6b0680053 100644
--- 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" />
diff --git a/modules/org.argeo.slc.node.jackrabbit/jackrabbit.properties b/modules/org.argeo.slc.node.jackrabbit/jackrabbit.properties
deleted file mode 100644
index e161f420a..000000000
--- a/modules/org.argeo.slc.node.jackrabbit/jackrabbit.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-argeo.node.repo.alias=node
-
-slc.jackrabbit.home=${user.home}/.slc/repo/jackrabbit
-slc.jackrabbit.configuration=osgibundle:/repository.xml
-slc.jackrabbit.dburl=jdbc:postgresql://air:5432/slc
-slc.jackrabbit.dbuser=argeo
-slc.jackrabbit.dbpassword=argeo
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml b/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml
index fa6bafee5..ab48515fb 100644
--- a/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml
+++ b/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml
@@ -82,7 +82,7 @@
 	</bean>
 
 	<bean id="argeo.jcr.repository.inMemory" class="org.argeo.jackrabbit.JackrabbitContainer"
-		init-method="init" destroy-method="dispose">
+		init-method="init" destroy-method="destroy">
 		<property name="homeDirectory"
 			value="${java.io.tmpdir}/jackrabbit-slc-unit-${user.name}" />
 		<property name="inMemory" value="true" />