Update MANIFESTS after release

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.server.jcr / META-INF / spring / jcr.xml

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 4adfd61caae7ef49a3c9d6765f2d4037f4b1aac6..3286d73ca063c120d8be7dba8c1b552caf90bdbb 100644 (file)
--- 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 @@
 \r
        <bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr"\r
                init-method="init">\r
-               <property name="session" ref="argeo.jcr.session.inMemory" />\r
+               <property name="session" ref="jcrSession" />\r
                <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
        </bean>\r
 \r
        <bean id="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr"\r
                init-method="init">\r
-               <property name="session" ref="argeo.jcr.session.inMemory" />\r
+               <property name="session" ref="jcrSession" />\r
                <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
        </bean>\r
 \r
        <bean id="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr"\r
                init-method="init">\r
-               <property name="session" ref="argeo.jcr.session.inMemory" />\r
+               <property name="session" ref="jcrSession" />\r
                <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
        </bean>\r
 \r
@@ -35,16 +35,21 @@
 \r
        <bean id="testResultDao" class="org.argeo.slc.jcr.dao.TreeTestResultDaoJcr"\r
                init-method="init">\r
-               <property name="session" ref="argeo.jcr.session.inMemory" />\r
+               <property name="session" ref="jcrSession" />\r
                <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
        </bean>\r
 \r
        <bean id="testResultCollectionDao" class="org.argeo.slc.jcr.dao.TreeTestResultCollectionDaoJcr"\r
                init-method="init">\r
-               <property name="session" ref="argeo.jcr.session.inMemory" />\r
+               <property name="session" ref="jcrSession" />\r
                <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
        </bean>\r
 \r
+       <bean id="osivInterceptor"\r
+               class="org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor">\r
+               <property name="session" ref="jcrSession" />\r
+       </bean>\r
+\r
        <!--  JCR node mappers -->\r
        <bean id="bundleClassLoader"\r
                class="org.springframework.osgi.util.BundleDelegatingClassLoader"\r
@@ -61,21 +66,16 @@
        <bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper">\r
                <property name="classLoader" ref="bundleClassLoader" />\r
        </bean>\r
+       <!--\r
 \r
-       <bean id="argeo.jcr.session.inMemory" factory-bean="argeo.jcr.repository.inMemory"\r
-               factory-method="login" destroy-method="logout">\r
-               <constructor-arg>\r
-                       <bean class="javax.jcr.SimpleCredentials">\r
-                               <constructor-arg value="demo" />\r
-                               <constructor-arg value="demo" />\r
-                       </bean>\r
-               </constructor-arg>\r
+               <bean id="jcrSession" factory-bean="argeo.jcr.repository.inMemory"\r
+               factory-method="login" destroy-method="logout" scope="request">\r
+               <constructor-arg> <bean\r
+               class="org.argeo.server.jcr.security.SpringSecurityCredentials" />\r
+               </constructor-arg> </bean>\r
+       -->\r
+       <bean id="jcrSession"\r
+               class="org.argeo.jcr.ThreadBoundJcrSessionFactory">\r
+               <property name="repository" ref="jcrRepository" />\r
        </bean>\r
-\r
-       <bean id="argeo.jcr.repository.inMemory" class="org.argeo.server.jackrabbit.JackrabbitContainer">\r
-               <property name="homeDirectory" value="${java.io.tmpdir}/jackrabbit-slc-unit" />\r
-               <property name="configuration"\r
-                       value="classpath:/org/argeo/server/jackrabbit/repository-inMemory.xml" />\r
-       </bean>\r
-\r
 </beans>
\ No newline at end of file