X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Ftest%2Fresources%2Forg%2Fargeo%2Fslc%2Fjcr%2Fdao%2FapplicationContext.xml;h=8383220e4ae55d28c362751b55c3235971a3c815;hb=bd07be7603d234ac496652aaa07ded77d4a2a292;hp=ce0d1e50252f42b08cdc37ef353a04d398fe3d95;hpb=47b34fc00752153d82ffd442a6ef13f1ae4843f0;p=gpl%2Fargeo-slc.git

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 ce0d1e502..8383220e4 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
@@ -1,17 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2007-2012 Argeo GmbH
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<!-- Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org> Licensed under 
+	the Apache License, Version 2.0 (the "License"); you may not use this file 
+	except in compliance with the License. You may obtain a copy of the License 
+	at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable 
+	law or agreed to in writing, software distributed under the License is distributed 
+	on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
+	express or implied. See the License for the specific language governing permissions 
+	and limitations under the License. -->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
 	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">
 
-	<import resource="classpath:/org/argeo/slc/castor/spring.xml" />
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+	</bean>
+
+	<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="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr"
+		init-method="init">
+		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<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="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr">
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+	<bean id="treeTestResultDao" 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="treeTestResultCollectionDao" 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="nodeMapper" class="org.argeo.jcr.spring.BeanNodeMapper" />
+
+	<bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper">
+	</bean>
+
+
 	<bean id="argeo.jcr.session.inMemory" factory-bean="argeo.jcr.repository.inMemory"
-		factory-method="login">
+		factory-method="login" destroy-method="logout">
 		<constructor-arg>
 			<bean class="javax.jcr.SimpleCredentials">
 				<constructor-arg value="demo" />
@@ -20,10 +81,13 @@
 		</constructor-arg>
 	</bean>
 
-	<bean id="argeo.jcr.repository.inMemory" class="org.argeo.server.jackrabbit.JackrabbitContainer">
-		<property name="homeDirectory" value="${java.io.tmpdir}/jackrabbit-slc-unit" />
+	<bean id="argeo.jcr.repository.inMemory" class="org.argeo.jackrabbit.JackrabbitContainer"
+		init-method="init" destroy-method="destroy">
+		<property name="homeDirectory"
+			value="${java.io.tmpdir}/jackrabbit-slc-unit-${user.name}" />
+		<property name="inMemory" value="true" />
 		<property name="configuration"
-			value="classpath:/org/argeo/server/jackrabbit/repository-inMemory.xml" />
+			value="classpath:/org/argeo/jackrabbit/repository-inMemory.xml" />
 	</bean>
 
 </beans>
\ No newline at end of file