X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.server.jcr%2FMETA-INF%2Fspring%2Fjcr.xml;h=ccc14fccfbb92ea1b0a46c8be57161e15d0c7915;hb=f1949f18a209de9f9ee110e2e2654882529b8ec5;hp=ecba7b537144877b9a9c854f5e7cccaa81876f30;hpb=18ac6f87499d59dd81c2195017dc74a088aecd1c;p=gpl%2Fargeo-slc.git

diff --git a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml
index ecba7b537..ccc14fccf 100644
--- a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml
+++ b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml
@@ -9,21 +9,60 @@
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 	</bean>
 
-	<bean id="beanNodeMapper" class="org.argeo.jcr.BeanNodeMapper">
-		<property name="classLoader">
-			<bean class="org.springframework.osgi.util.BundleDelegatingClassLoader"
-				factory-method="createBundleClassLoaderFor">
-				<constructor-arg>
-					<bean factory-bean="bundleContext" factory-method="getBundle" />
-				</constructor-arg>
-			</bean>
-		</property>
+	<bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr"
+		init-method="init">
+		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
+	</bean>
+
+	<bean id="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr"
+		init-method="init">
+		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
 	</bean>
 
 	<bean id="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr"
 		init-method="init">
 		<property name="session" ref="argeo.jcr.session.inMemory" />
-		<property name="beanNodeMapper" ref="beanNodeMapper"/>
+		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
+	</bean>
+
+	<bean id="nodeMapperProvider" class="org.argeo.slc.jcr.dao.SlcNodeMapperProvider"
+		init-method="init">
+		<property name="defaultNodeMapper" ref="nodeMapper" />
+		<property name="treeTestResultNodeMapper" ref="treeTestResultNodeMapper" />
+	</bean>
+
+	<bean id="testResultDao" class="org.argeo.slc.jcr.dao.TreeTestResultDaoJcr"
+		init-method="init">
+		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
+	</bean>
+
+	<bean id="testResultCollectionDao" class="org.argeo.slc.jcr.dao.TreeTestResultCollectionDaoJcr"
+		init-method="init">
+		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
+	</bean>
+
+	<bean id="osivInterceptor" class="org.argeo.slc.jcr.mvc.OpenSessionInViewJcrInterceptor">
+	</bean>
+
+	<!--  JCR node mappers -->
+	<bean id="bundleClassLoader"
+		class="org.springframework.osgi.util.BundleDelegatingClassLoader"
+		factory-method="createBundleClassLoaderFor">
+		<constructor-arg>
+			<bean factory-bean="bundleContext" factory-method="getBundle" />
+		</constructor-arg>
+	</bean>
+
+	<bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper">
+		<property name="classLoader" ref="bundleClassLoader" />
+	</bean>
+
+	<bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper">
+		<property name="classLoader" ref="bundleClassLoader" />
 	</bean>
 
 	<bean id="argeo.jcr.session.inMemory" factory-bean="argeo.jcr.repository.inMemory"
@@ -37,9 +76,8 @@
 	</bean>
 
 	<bean id="argeo.jcr.repository.inMemory" class="org.argeo.server.jackrabbit.JackrabbitContainer">
-		<property name="homeDirectory" value="${java.io.tmpdir}/jackrabbit-slc-unit" />
-		<property name="configuration"
-			value="classpath:/org/argeo/server/jackrabbit/repository-inMemory.xml" />
+		<property name="homeDirectory" value="${argeo.osgi.data.dir}/jackrabbit" />
+		<property name="configuration" value="osgibundle:/repository.xml" />
 	</bean>
 
 </beans>
\ No newline at end of file