svn commit: r1488488 - /struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

[lukaszlenart]

Author: lukaszlenart
Date: Sat Jun  1 08:34:22 2013
New Revision: 1488488

URL: http://svn.apache.org/r1488488
Log:
WW-4089 Removes outdated configuration and used the new filters

Modified:
    
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml

Modified: 
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1488488&r1=1488487&r2=1488488&view=diff
==============================================================================
--- 
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
 (original)
+++ 
struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
 Sat Jun  1 08:34:22 2013
@@ -14,20 +14,20 @@
        
        <!-- Filters -->
        <filter>
-        <filter-name>action2-cleanup</filter-name>
-        
<filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
+        <filter-name>struts2-prepare</filter-name>
+        
<filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
     </filter>
     <filter>
         <filter-name>sitemesh</filter-name>
         
<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
     </filter>
     <filter>
-        <filter-name>action2</filter-name>
-        
<filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
+        <filter-name>struts2-execute</filter-name>
+        
<filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class>
     </filter>
        
        <filter-mapping>
-        <filter-name>action2-cleanup</filter-name>
+        <filter-name>struts2-prepare</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
     <filter-mapping>
@@ -35,7 +35,7 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
     <filter-mapping>
-        <filter-name>action2</filter-name>
+        <filter-name>struts2-execute</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>