[maven-release-plugin] prepare for next development iteration

[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 42db5686a5808d4693f55c80a271fa32c6e8831c..d8b5a33dc9a375e56b784e7fdc1a44e09b470bbe 100644 (file)
--- 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,26 @@
        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 id="sessionProvider" scope="session" init-method="init"
-               destroy-method="dispose" class="org.argeo.jackrabbit.remote.SimpleSessionProvider">
-               <aop:scoped-proxy proxy-target-class="false" />
+       <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" /> -->
-       </bean>
+       <!-- <bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" 
+               /> -->
+
+       <bean id="sessionProvider" init-method="init" destroy-method="destroy"
+               class="org.argeo.jackrabbit.remote.SimpleSessionProvider" />
+
+       <!-- <bean id="osivInterceptor" class="org.argeo.jcr.mvc.OpenSessionInViewJcrInterceptor"> -->
+       <!-- <property name="session" ref="jcrSession" /> -->
+       <!-- </bean> -->
+
+       <bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" />
 
 </beans>
\ No newline at end of file