Author: echatellier Date: 2011-05-27 14:09:21 +0200 (Fri, 27 May 2011) New Revision: 60 Url: http://chorem.org/repositories/revision/vradi/60 Log: Fix sitemesh configuration Removed: trunk/vradi-web/src/main/webapp/WEB-INF/sitemesh.xml Modified: trunk/vradi-web/src/main/webapp/WEB-INF/decorators.xml trunk/vradi-web/src/main/webapp/WEB-INF/web.xml Modified: trunk/vradi-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/decorators.xml 2011-05-27 09:38:29 UTC (rev 59) +++ trunk/vradi-web/src/main/webapp/WEB-INF/decorators.xml 2011-05-27 12:09:21 UTC (rev 60) @@ -6,7 +6,7 @@ <pattern>/img/*</pattern> <pattern>/css/*</pattern> <pattern>/WEB-INF/jsp/inc/*</pattern> - <pattern>index.html</pattern> + <pattern>/index.html</pattern> </excludes> <!-- Any urls that are excluded will never be decorated by Sitemesh --> Deleted: trunk/vradi-web/src/main/webapp/WEB-INF/sitemesh.xml =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/sitemesh.xml 2011-05-27 09:38:29 UTC (rev 59) +++ trunk/vradi-web/src/main/webapp/WEB-INF/sitemesh.xml 2011-05-27 12:09:21 UTC (rev 60) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<sitemesh> - <property name="decorators-file" value="/WEB-INF/decorators.xml"/> - <excludes file="${decorators-file}"/> - - <page-parsers> - <parser content-type="text/html" - class="com.opensymphony.module.sitemesh.parser.HTMLPageParser"/> - <parser content-type="text/html;charset=ISO-8859-1" - class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" /> - <parser content-type="text/html; charset=UTF-8" - class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" /> - </page-parsers> - - <decorator-mappers> - - <mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper"> - <param name="property.1" value="meta.decorator"/> - <param name="property.2" value="decorator"/> - </mapper> - - <mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper"> - </mapper> - - <mapper class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper"> - <param name="match.MSIE" value="ie"/> - <param name="match.Mozilla [" value="ns"/> - <param name="match.Opera" value="opera"/> - <param name="match.Lynx" value="lynx"/> - </mapper> - - <mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper"> - <param name="decorator" value="printable"/> - <param name="parameter.name" value="printable"/> - <param name="parameter.value" value="true"/> - </mapper> - - <mapper class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper"> - <param name="decorator" value="robot"/> - </mapper> - - <mapper class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper"> - <param name="decorator.parameter" value="decorator"/> - <param name="parameter.name" value="confirm"/> - <param name="parameter.value" value="true"/> - </mapper> - - <mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper"> - <param name="config" value="${decorators-file}"/> - </mapper> - - </decorator-mappers> - -</sitemesh> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-27 09:38:29 UTC (rev 59) +++ trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-27 12:09:21 UTC (rev 60) @@ -1,24 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="vradi" 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"> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <display-name>Vradi</display-name> - <!-- Filters --> - <!--filter> - <filter-name>sitemesh</filter-name> - <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> - </filter--> + <filter> - <filter-name>struts2</filter-name> - <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> + <filter-name>struts-prepare</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class> </filter> - <!--filter-mapping> - <filter-name>sitemesh</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping--> + + <filter> + <filter-name>struts-execute</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class> + </filter> + + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> + </filter> + <filter-mapping> - <filter-name>struts2</filter-name> + <filter-name>struts-prepare</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> + + <filter-mapping> + <filter-name>sitemesh</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-execute</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <listener> + <listener-class>org.apache.struts2.dispatcher.ng.listener.StrutsListener</listener-class> + </listener> + <!-- Welcome file lists --> <welcome-file-list> <welcome-file>index.html</welcome-file>