Menu
▾
▴
[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration web.xml.vsl
|
From: Walter M. <wal...@us...> - 2008-05-09 11:29:58
|
User: walterim
Date: 08/05/09 04:29:58
Modified: andromda-jsf2/src/main/resources/templates/jsf2/configuration
web.xml.vsl
Log:
The Trinidad filter must be loaded before the myfaces extensions filter to keep the file upload working since the myfaces extensions filter changes the form type before the Trinidad processing.
Revision Changes Path
1.16 +9 -9 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl
Index: web.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/web.xml.vsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- web.xml.vsl 16 Apr 2008 20:39:02 -0000 1.15
+++ web.xml.vsl 9 May 2008 11:29:57 -0000 1.16
@@ -237,15 +237,6 @@
</filter>
#end
#end
- <filter-mapping>
- <filter-name>MyFaces Extensions Filter</filter-name>
- <url-pattern>*.${facesServletExtension}</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>MyFaces Extensions Filter</filter-name>
- <url-pattern>/faces/*</url-pattern>
- </filter-mapping>
-
#if ($standalone)
<!-- filter-mapping merge-point -->
<filter-mapping>
@@ -278,6 +269,15 @@
#end
#end
+ <filter-mapping>
+ <filter-name>MyFaces Extensions Filter</filter-name>
+ <url-pattern>*.${facesServletExtension}</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>MyFaces Extensions Filter</filter-name>
+ <url-pattern>/faces/*</url-pattern>
+ </filter-mapping>
+
<!-- Listener, that does all the startup work (configuration, init). -->
<listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
|
