diff --git a/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/web.xml b/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/web.xml
index 295cffba009..a5986312088 100644
--- a/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/web.xml
+++ b/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-2006 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -25,45 +25,164 @@
 
 <web-app>
 
+  <!-- Context Configuration ========================================== -->
+
+  <!--+
+      | Set a context property useful to allow you to ProxyPass your
+      | web application mounted to a different URI without loosing the
+      | ability to do cookie-based sessions.
+      | WARNING: this is Jetty specific!
+      +-->
+  <!--context-param>
+    <param-name>org.mortbay.jetty.servlet.SessionPath</param-name>
+    <param-value>/some/path/to/your/webapp</param-value>
+    <description>An override of the session cookie path</description>
+   </context-param-->
+   
+  <!-- Servlet Filters ================================================ -->
+  
+  <!--+
+      | Declare a filter for multipart MIME handling
+      +-->
+      
   <filter>
-    <filter-name>CocoonMultipartFilter</filter-name>
-    <display-name>Cocoon multipart filter</display-name>
-    <description>Multipart MIME handling filter for Cocoon</description>
-    <filter-class>org.apache.cocoon.servlet.multipart.MultipartFilter</filter-class>
+  	<filter-name>CocoonMultipartFilter</filter-name>
+  	<display-name>Cocoon multipart filter</display-name>
+  	<description>Multipart MIME handling filter for Cocoon</description>
+  	<filter-class>org.apache.cocoon.servlet.multipart.MultipartFilter</filter-class>
   </filter>
-  
+
+  <!--+
+      | Declare a filter for debugging incomming request
+      +-->
+      
   <filter>
-    <filter-name></filter-name>
-    <display-name>Cocoon debug filter</display-name>
-    <description>Log debug information about each request</description>
-    <filter-class>org.apache.cocoon.servlet.DebugFilter</filter-class>
+  	<filter-name></filter-name>
+  	<display-name>Cocoon debug filter</display-name>
+  	<description>Log debug information about each request</description>
+  	<filter-class>org.apache.cocoon.servlet.DebugFilter</filter-class>
   </filter>
+
+  <!-- Filter mappings ================================================ -->
   
+  <!--+
+      | Use the Cocoon multipart filter together with the Cocoon demo webapp
+      +-->
+      
   <filter-mapping>
-    <filter-name>CocoonMultipartFilter</filter-name>
-    <servlet-name>Cocoon</servlet-name>
+  	<filter-name>CocoonMultipartFilter</filter-name>
+  	<servlet-name>Cocoon</servlet-name>
   </filter-mapping>
-  
-  <!--filter-mapping>
+
+  <!--+
+      | Use the Cocoon debug filter together with the Cocoon demo webapp
+      
+  <filter-mapping>
   	<filter-name>CocoonDebugFilter</filter-name>
   	<servlet-name>Cocoon</servlet-name>
-  </filter-mapping-->
+  </filter-mapping>
+      +-->
+
+  <!-- Servlet Context Listener ======================================= -->
+  
+  <!--+
+      | Declare a context listener that sets up the Cocoon Spring bean factory
+      | and makes it available as a context parameter.
+      +-->
   
   <listener>
-    <listener-class>org.apache.cocoon.servlet.CocoonServletListener</listener-class>
+  	<listener-class>org.apache.cocoon.servlet.CocoonServletListener</listener-class>
   </listener>
   
+  <!-- Servlet Configuration ========================================== -->
+
   <servlet>
     <servlet-name>Cocoon</servlet-name>
     <display-name>Cocoon</display-name>
     <description>Cocoon demo web application</description>
+
     <servlet-class>org.apache.cocoon.servlet.SitemapServlet</servlet-class>
+
+    <!--
+      This parameter allows you to startup Cocoon2 immediately after startup
+      of your servlet engine.
+    -->
     <load-on-startup>1</load-on-startup>
   </servlet>
+  
+  <!-- URL space mappings ============================================= -->
 
+  <!--
+    Cocoon handles all the URL space assigned to the webapp using its sitemap.
+    It is recommended to leave it unchanged. Under some circumstances though
+    (like integration with proprietary webapps or servlets) you might have
+    to change this parameter.
+  -->
   <servlet-mapping>
     <servlet-name>Cocoon</servlet-name>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
 
+  <!--
+    Some servlet engines (Tomcat) have defaults which are not overriden
+    by '/' mapping, but must be overriden explicitly.
+  -->
+  <servlet-mapping>
+    <servlet-name>Cocoon</servlet-name>
+    <url-pattern>*.jsp</url-pattern>
+  </servlet-mapping>
+  <!--
+    Some servlet engines (WebLogic) have defaults which are not overriden
+    by '/' mapping, but must be overriden explicitly.
+  -->
+  <servlet-mapping>
+    <servlet-name>Cocoon</servlet-name>
+    <url-pattern>*.html</url-pattern>
+  </servlet-mapping>
+
+  <!-- various MIME type mappings ====================================== -->
+
+  <mime-mapping>
+    <extension>css</extension>
+    <mime-type>text/css</mime-type>
+  </mime-mapping>
+
+  <mime-mapping>
+    <extension>xml</extension>
+    <mime-type>text/xml</mime-type>
+  </mime-mapping>
+
+  <mime-mapping>
+    <extension>xsl</extension>
+    <mime-type>text/xml</mime-type>
+  </mime-mapping>
+
+  <mime-mapping>
+    <extension>xconf</extension>
+    <mime-type>text/xml</mime-type>
+  </mime-mapping>
+
+  <mime-mapping>
+    <extension>xmap</extension>
+    <mime-type>text/xml</mime-type>
+  </mime-mapping>
+
+  <mime-mapping>
+    <extension>ent</extension>
+    <mime-type>text/plain</mime-type>
+  </mime-mapping>
+
+  <mime-mapping>
+    <extension>grm</extension>
+    <mime-type>text/plain</mime-type>
+  </mime-mapping>
+
+
+  <!-- Sample environment entry for the NamingInputModule -->
+  <env-entry>
+    <env-entry-name>greeting</env-entry-name>
+    <env-entry-value>Hello, World</env-entry-value>
+    <env-entry-type>java.lang.String</env-entry-type>
+  </env-entry>
+
 </web-app>