Simplify remoting configuration

[lgpl/argeo-commons.git] / server / modules / org.argeo.jackrabbit.webapp / WEB-INF / applicationContext.xml

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 a30ecbf0613e087d222588c4722b5c5c94761cb9..736ed8aebf8bca4e836c15ab2c29026c05e22f2b 100644 (file)
--- 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,33 @@
 <?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>
 
-       <bean id="osivInterceptor"
-               class="org.argeo.jcr.mvc.OpenSessionInViewJcrInterceptor">
-<!--           <property name="session" ref="jcrSession" />-->
+       <!-- 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>
 
+       <!-- 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