Author: mfortun Date: 2011-05-05 12:29:44 +0200 (Thu, 05 May 2011) New Revision: 859 Url: http://nuiton.org/repositories/revision/wikitty/859 Log: * remove useless lines Removed: trunk/wikitty-publication/src/main/webapp/WEB-INF/sitemesh.xml Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml Deleted: trunk/wikitty-publication/src/main/webapp/WEB-INF/sitemesh.xml =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/sitemesh.xml 2011-05-05 09:55:52 UTC (rev 858) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/sitemesh.xml 2011-05-05 10:29:44 UTC (rev 859) @@ -1,52 +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.FastPageParser"/> - </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/wikitty-publication/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml 2011-05-05 09:55:52 UTC (rev 858) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml 2011-05-05 10:29:44 UTC (rev 859) @@ -1,83 +1,48 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Wikitty :: publication - - $Id$ - $HeadURL$ - %% - Copyright (C) 2010 CodeLutin, Benjamin Poussin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> -<web-app id="wikitty-publication" 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/dtd/web-app_2_3.dtd"> - <!-- SERVLET --> - <display-name>Wikitty Publication</display-name> - - - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>classpath*:applicationContext*.xml</param-value> - </context-param> - - <!-- Filters --> - <filter> - <filter-name>action2-cleanup</filter-name> - <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class> - </filter> - <filter> - <filter-name>sitemesh</filter-name> - <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class> - </filter> - <filter> - <filter-name>struts2</filter-name> - <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>action2-cleanup</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>struts2</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <!-- Servlets --> - <servlet> - <servlet-name>jspSupportServlet</servlet-name> - <servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class> - <load-on-startup>5</load-on-startup> - </servlet> - <!-- Welcome file lists --> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - <jsp-config> - <jsp-property-group> - <url-pattern>*.jsp</url-pattern> - <trim-directive-whitespaces>true</trim-directive-whitespaces> - </jsp-property-group> - </jsp-config> + +<web-app id="Wikitty-publication" 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"> + + + <!-- Filters --> + <filter> + <filter-name>action2-cleanup</filter-name> + <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class> + </filter> + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class> + </filter> + <filter> + <filter-name>struts2</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>action2-cleanup</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>struts2</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <!-- Servlets --> + + + <!-- Welcome file lists --> + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + + </web-app> \ No newline at end of file