X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.jackrabbit.webapp%2FWEB-INF%2FapplicationContext.xml;h=723e6c70ff209204c5a79c13d8d328b3e6fcd61c;hb=1704dc48bb56e7f4d54c52e6f3d30a386fae47d1;hp=5898b1952fa5816c1b56a22cf36f917acfce4c5d;hpb=5cbd14f6688e8710bff2f853e9fce3fae68c175e;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 5898b1952..723e6c70f 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
@@ -6,17 +6,29 @@
        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>
 
-	<bean id="sessionProvider" scope="session" destroy-method="dispose"
-		class="org.argeo.jackrabbit.remote.SimpleSessionProvider">
+	<!-- 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