X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.jackrabbit.webapp%2FWEB-INF%2Fweb.xml;h=a1876b306385c906cec5e6ebb1495cc8cd0118f5;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=9e0a7528086ac9e9e4c1cf8d0a6058b41a8d9e04;hpb=0c7d4e488bf4e357ca33329c87a29baae63a5be9;p=lgpl%2Fargeo-commons.git

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 9e0a75280..a1876b306 100644
--- 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,7 +43,7 @@
 
 	<servlet-mapping>
 		<servlet-name>remoting</servlet-name>
-		<url-pattern>/remoting/*</url-pattern>
+		<url-pattern>/jcr/*</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
@@ -45,22 +51,6 @@
 		<url-pattern>/pub/*</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-mapping>
- -->
- 
 	<!-- WEBDAV servlet -->
 	<servlet>
 		<servlet-name>webdav</servlet-name>
@@ -78,7 +68,7 @@
 
 	<servlet-mapping>
 		<servlet-name>webdav</servlet-name>
-		<url-pattern>/webdav/*</url-pattern>
+		<url-pattern>/files/*</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
@@ -86,31 +76,36 @@
 		<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>