Simplify remoting configuration

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

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml
index c3ede3fd43865a82be77b9b987c73eb25abda451..50a3d5cea9765f8c0d2e3ce7348f755dec47ad0e 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/webdav-servlet.xml
@@ -1,30 +1,21 @@
 <?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">
 
-       <bean id="webdavServlet" class="org.argeo.jackrabbit.remote.WebDavServlet">
-<!--           <property name="repository" ref="jcrRepository" />-->
-               <property name="resourceConfiguration" value="osgibundle:/WEB-INF/webdav-config.xml" />
-       </bean>
-
        <bean
                class="org.springframework.web.servlet.handler.SimpleServletPostProcessor" />
 
        <bean id="servletHandler"
                class="org.springframework.web.servlet.handler.SimpleServletHandlerAdapter" />
 
-       <bean id="urlMapping"
-               class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-               <property name="mappings">
-                       <props>
-                               <prop key="**">webdavServlet</prop>
-                       </props>
-               </property>
+       <bean id="urlMapping" class="org.argeo.jackrabbit.remote.SimpleWebdavHandlerMapping">
+               <property name="configuration" value="/WEB-INF/webdav-config.xml" />
+               <property name="repositoryFactory" ref="repositoryFactory" />
+               <property name="sessionProvider" ref="scopedSessionProvider" />
        </bean>
 
 </beans>
\ No newline at end of file