r1214 - in trunk/wikitty-publication-ui/src/main: resources webapp/WEB-INF webapp/WEB-INF/decorators webapp/WEB-INF/jsp
Author: mfortun Date: 2011-08-30 16:31:06 +0200 (Tue, 30 Aug 2011) New Revision: 1214 Url: http://nuiton.org/repositories/revision/wikitty/1214 Log: sitemesh *remove cajo server from properties Added: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml Modified: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp Modified: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties 2011-08-30 14:10:58 UTC (rev 1213) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties 2011-08-30 14:31:06 UTC (rev 1214) @@ -24,7 +24,6 @@ ### wikitty.data.directory=target/wikitty-pub-storage -wikitty.service.server.url=http://localhost:1111/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db @@ -40,8 +39,7 @@ org.nuiton.wikitty.publication.WikittyPublicationFallbackService,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceSecurity,\ -org.nuiton.wikitty.services.WikittyServiceAccessStat,\ -org.nuiton.wikitty.services.WikittyServiceCajoServer +org.nuiton.wikitty.services.WikittyServiceAccessStat wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ Added: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp (rev 0) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 14:31:06 UTC (rev 1214) @@ -0,0 +1,63 @@ +<!-- + #%L + bow + + $Id: main.jsp 319 2011-08-21 18:31:08Z bpoussin $ + $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/webapp/WEB-INF/decorator... $ + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + +<!--DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"--> + +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %> +<%@taglib prefix="s" uri="/struts-tags" %> +<%@taglib prefix="sj" uri="/struts-jquery-tags" %> + +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> + <head> + <title>Wikitty Publication : <decorator:title default="Bow" /></title> + <decorator:head /> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="Bookmarks on the web" /> + <s:url var="temporaryXml" action="temporaryXml" /> + <s:url var="permanentXml" action="permanentXml" /> + <s:url var="favicon" value="/img/favicon.png" /> + <link rel="icon" type="image/png" href="${favicon}" /> + + + <sj:head/> + + + </head> + <body id="page-home"> + <div id="wrap"> + <div id="page"> + <%@include file="/WEB-INF/jsp/header.jsp" %> + <div id="main"> + <decorator:body /> + </div> + </div> + </div> + <%@include file="/WEB-INF/jsp/footer.jsp" %> + </body> +</html> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 14:10:58 UTC (rev 1213) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 14:31:06 UTC (rev 1214) @@ -10,5 +10,7 @@ </excludes> - + <decorator name="sitemesh" page="sitemesh.jsp"> + <pattern>/*</pattern> + </decorator> </decorators> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 14:10:58 UTC (rev 1213) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 14:31:06 UTC (rev 1214) @@ -24,10 +24,15 @@ --> <%-- Document : footer - Created on : 6 d�c. 2010, 19:21:22 + Created on : 6 d�c. 2010, 19:21:22 Author : poussin --%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> +<div id="footer" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + + <div id="copyright"> Copyright Code Lutin 2010, AGPLv3 </div> +</div> -<div id="copyright"> Copyright Code Lutin 2010, AGPLv3 </div> - </body> -</html> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 14:10:58 UTC (rev 1213) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 14:31:06 UTC (rev 1214) @@ -27,15 +27,21 @@ Created on : 6 déc. 2010, 19:21:06 Author : poussin --%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> +<div id="header" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Wikitty</title> - <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/css/wikitty-publication.css"> - </head> - <body> + + <div id="msg"> + <span id="actionmessageHeader"> + <s:actionmessage /> + </span> + <span id="actionerrorHeader"> + <s:actionerror /> + </span> + </div> +</div> + \ No newline at end of file Added: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml (rev 0) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml 2011-08-30 14:31:06 UTC (rev 1214) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + #%L + bow + + $Id: sitemesh.xml 192 2011-02-14 14:53:06Z tchemit $ + $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/webapp/WEB-INF/sitemesh.... $ + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + + +<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>
participants (1)
-
mfortun＠users.nuiton.org