--- web.xml	2006-06-07 17:29:37.630750000 +1000
+++ web.xml	2006-06-15 15:37:02.871750000 +1000
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-
-    <display-name>Confluence</display-name>
-    <description>Confluence Web App</description>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="ConfluenceWebApp" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    <description>Confluence Web App</description>
+    <display-name>Confluence</display-name>

     <context-param>
         <param-name>contextConfigLocation</param-name>
@@ -281,11 +280,15 @@
     <filter-mapping>
         <filter-name>login</filter-name>
         <url-pattern>/*</url-pattern>
+	<dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
     </filter-mapping>

     <filter-mapping>
         <filter-name>security</filter-name>
         <url-pattern>/*</url-pattern>
+	<dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
     </filter-mapping>

     <!-- Must go after seraph -->
@@ -347,22 +350,32 @@
     <filter-mapping>
         <filter-name>sitemesh</filter-name>
         <url-pattern>*.action</url-pattern>
+	<dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
     <filter-mapping>
         <filter-name>sitemesh</filter-name>
         <url-pattern>*.vm</url-pattern>
+	<dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
     <filter-mapping>
         <filter-name>sitemesh</filter-name>
         <url-pattern>/display/*</url-pattern>
+	<dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
     <filter-mapping>
         <filter-name>sitemesh</filter-name>
         <url-pattern>/label/*</url-pattern>
+	<dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
     <filter-mapping>
         <filter-name>sitemesh</filter-name>
         <url-pattern>/label/*</url-pattern>
+	<dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
     </filter-mapping>

     <filter-mapping>
