Add dep folder

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

diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
index e24236b4125a15d351c0c46b0c3043a179867030..a1876b306385c906cec5e6ebb1495cc8cd0118f5 100644 (file)
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml
@@ -5,6 +5,12 @@
 
        <display-name>Argeo Jackrabbit Webapp</display-name>
 
+       <!-- We don't want the session-scoped JCR sessions to wait too long before 
+               being logged out. -->
+       <session-config>
+               <session-timeout>5</session-timeout>
+       </session-config>
+
        <!-- General -->
        <context-param>
                <param-name>contextConfigLocation</param-name>
@@ -37,25 +43,14 @@
 
        <servlet-mapping>
                <servlet-name>remoting</servlet-name>
-               <url-pattern>/remoting/*</url-pattern>
+               <url-pattern>/jcr/*</url-pattern>
        </servlet-mapping>
 
-       <!-- XML remoting
-       <servlet>
-               <servlet-name>xmlremoting</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
        <servlet-mapping>
-               <servlet-name>xmlremoting</servlet-name>
-               <url-pattern>*.jcr</url-pattern>
+               <servlet-name>remoting</servlet-name>
+               <url-pattern>/pub/*</url-pattern>
        </servlet-mapping>
- -->
- 
+
        <!-- WEBDAV servlet -->
        <servlet>
                <servlet-name>webdav</servlet-name>
@@ -73,39 +68,44 @@
 
        <servlet-mapping>
                <servlet-name>webdav</servlet-name>
-               <url-pattern>/webdav/*</url-pattern>
+               <url-pattern>/files/*</url-pattern>
        </servlet-mapping>
 
        <servlet-mapping>
                <servlet-name>webdav</servlet-name>
-               <url-pattern>/public/webdav/*</url-pattern>
+               <url-pattern>/public/*</url-pattern>
        </servlet-mapping>
 
-       <!-- JCR-MANAGER servlet
-       <servlet>
-               <servlet-name>jcr-manager</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>jcr-manager</servlet-name>
-               <url-pattern>/jcr-manager/*</url-pattern>
-       </servlet-mapping>
- -->
+       <!-- Security -->
+       <filter>
+               <filter-name>filterChain.davex</filter-name>
+               <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+       </filter>
+       <filter-mapping>
+               <filter-name>filterChain.davex</filter-name>
+               <url-pattern>/jcr/*</url-pattern>
+       </filter-mapping>
 
-       <!--  Security -->
        <filter>
-               <filter-name>springSecurityFilterChain</filter-name>
+               <filter-name>filterChain.private</filter-name>
                <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
        </filter>
+       <filter-mapping>
+               <filter-name>filterChain.private</filter-name>
+               <url-pattern>/files/*</url-pattern>
+       </filter-mapping>
 
+       <filter>
+               <filter-name>filterChain.public</filter-name>
+               <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+       </filter>
+       <filter-mapping>
+               <filter-name>filterChain.public</filter-name>
+               <url-pattern>/pub/*</url-pattern>
+       </filter-mapping>
        <filter-mapping>
-               <filter-name>springSecurityFilterChain</filter-name>
-               <url-pattern>/*</url-pattern>
+               <filter-name>filterChain.public</filter-name>
+               <url-pattern>/public/*</url-pattern>
        </filter-mapping>
+
 </web-app>