X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.jackrabbit.webapp%2FWEB-INF%2FapplicationContext.xml;h=736ed8aebf8bca4e836c15ab2c29026c05e22f2b;hb=ef586999841732468a39a18b8193d3be767ac7aa;hp=faf8e94b8899512e60cd99c669bee288f739a7a8;hpb=03db65bd74ce09b696a4c5af15a58df988e5368d;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 faf8e94b8..736ed8aeb 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
@@ -6,23 +6,28 @@
        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" init-method="init"
-		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" />
-<!-- 		<property name="credentials"> -->
-<!-- 			<bean class="javax.jcr.SimpleCredentials"> -->
-<!-- 				<constructor-arg value="root" /> -->
-<!-- 				<constructor-arg value="demo" /> -->
-<!-- 			</bean> -->
-<!-- 		</property> -->
 	</bean>
 
-	<bean id="osivInterceptor" class="org.argeo.jcr.mvc.OpenSessionInViewJcrInterceptor">
-		<!-- <property name="session" ref="jcrSession" /> -->
-	</bean>
+	<!-- 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