X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.server.jcr%2FMETA-INF%2Fspring%2Fjcr.xml;h=3286d73ca063c120d8be7dba8c1b552caf90bdbb;hb=555e1a5440b6c246c31b274df54c1df6a0449da9;hp=4adfd61caae7ef49a3c9d6765f2d4037f4b1aac6;hpb=be96ff87e70e7ebc7d8f92e26c7bc1242ffebe36;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 4adfd61ca..3286d73ca 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
@@ -11,19 +11,19 @@
 
 	<bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr"
 		init-method="init">
-		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<property name="session" ref="jcrSession" />
 		<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="session" ref="jcrSession" />
 		<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="session" ref="jcrSession" />
 		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
 	</bean>
 
@@ -35,16 +35,21 @@
 
 	<bean id="testResultDao" class="org.argeo.slc.jcr.dao.TreeTestResultDaoJcr"
 		init-method="init">
-		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<property name="session" ref="jcrSession" />
 		<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="session" ref="jcrSession" />
 		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
 	</bean>
 
+	<bean id="osivInterceptor"
+		class="org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor">
+		<property name="session" ref="jcrSession" />
+	</bean>
+
 	<!--  JCR node mappers -->
 	<bean id="bundleClassLoader"
 		class="org.springframework.osgi.util.BundleDelegatingClassLoader"
@@ -61,21 +66,16 @@
 	<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"
-		factory-method="login" destroy-method="logout">
-		<constructor-arg>
-			<bean class="javax.jcr.SimpleCredentials">
-				<constructor-arg value="demo" />
-				<constructor-arg value="demo" />
-			</bean>
-		</constructor-arg>
+		<bean id="jcrSession" factory-bean="argeo.jcr.repository.inMemory"
+		factory-method="login" destroy-method="logout" scope="request">
+		<constructor-arg> <bean
+		class="org.argeo.server.jcr.security.SpringSecurityCredentials" />
+		</constructor-arg> </bean>
+	-->
+	<bean id="jcrSession"
+		class="org.argeo.jcr.ThreadBoundJcrSessionFactory">
+		<property name="repository" ref="jcrRepository" />
 	</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" />
-	</bean>
-
 </beans>
\ No newline at end of file