Author: sletellier Date: 2011-05-27 11:38:29 +0200 (Fri, 27 May 2011) New Revision: 59 Url: http://chorem.org/repositories/revision/vradi/59 Log: Failed to use sitemesh :( Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LocaleAction.java trunk/vradi-web/src/main/webapp/WEB-INF/decorators.xml trunk/vradi-web/src/main/webapp/WEB-INF/jsp/decorators/ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/decorators/main.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/errorFrame.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/footer.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp trunk/vradi-web/src/main/webapp/WEB-INF/sitemesh.xml trunk/vradi-web/src/main/webapp/css/global.css Modified: trunk/pom.xml trunk/vradi-web/pom.xml trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties trunk/vradi-web/src/main/resources/log4j.properties trunk/vradi-web/src/main/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp trunk/vradi-web/src/main/webapp/WEB-INF/web.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-27 09:22:54 UTC (rev 58) +++ trunk/pom.xml 2011-05-27 09:38:29 UTC (rev 59) @@ -465,6 +465,12 @@ <version>${struts2Version}</version> </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + <!-- Displaytag --> <dependency> <groupId>displaytag</groupId> Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-05-27 09:22:54 UTC (rev 58) +++ trunk/vradi-web/pom.xml 2011-05-27 09:38:29 UTC (rev 59) @@ -123,6 +123,12 @@ <artifactId>xwork-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <scope>runtime</scope> + </dependency> + <!-- Displaytag --> <dependency> <groupId>displaytag</groupId> @@ -260,6 +266,9 @@ <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sj> <displaytag>http://displaytag.sourceforge.net/1.2/#displaytag.tld</displaytag> <jsp>http://java.sun.com/JSP/Page</jsp> + <decorator> + http://www.opensymphony.com/sitemesh/decorator + </decorator> </namespaces> </configuration> </execution> Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-05-27 09:22:54 UTC (rev 58) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-05-27 09:38:29 UTC (rev 59) @@ -1,6 +1,5 @@ package org.chorem.vradi; -import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -8,16 +7,8 @@ import org.apache.commons.logging.LogFactory; import org.chorem.vradi.entities.VradiUser; import org.chorem.vradi.services.VradiDataService; -import org.chorem.vradi.services.VradiDataServiceImpl; import org.chorem.vradi.services.VradiServiceFactory; -import org.nuiton.i18n.I18n; -import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfigOption; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyServiceFactory; -import org.nuiton.wikitty.entities.WikittyUser; /** * Classe utilisee pour stocker les objets utils en session utilisateur @@ -47,7 +38,7 @@ // on refait l'init :( ? et surtout il faut que // chaque user est sa propre langue. // init I18n - I18n.init(new DefaultI18nInitializer("vradi-i18n", getClass().getClassLoader(), "/"), null); +// I18n.init(new DefaultI18nInitializer("vradi-i18n", getClass().getClassLoader(), "/"), null); } /** Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LocaleAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LocaleAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LocaleAction.java 2011-05-27 09:38:29 UTC (rev 59) @@ -0,0 +1,12 @@ +package org.chorem.vradi.actions; + +/** + * @author sletellier + */ +public class LocaleAction extends VradiBaseAction { + private static final long serialVersionUID = 9124549040894568467L; + + public String execute() { + return SUCCESS; + } +} Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-27 09:22:54 UTC (rev 58) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-27 09:38:29 UTC (rev 59) @@ -14,7 +14,7 @@ vradi.login.email=Email vradi.login.password=Password vradi.login.repeatPassword=Confirm -vradi.login.submit=Please retape your password +vradi.login.submit=Connection vradi.login.title=Connection vradi.register.mailEmail=Your email vradi.register.mailHi=Hello @@ -26,4 +26,10 @@ vradi.search.title=Search vradi.form.object=Object vradi.form.creationDate=Creation date -vradi.search.formNoteEdit=Notes edition \ No newline at end of file +vradi.search.formNoteEdit=Notes edition +vradi.title=Vradi Web +vradi.footer.license=Licence AGPL +vradi.footer.bugreport=Bug report +vradi.footer.userSupport=User support +vradi.action.locale.english=English +vradi.action.locale.french=French \ No newline at end of file Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties =================================================================== --- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-27 09:22:54 UTC (rev 58) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-27 09:38:29 UTC (rev 59) @@ -1,3 +1,5 @@ +vradi.action.locale.english=Anglais +vradi.action.locale.french=Français vradi.authentification.error=Erreur lors de l'authentification vradi.config.configFileName.description=Fichier de configuration de Vradi web vradi.config.database.version.description=Version de la base de donnée @@ -6,6 +8,9 @@ vradi.config.ui.locale=Locale de l'instance de Vradi web vradi.config.version.description=Version de Vradi web vradi.error.internal=Une erreur interne est survenue, merci de contacter un administrateur si cette erreur persiste +vradi.footer.bugreport=Rapport de bug +vradi.footer.license=Licence AGPL +vradi.footer.userSupport=Support utilisateur vradi.forgotPassword.emailDoesntExist=Cette adresse email n'existe pas vradi.forgotpwd.submit=Envoyer vradi.forgotpwd.title=Vous avez oublié votre mot de passe ? @@ -14,7 +19,7 @@ vradi.login.email=Email vradi.login.password=Mot de passe vradi.login.repeatPassword=Confiramtion -vradi.login.submit=Veuillez retaper votre mot de passe +vradi.login.submit=Connection vradi.login.title=Connection vradi.register.emailAldyUsed=Cette adresse email est déjà utilisée vradi.register.invalidLogin=Une erreur s'est produite pendant l'enregistrement de vos informations, merci d'essayer à nouveau @@ -28,3 +33,4 @@ vradi.search.formNoteEdit=Edition des notes vradi.search.submit=Rechercher vradi.search.title=Recherche +vradi.title=Vradi Web Modified: trunk/vradi-web/src/main/resources/log4j.properties =================================================================== --- trunk/vradi-web/src/main/resources/log4j.properties 2011-05-27 09:22:54 UTC (rev 58) +++ trunk/vradi-web/src/main/resources/log4j.properties 2011-05-27 09:38:29 UTC (rev 59) @@ -10,3 +10,5 @@ log4j.logger.org.chorem.vradi=DEBUG #log4j.logger.org.nuiton.util.TimeLog=WARN log4j.logger.org.apache.struts2.dispatcher.mapper=DEBUG +log4j.logger.com.opensymphony.sitemesh=DEBUG + Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-05-27 09:22:54 UTC (rev 58) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-27 09:38:29 UTC (rev 59) @@ -90,6 +90,17 @@ </package> <package name="misc" extends="restrictedArea"> + + <!-- + | Change local + +--> + <action name="locale" class="org.chorem.vradi.actions.LocaleAction"> + <result type="redirect">search.action</result> + </action> + + <!-- + | Search + +--> <action name="search" class="org.chorem.vradi.actions.SearchAction"> <result>/WEB-INF/jsp/search.jsp</result> <result name="input" type="redirectAction">search</result> Added: trunk/vradi-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/decorators.xml (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/decorators.xml 2011-05-27 09:38:29 UTC (rev 59) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<decorators defaultdir="/WEB-INF/jsp/decorators"> + <!-- Any urls that are excluded will never be decorated by Sitemesh --> + <excludes> + <pattern>/img/*</pattern> + <pattern>/css/*</pattern> + <pattern>/WEB-INF/jsp/inc/*</pattern> + <pattern>index.html</pattern> + </excludes> + + <!-- Any urls that are excluded will never be decorated by Sitemesh --> + <decorator name="main" page="main.jsp"> + <pattern>/*</pattern> + </decorator> + +</decorators> Added: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/decorators/main.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/decorators/main.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/decorators/main.jsp 2011-05-27 09:38:29 UTC (rev 59) @@ -0,0 +1,29 @@ +<%@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" %> +<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>Vradi web : <decorator:title default="Vradi web" /></title> + <decorator:head /> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <s:url var="globalCSS" value="/css/global.css" /> + <link href="${globalCSS}" rel="stylesheet" type="text/css" media="all" /> + </head> + <body id="page-home"> + <script type="text/javascript">window.status = "Loading: <decorator:title default="Vradi web" />...";</script> + <div id="wrap"> + <div id="page"> + <%@include file="/WEB-INF/jsp/inc/header.jsp" %> + <div id="main"> + <%@include file="/WEB-INF/jsp/inc/errorFrame.jsp" %> + <decorator:body /> + </div> + </div> + </div> + <%@include file="/WEB-INF/jsp/inc/footer.jsp" %> + </body> +</html> \ No newline at end of file Added: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/errorFrame.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/errorFrame.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/errorFrame.jsp 2011-05-27 09:38:29 UTC (rev 59) @@ -0,0 +1,13 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + + <% + String userError = (String)request.getAttribute("errorMsgUser"); + String techError = (String)request.getAttribute("errorMsgTech"); + + if (userError != null) { + %> + <div class="menu clearfix"> + <h2>Error</h2> + </div> + <pre class="error"><%=userError%><% if (techError != null) { %><br /><br />Detailed error :<br /><%=techError%><% } %></pre> + <% } %> Added: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/footer.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/footer.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/footer.jsp 2011-05-27 09:38:29 UTC (rev 59) @@ -0,0 +1,24 @@ +<%@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"> + <p> + <a shape="rect" href="http://www.chorem.org/projects/show/vradi">Vradi</a> + <a shape="rect" href="http://www.chorem.org/projects/list_files/vradi"></a> - + <a shape="rect" href="http://www.gnu.org/licenses/agpl.html"><s:text name="vradi.footer.license" /></a> - + <span title="Copyright">©2011</span> + <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - + <a shape="rect" href="http://www.chorem.org/projects/vradi/issues"><s:text name="vradi.footer.bugreport" /></a> - + <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/vradi-users"><s:text name="vradi.footer.userSupport" /></a> - + <s:url var="localeEN"> + <s:param name="request_locale">en_GB</s:param> + </s:url> + <s:url var="localeFR"> + <s:param name="request_locale">fr_FR</s:param> + </s:url> + <s:a href="%{localeEN}"><s:text name="vradi.action.locale.english" /></s:a> - + <s:a href="%{localeFR}"><s:text name="vradi.action.locale.french" /></s:a> + </p> +</div> \ No newline at end of file Added: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-05-27 09:38:29 UTC (rev 59) @@ -0,0 +1,17 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> +<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"> + <div> + <title><s:text name="vradi.title" /></title> + </div> + <div id="msg"> + <span id="actionmessageHeader"> + <s:actionmessage /> + </span> + <span id="actionerrorHeader"> + <s:actionerror /> + </span> + </div> +</div> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp 2011-05-27 09:22:54 UTC (rev 58) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp 2011-05-27 09:38:29 UTC (rev 59) @@ -12,14 +12,15 @@ <div id="formFrame" class="fond"> <h1><s:text name="vradi.login.title" /></h1> <br/> - <br/> <s:actionerror /> - <s:form action="login"> - <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> - <s:password key="vradi.login.password" name="password" labelposition="top" labelSeparator=" :" /> + <s:form action="login" theme="simple"> + <s:text name="vradi.login.email"/><br/> + <s:textfield name="email" labelposition="top" labelSeparator=" :" /><br/> + <s:text name="vradi.login.password"/><br/> + <s:password name="password" labelposition="top" labelSeparator=" :" /><br/> <s:submit key="vradi.login.submit" name="submit" /> </s:form> - <s:a action="register_input" id="registerLink"><s:text name="vradi.register.title" /></s:a><br /> + <s:a action="register_input" id="registerLink"><s:text name="vradi.register.title" /></s:a><br/> <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="vradi.forgotpwd.title" /></s:a> </div> </div> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-27 09:22:54 UTC (rev 58) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-27 09:38:29 UTC (rev 59) @@ -14,8 +14,8 @@ <s:head /> </head> <body> - <s:form id="searchForm" action="search" method="post"> - <s:textarea id="searchArea" name="query"/> + <s:form id="searchForm" action="search" method="post" theme="simple"> + <s:textarea id="searchArea" name="query"/><br/> <s:submit key="vradi.search.submit" name="submit"/> </s:form> <displaytag:table name="forms" Added: trunk/vradi-web/src/main/webapp/WEB-INF/sitemesh.xml =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/sitemesh.xml (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/sitemesh.xml 2011-05-27 09:38:29 UTC (rev 59) @@ -0,0 +1,55 @@ +<?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:22:54 UTC (rev 58) +++ trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-27 09:38:29 UTC (rev 59) @@ -1,34 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - bow - $Id: web.xml 280 2011-05-05 09:32:39Z echatellier $ - $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/webapp/WEB-INF/web.xml $ - %% - Copyright (C) 2010 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% - --> -<web-app id="bow" 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"> - <display-name>Bow</display-name> +<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"> + <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> + <!--filter-mapping> + <filter-name>sitemesh</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping--> <filter-mapping> <filter-name>struts2</filter-name> <url-pattern>/*</url-pattern>