You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by ml...@apache.org on 2013/08/01 16:52:15 UTC

[05/13] git commit: TAP5-2153 Adapt quickstart archetype generated sources to be bootstrap and 5.4 compatibile update web.xml to use servlet spec 2.4

TAP5-2153 Adapt quickstart archetype generated sources to be bootstrap and 5.4 compatibile
update web.xml to use servlet spec 2.4


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2d4e0093
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2d4e0093
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2d4e0093

Branch: refs/heads/master
Commit: 2d4e00932e18893049666d6ca8117163791d1238
Parents: 1a19ad2
Author: Massimo Lusetti <ml...@apache.org>
Authored: Thu Aug 1 16:27:21 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Thu Aug 1 16:27:21 2013 +0200

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/web.xml             | 36 +++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2d4e0093/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 6ec11a0..bdac553 100644
--- a/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -1,15 +1,19 @@
 <?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>
+
+<web-app 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"
+    version="2.4">
+
     <display-name>${artifactId} Tapestry 5 Application</display-name>
     <context-param>
-        <!-- The only significant configuration for Tapestry 5, this informs Tapestry
-of where to look for pages, components and mixins. -->
+        <!--
+        The only significant configuration for Tapestry 5, this informs Tapestry
+        of where to look for pages, components and mixins.
+        -->
         <param-name>tapestry.app-package</param-name>
         <param-value>${package}</param-value>
     </context-param>
+
     <!--
     Specify some additional Modules for two different execution
     modes: development and qa.
@@ -27,18 +31,24 @@ of where to look for pages, components and mixins. -->
             ${package}.services.QaModule
         </param-value>
     </context-param>
+
+
+    <!-- Filter configuration -->
     <filter>
         <filter-name>app</filter-name>
         <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
     </filter>
+
     <filter-mapping>
         <filter-name>app</filter-name>
         <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>ERROR</dispatcher>
     </filter-mapping>
-    
-    <welcome-file-list>
-        <welcome-file>index</welcome-file>
-    </welcome-file-list>
-    
-</web-app>
-      
+
+    <error-page>
+        <error-code>404</error-code>
+        <location>/error404</location>
+    </error-page>
+
+</web-app>
\ No newline at end of file