X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.jackrabbit.webapp%2FWEB-INF%2FapplicationContext.xml;h=723e6c70ff209204c5a79c13d8d328b3e6fcd61c;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=a30ecbf0613e087d222588c4722b5c5c94761cb9;hpb=4fe54cd305d0693bb9cea15e1460ccc03f487fda;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
index a30ecbf06..723e6c70f 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
@@ -1,20 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
 	xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 	<import resource="osgi.xml" />
-	<import resource="security.xml" />
+	<import resource="security-filters.xml" />
 
-	<bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" />
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="locations">
+			<value>osgibundle:jackrabbit-webapp.properties</value>
+		</property>
+	</bean>
+
+	<!-- The JCR sessions, optimised per web session. -->
+	<bean id="scopedSessionProvider" init-method="init"
+		destroy-method="destroy" class="org.argeo.jackrabbit.remote.ScopedSessionProvider"
+		scope="session">
+		<aop:scoped-proxy proxy-target-class="false" />
+	</bean>
 
-	<bean id="osivInterceptor"
-		class="org.argeo.jcr.mvc.OpenSessionInViewJcrInterceptor">
-<!--		<property name="session" ref="jcrSession" />-->
+	<!-- The JCR sessions, one login per request. -->
+	<bean id="openInViewSessionProvider" init-method="init"
+		destroy-method="destroy" class="org.argeo.jackrabbit.remote.OpenInViewSessionProvider">
 	</bean>
 
+	<!-- <bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" 
+		/> -->
+
 </beans>
\ No newline at end of file