May 2011 - Vradi-commits - mailman.cloud.codelutin.com

r42 - in trunk: . vradi-web/src/main/java/org/chorem/vradi/actions
by sletellier＠users.chorem.org May 23, 2011

May 23, 2011

Author: sletellier Date: 2011-05-23 09:51:55 +0200 (Mon, 23 May 2011) New Revision: 42 Url: http://chorem.org/repositories/revision/vradi/42 Log: - Up to jrst 1.3.1-SNAPSHOT - Use jrst to render text content in FormNote Modified: trunk/pom.xml trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-23 07:46:10 UTC (rev 41) +++ trunk/pom.xml 2011-05-23 07:51:55 UTC (rev 42) @@ -115,7 +115,7 @@ <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> <generatorPluginVersion>2.3.3</generatorPluginVersion> <wikittyVersion>3.1.3-SNAPSHOT</wikittyVersion> - <jrstVersion>1.3</jrstVersion> + <jrstVersion>1.3.1-SNAPSHOT</jrstVersion> <oooVersion>3.2.1</oooVersion> <javamailVersion>1.4.3</javamailVersion> <slf4jVersion>1.6.1</slf4jVersion> Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-23 07:46:10 UTC (rev 41) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-23 07:51:55 UTC (rev 42) @@ -95,8 +95,8 @@ partners = proxy.restore(VradiUser.class, formNote.getPartners()); // TODO evolution JRST: permettre l'entre String/StringBuffer/Reader, et la sortie String/StringBuffer/Writer pour generate -// summary = JRST.generate(JRST.TYPE_HTML, formNote.getSummary()); -// content = JRST.generate(JRST.TYPE_HTML, formNote.getContent()); + summary = JRST.generate(JRST.TYPE_HTML, formNote.getSummary()); + content = JRST.generate(JRST.TYPE_HTML, formNote.getContent()); summary = formNote.getSummary(); content = formNote.getContent();

1 0

r41 - in trunk: . vradi-web vradi-web/src/main/resources/i18n
by sletellier＠users.chorem.org May 23, 2011

May 23, 2011

Author: sletellier Date: 2011-05-23 09:46:10 +0200 (Mon, 23 May 2011) New Revision: 41 Url: http://chorem.org/repositories/revision/vradi/41 Log: Fix build Modified: trunk/pom.xml trunk/vradi-web/pom.xml trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-21 15:56:19 UTC (rev 40) +++ trunk/pom.xml 2011-05-23 07:46:10 UTC (rev 41) @@ -114,7 +114,8 @@ <nuitonI18nVersion>2.4</nuitonI18nVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> <generatorPluginVersion>2.3.3</generatorPluginVersion> - <wikittyVersion>3.1.2</wikittyVersion> + <wikittyVersion>3.1.3-SNAPSHOT</wikittyVersion> + <jrstVersion>1.3</jrstVersion> <oooVersion>3.2.1</oooVersion> <javamailVersion>1.4.3</javamailVersion> <slf4jVersion>1.6.1</slf4jVersion> @@ -214,6 +215,12 @@ </dependency> <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + <version>${jrstVersion}</version> + </dependency> + + <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx-core</artifactId> <version>1.6.2-2</version> Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-05-21 15:56:19 UTC (rev 40) +++ trunk/vradi-web/pom.xml 2011-05-23 07:46:10 UTC (rev 41) @@ -148,6 +148,11 @@ </dependency> <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <scope>runtime</scope> 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-21 15:56:19 UTC (rev 40) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-23 07:46:10 UTC (rev 41) @@ -1,3 +1,4 @@ +vradi.authentification.error= vradi.config.configFileName.description=Fichier de configuration de Vradi web vradi.config.database.version.description=Version de la base de donnée vradi.config.last.version.description=Dernière version de Vradi web lancée

1 0

r40 - in trunk/vradi-web/src/main: java/org/chorem/vradi/actions resources webapp/WEB-INF webapp/WEB-INF/jsp webapp/jsp
by bpoussin＠users.chorem.org May 21, 2011

May 21, 2011

Author: bpoussin Date: 2011-05-21 17:56:19 +0200 (Sat, 21 May 2011) New Revision: 40 Url: http://chorem.org/repositories/revision/vradi/40 Log: - deplacement des jsp dans WEB-INF pour eviter qu'on y arrive sans passer par le controleur - debut d'implantation des actions et jsp pour la creation de notes pour les formulaires (aka reponse AO) Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java trunk/vradi-web/src/main/webapp/WEB-INF/jsp/ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp Removed: trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp trunk/vradi-web/src/main/webapp/jsp/login.jsp trunk/vradi-web/src/main/webapp/jsp/register.jsp trunk/vradi-web/src/main/webapp/jsp/search.jsp Modified: trunk/vradi-web/src/main/resources/struts.xml Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,110 @@ +package org.chorem.vradi.actions; + +import com.opensymphony.xwork2.ActionContext; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.vradi.entities.Attachment; +import org.chorem.vradi.entities.FormNote; +import org.chorem.vradi.entities.FormNoteImpl; +import org.chorem.vradi.entities.VradiUser; +import org.nuiton.jrst.JRST; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class FormNoteAction extends VradiBaseAction { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(FormNoteAction.class); + + static public FormNoteAction getAction() { + return (FormNoteAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + + /** used form new formNote */ + protected String formId; + /** id of formNote to display or new to create new formNote */ + protected String formNoteId; + /** formNote corresponding with id if not equals to 'new' */ + protected FormNote formNote; + /** partners for this formNote */ + protected Set<VradiUser> partners; + /** summary of this formNote in HTML format */ + protected String summary; + /** content of this formNote in HTML format */ + protected String content; + /** les fichiers attache a cette note */ + protected PagedResult<Attachment> attachments; + + public String getFormId() { + return formId; + } + + public void setFormId(String formId) { + this.formId = formId; + } + + public String getFormNoteId() { + return formNoteId; + } + + public void setFormNoteId(String formNoteId) { + this.formNoteId = formNoteId; + } + + public FormNote getFormNote() { + return formNote; + } + + public Set<VradiUser> getPartners() { + return partners; + } + + public String getSummary() { + return summary; + } + + public String getContent() { + return content; + } + + public PagedResult<Attachment> getAttachments() { + return attachments; + } + + @Override + public String execute() throws Exception { + WikittyProxy proxy = getProxy(); + formNote = proxy.restore(FormNote.class, getFormNoteId()); + if (formNote == null) { + formNote = new FormNoteImpl(); + formNote.setForm(getFormId()); + formNote.addPartners(proxy.getUser().getWikittyId()); + } + + partners = proxy.restore(VradiUser.class, formNote.getPartners()); + + // TODO evolution JRST: permettre l'entre String/StringBuffer/Reader, et la sortie String/StringBuffer/Writer pour generate +// summary = JRST.generate(JRST.TYPE_HTML, formNote.getSummary()); +// content = JRST.generate(JRST.TYPE_HTML, formNote.getContent()); + summary = formNote.getSummary(); + content = formNote.getContent(); + + Criteria criteria = Search.query() + .eq(Attachment.FQ_FIELD_ATTACHMENT_FORMNOTE, getFormNoteId()) + .criteria().addSortDescending(Attachment.FQ_FIELD_ATTACHMENT_DATE); + attachments = proxy.findAllByCriteria(Attachment.class, criteria); + + return SUCCESS; + } +} Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteListAction.java 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,60 @@ +package org.chorem.vradi.actions; + +import com.opensymphony.xwork2.ActionContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.vradi.entities.FormNote; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class FormNoteListAction extends VradiBaseAction { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(FormNoteListAction.class); + + static public FormNoteListAction getAction() { + return (FormNoteListAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + + protected String formId; + protected PagedResult<FormNote> formNotes; + + public String getFormId() { + return formId; + } + + public void setFormId(String formId) { + this.formId = formId; + } + + public PagedResult<FormNote> getFormNotes() { + return formNotes; + } + + @Override + public String execute() throws Exception { + WikittyProxy proxy = getProxy(); + WikittyUser user = proxy.getUser(); + log.info("current user: " + user); + + Criteria criteria = Search.query() + .eq(FormNote.FQ_FIELD_FORMNOTE_FORM, getFormId()) + .eq(FormNote.FQ_FIELD_FORMNOTE_PARTNERS, user.getWikittyId()) + .criteria().addSortAscending(FormNote.FQ_FIELD_FORMNOTE_CREATIONDATE); + + formNotes = proxy.findAllByCriteria(FormNote.class, criteria); + return SUCCESS; + } + +} Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-21 15:56:19 UTC (rev 40) @@ -55,15 +55,15 @@ <package name="login" extends="loginArea"> <action name="register_*" method="{1}" class="org.chorem.vradi.actions.RegisterAction"> - <result name="input">/jsp/register.jsp</result> + <result name="input">/WEB-INF/jsp/register.jsp</result> <result type="redirectAction">search</result> </action> <action name="forgotPassword_*" method="{1}" class="org.chorem.vradi.actions.ForgotPasswordAction"> - <result name="input">/jsp/forgotPassword.jsp</result> + <result name="input">/WEB-INF/jsp/forgotPassword.jsp</result> <result type="redirectAction">login_input</result> </action> <action name="login_*" method="{1}" class="org.chorem.vradi.actions.LoginAction"> - <result name="input">/jsp/login.jsp</result> + <result name="input">/WEB-INF/jsp/login.jsp</result> <result name="login" type="redirectAction">search</result> <result type="redirectAction">search</result> </action> @@ -74,9 +74,24 @@ <package name="misc" extends="restrictedArea"> <action name="search" class="org.chorem.vradi.actions.SearchAction"> - <result>/jsp/search.jsp</result> + <result>/WEB-INF/jsp/search.jsp</result> <result name="input" type="redirectAction">search</result> </action> +  + <action name="formNoteList/*" class="org.chorem.vradi.actions.FormNoteListAction"> + <param name="formId">{1}</param> + <result>/WEB-INF/jsp/formNoteList.jsp</result> + </action> +  + <action name="formNote/*" class="org.chorem.vradi.actions.FormNoteAction"> + <param name="formNoteId">{1}</param> + <result>/WEB-INF/jsp/formNote.jsp</result> + </action> </package> - + </struts> Copied: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp (from rev 34, trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp) =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,24 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@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"> + <head> + <title><s:text name="vradi.forgotpwd.title" /></title> + <s:head /> + </head> + <body> + <div id="content"> + <div id="formFrame fond"> + <h1><s:text name="vradi.forgotpwd.title" /></h1> + <s:form action="forgotPassword"> + <p> + <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:submit key="vradi.forgotpwd.submit" name="submit" /> + </p> + </s:form> + <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a> + </div> + </div> + </body> +</html> Added: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,65 @@ +<%-- + Document : formNote + Created on : 21 mai 2011, 11:53:26 + Author : poussin +--%> + +<%@page import="org.chorem.vradi.entities.Attachment"%> +<%@page import="org.chorem.vradi.entities.FormNote"%> +<%@page import="org.chorem.vradi.actions.FormNoteAction"%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> + +<% +FormNoteAction action = FormNoteAction.getAction(); +FormNote note = action.getFormNote(); +%> + +<!DOCTYPE html> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title><s:text name="vradi.formNote.title" /></title> + </head> + <body> + <h1><s:text name="vradi.formNote.title" /></h1> + + <div> + <s:a action="formNoteEdit/<%=note.getWikittyId()%>?state=close"><s:text name="vradi.formNote.close" /></s:a> + <s:a action="delete/<%=note.getWikittyId()%>"><s:text name="vradi.delete" /></s:a> + </div> + + <div> + <% for (String h : note.getHistory()) { %> + <div><%=h%></div> + <% } %> + </div> + + <div> + <s:select list="partners"/> + <s:a action="seekPartners/<%=note.getWikittyId()%>"><s:text name="vradi.formNote.seekPartners" /></s:a> + <s:checkbox label="seeking partners" fieldValue="note.seekingPartners"/> + </div> + + <div> + <%=action.getSummary()%> + <div><s:a action="editText?id=<%=note.getWikittyId()%>&field=<%=FormNote.FQ_FIELD_FORMNOTE_SUMMARY%>" label="vradi.text.edit"/></div> + </div> + + <div> + <%=action.getContent()%> + <div><s:a action="editText?id=<%=note.getWikittyId()%>&field=<%=FormNote.FQ_FIELD_FORMNOTE_CONTENT%>" label="vradi.text.edit"/></div> + </div> + + <div> + <ul> + <% for (Attachment a : action.getAttachments()) { %> + <li><%=a.getDate()%> <%=a.getName()%> + <s:a action="" label="vradi.attachment.update"></s:a> + <s:a action="" label="vradi.attachment.history"></s:a> + <s:a action="" label="vradi.attachment.delete"></s:a></li> + <% } %> + </ul> + </div> + </body> +</html> Added: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,32 @@ +<%-- + Document : formNoteList + Created on : 21 mai 2011, 11:39:21 + Author : poussin +--%> + +<%@page import="org.chorem.vradi.entities.FormNote"%> +<%@page import="org.chorem.vradi.actions.FormNoteListAction"%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> + +<% +FormNoteListAction action = FormNoteListAction.getAction(); +%> + +<!DOCTYPE html> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title><s:text name="vradi.formNoteList.title" /></title> + </head> + <body> + <h1><s:text name="vradi.formNoteList.title" /></h1> + + <ul> + <% for (FormNote note : action.getFormNotes()) { %> + <li><s:a action="formNote/<%=note.getWikittyId()%>"><%=note.getCreationDate()%> <%=note.getSummary()%></s:a></li> + <% } %> + <li><s:a action="formNote/new?formId=<%=action.getFormId()%>"><s:text name="vradi.new.formNote"/></s:a></li> + </ul> + </body> +</html> Copied: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp (from rev 34, trunk/vradi-web/src/main/webapp/jsp/login.jsp) =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/login.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,27 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="vradi.login.title" /></title> + <s:head /> + </head> + <body> + <div id="content"> + <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: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="forgotPassword_input" id="forgotPwd"><s:text name="vradi.forgotpwd.title" /></s:a> + </div> + </div> + </body> +</html> Copied: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp (from rev 34, trunk/vradi-web/src/main/webapp/jsp/register.jsp) =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/register.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,27 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@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"> + <head> + <title><s:text name="vradi.register.title" /></title> + <s:head /> + </head> + <body> + <div id="content"> + <div id="formFrame" class="fond"> + <h1><s:text name="vradi.register.title" /></h1> + <s:form action="register"> + <s:actionerror /> + <p> + <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:password key="vradi.login.password" name="password" labelposition="top" labelSeparator=" :" /> + <s:password key="vradi.login.repeatPassword" name="repeatPassword" labelposition="top" labelSeparator=" :" /> + <s:submit key="vradi.register.submit" name="submit" /> + </p> + </s:form> + <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a> + </div> + </div> + </body> +</html> Copied: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp (from rev 34, trunk/vradi-web/src/main/webapp/jsp/search.jsp) =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/search.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -0,0 +1,21 @@ +<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> +<%@taglib prefix="displaytag" uri="http://displaytag.sf.net"%> +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="vradi.search.title" /></title> + <s:head /> + </head> + <body> + <s:form id="searchForm" action="search" method="post"> + <s:textarea id="searchArea" name="query"/> + <s:submit key="vradi.search.submit" name="submit" /> + </s:form> + <displaytag:table name="forms" id="f" requestURI="search.action"> + <displaytag:column titleKey="vradi.form.title" property="creationDate"/> + <displaytag:column titleKey="vradi.form.title" property="objet"/> + <displaytag:column titleKey="vradi.form.title" property="sourceURL"/> + </displaytag:table> + </body> +</html> \ No newline at end of file Deleted: trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -1,24 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@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"> - <head> - <title><s:text name="vradi.forgotpwd.title" /></title> - <s:head /> - </head> - <body> - <div id="content"> - <div id="formFrame fond"> - <h1><s:text name="vradi.forgotpwd.title" /></h1> - <s:form action="forgotPassword"> - <p> - <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> - <s:submit key="vradi.forgotpwd.submit" name="submit" /> - </p> - </s:form> - <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a> - </div> - </div> - </body> -</html> Deleted: trunk/vradi-web/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/login.jsp 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/webapp/jsp/login.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -1,27 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@taglib prefix="s" uri="/struts-tags"%> - -<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <head> - <title><s:text name="vradi.login.title" /></title> - <s:head /> - </head> - <body> - <div id="content"> - <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: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="forgotPassword_input" id="forgotPwd"><s:text name="vradi.forgotpwd.title" /></s:a> - </div> - </div> - </body> -</html> Deleted: trunk/vradi-web/src/main/webapp/jsp/register.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/register.jsp 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/webapp/jsp/register.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -1,27 +0,0 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@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"> - <head> - <title><s:text name="vradi.register.title" /></title> - <s:head /> - </head> - <body> - <div id="content"> - <div id="formFrame" class="fond"> - <h1><s:text name="vradi.register.title" /></h1> - <s:form action="register"> - <s:actionerror /> - <p> - <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" /> - <s:password key="vradi.login.password" name="password" labelposition="top" labelSeparator=" :" /> - <s:password key="vradi.login.repeatPassword" name="repeatPassword" labelposition="top" labelSeparator=" :" /> - <s:submit key="vradi.register.submit" name="submit" /> - </p> - </s:form> - <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a> - </div> - </div> - </body> -</html> Deleted: trunk/vradi-web/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/search.jsp 2011-05-21 15:53:43 UTC (rev 39) +++ trunk/vradi-web/src/main/webapp/jsp/search.jsp 2011-05-21 15:56:19 UTC (rev 40) @@ -1,21 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> -<%@taglib prefix="s" uri="/struts-tags"%> -<%@taglib prefix="displaytag" uri="http://displaytag.sf.net"%> -<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <head> - <title><s:text name="vradi.search.title" /></title> - <s:head /> - </head> - <body> - <s:form id="searchForm" action="search" method="post"> - <s:textarea id="searchArea" name="query"/> - <s:submit key="vradi.search.submit" name="submit" /> - </s:form> - <displaytag:table name="forms" id="f" requestURI="search.action"> - <displaytag:column titleKey="vradi.form.title" property="creationDate"/> - <displaytag:column titleKey="vradi.form.title" property="objet"/> - <displaytag:column titleKey="vradi.form.title" property="sourceURL"/> - </displaytag:table> - </body> -</html> \ No newline at end of file

1 0

r39 - in trunk/vradi-web/src/main/java/org/chorem/vradi: . actions interceptors
by bpoussin＠users.chorem.org May 21, 2011

May 21, 2011

Author: bpoussin Date: 2011-05-21 17:53:43 +0200 (Sat, 21 May 2011) New Revision: 39 Url: http://chorem.org/repositories/revision/vradi/39 Log: Modification du registry et loggin pour utiliser les mecanisme Wikitty refactoring VradiSession, VradiWebConfig ajout classe VradiProxy pour gerer la creation du WS en singleton et pouvoir ajouter des methodes utile pour l'application Added: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiProxy.java Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LogoutInterceptor.java Added: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiProxy.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiProxy.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiProxy.java 2011-05-21 15:53:43 UTC (rev 39) @@ -0,0 +1,83 @@ +package org.chorem.vradi; + +import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.vradi.entities.Attachment; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class VradiProxy extends WikittyProxy { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(VradiProxy.class); + + static protected WikittyService ws = null; + + protected VradiProxy(ApplicationConfig config, WikittyService ws) { + super(config, ws); + } + + /** + * Returns instance of ChoremProxy with specified security token + * + * @param token + * @return + */ + static public VradiProxy getInstance(String token) { + ApplicationConfig config = VradiWebConfig.getConfig(); + WikittyService ws = getWikittyService(config); + VradiProxy result = new VradiProxy(config, ws); + result.setSecurityToken(token); + + return result; + } + + /** + * Returns WikittyService to use. This WikittyService is singleton. + * + * @param config + * @return WikittyService instance + */ + static protected WikittyService getWikittyService(ApplicationConfig config) { + if (ws == null) { + synchronized(VradiProxy.class) { + if (ws == null) { + ws = WikittyServiceFactory.buildWikittyService(config); + } + } + } + return ws; + } + + /** + * Returns the attachments linked with a wikitty id ordered descending + * by date + * + * @param formNoteId + * @return the list of attachments + */ + static public List<Attachment> getAttachments(String formNoteId) { + Criteria criteria = Search.query(). + eq(Attachment.FQ_FIELD_ATTACHMENT_FORMNOTE, formNoteId) + .criteria().addSortDescending(Attachment.FQ_FIELD_ATTACHMENT_DATE); + PagedResult<Attachment> result = getInstance(null). + findAllByCriteria(Attachment.class, criteria); + List<Attachment> attachments = result.getAll(); + return attachments; + } + +} 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-21 12:43:44 UTC (rev 38) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-05-21 15:53:43 UTC (rev 39) @@ -16,6 +16,7 @@ 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 @@ -33,33 +34,49 @@ static final private String VRADI_SESSION_KEY = VradiSession.class.getSimpleName(); - protected WikittyProxy proxy; - protected ApplicationConfig config; - protected VradiDataService dataService; + protected String securityToken = null; + protected VradiUser user = null; + transient protected VradiProxy proxy = null; - private VradiUser user; + transient protected VradiDataService dataService; public VradiSession() { - config = VradiWebConfig.getConfig(); - - // Init wikitty service - WikittyService ws = WikittyServiceFactory.buildWikittyService(config); - proxy = new WikittyProxy(config, ws); - - dataService = new VradiDataServiceImpl(config, proxy); - + // FIXME poussin 20110521 ? + // est-ce vraiment ici qu'il faut gerer i18n, a chaque creation d'une session + // 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); } - public void invalidate() { - this.user = null; + /** + * You must use this method to login user, don't use proxy.login method + * directly + * + * @param login + * @param password + */ + public void login(String login, String password) { + getProxy().login(login, password); + securityToken = getProxy().getSecurityToken(); + user = getProxy().getUser(VradiUser.class); } - public ApplicationConfig getConfig() { - return config; + public VradiProxy getProxy() { + if (proxy == null) { + proxy = VradiProxy.getInstance(securityToken); + } + return proxy; } + + public void invalidate(Map<String, Object> session) { + VradiSession choremSession = getVradiSession(session); + choremSession.getProxy().logout(); + session.remove(VRADI_SESSION_KEY); + user = null; + } + static public VradiSession getVradiSession(HttpServletRequest request) { HttpSession session = request.getSession(); VradiSession result = getVradiSession(session); @@ -84,11 +101,16 @@ return result; } - public WikittyProxy getProxy() { - return proxy; - } - public VradiDataService getDataService() { + if (dataService == null) { + synchronized(VradiSession.class) { + if (dataService == null) { + ApplicationConfig config = VradiWebConfig.getConfig(); + VradiProxy proxy = getProxy(); + dataService = new VradiDataServiceImpl(config, proxy); + } + } + } return dataService; } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java 2011-05-21 12:43:44 UTC (rev 38) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java 2011-05-21 15:53:43 UTC (rev 39) @@ -32,42 +32,50 @@ } public static ApplicationConfig getConfig(String... args) { - if (config == null) { + synchronized(VradiWebConfig.class) { + if (config == null) { - // Creating instance of ApplicationConfig - config = new ApplicationConfig(VradiWebOption.CONFIG_FILE.getDefaultValue()); + // Creating instance of ApplicationConfig + config = new ApplicationConfig(VradiWebOption.CONFIG_FILE.getDefaultValue()); - // Load wikitty options - config.loadDefaultOptions(WikittyConfigOption.class); + // Load wikitty options + config.loadDefaultOptions(WikittyConfigOption.class); - // Load service options - config.loadDefaultOptions(VradiServiceConfiguration.VradiServiceOption.class); + // Load service options + config.loadDefaultOptions(VradiServiceConfiguration.VradiServiceOption.class); - // Load vradi options - config.loadDefaultOptions(VradiWebOption.class); + // Load vradi options + config.loadDefaultOptions(VradiWebOption.class); - try { - // Parse args - config.parse(args); + try { + // Parse args + config.parse(args); - // on supprime le stamp de snapshot s'il existe - String sVersion = VersionUtil.removeSnapshot(config.getOption("application.version")); - Version version = VersionUtil.valueOf(sVersion); - config.setDefaultOption(VradiWebOption.VRADI_VERSION.key, version.getVersion()); + // on supprime le stamp de snapshot s'il existe + String sVersion = VersionUtil.removeSnapshot( + config.getOption("application.version")); + Version version = VersionUtil.valueOf(sVersion); + config.setDefaultOption( + VradiWebOption.VRADI_VERSION.key, + version.getVersion()); - // la version de la base est sans classifier (pas de alpha, ou rc,...) - Version dbVersion; - if (version.hasClassifier()) { - dbVersion = VersionUtil.removeClassifier(version); - } else { - dbVersion = VersionUtil.valueOf(version.toString()); - } + // la version de la base est sans classifier (pas de alpha, ou rc,...) + Version dbVersion; + if (version.hasClassifier()) { + dbVersion = VersionUtil.removeClassifier(version); + } else { + dbVersion = VersionUtil.valueOf(version.toString()); + } - config.setDefaultOption(VradiWebOption.VRADI_DATABASE_VERSION.key, dbVersion.getVersion()); - } catch (ArgumentsParserException eee) { - if (log.isErrorEnabled()) { - log.error("Can't load vradi configuration", eee); + config.setDefaultOption( + VradiWebOption.VRADI_DATABASE_VERSION.key, + dbVersion.getVersion()); + } catch (ArgumentsParserException eee) { + if (log.isErrorEnabled()) { + log.error("Can't load vradi configuration", eee); + } + } } } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-05-21 12:43:44 UTC (rev 38) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-05-21 15:53:43 UTC (rev 39) @@ -37,26 +37,6 @@ } /** - * Check password in solr index, if fail try to check password admin in config file - * - * @param email email login - * @param password password - * @return null if not found - */ - protected VradiUser checkLogin(String email, String password) { - VradiUser result = null; - if (email != null && password != null) { - if (!email.isEmpty() && !password.equals(StringUtil.encodeMD5(""))) { - WikittyProxy proxy = getProxy(); - Criteria criteria = Search.query().eq(VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN, email). - eq(VradiUser.FQ_FIELD_WIKITTYUSER_PASSWORD, password).criteria(); - result = proxy.findByCriteria(VradiUser.class, criteria); - } - } - return result; - } - - /** * Authenticates the user if his email and password are valid */ public String execute() { @@ -68,15 +48,12 @@ if (password != null) { String md5 = StringUtil.encodeMD5(password); - VradiUser user = checkLogin(email, md5); - if (user != null) { - getVradiSession().setUser(user); - result = SUCCESS; - } + getVradiSession().login(email, md5); + result = SUCCESS; } } } catch (Exception e) { - addActionError(getText(n_("vradi.error.internal"))); + addActionError(getText(n_("vradi.authentification.error"))); log.error(e.getMessage(), e); } return result; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-05-21 12:43:44 UTC (rev 38) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-05-21 15:53:43 UTC (rev 39) @@ -3,6 +3,7 @@ import javax.mail.MessagingException; import javax.mail.internet.AddressException; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; import org.apache.struts2.interceptor.ServletRequestAware; import org.chorem.vradi.entities.VradiUser; @@ -71,32 +72,28 @@ @Override public void setServletRequest(HttpServletRequest request) { - this.request = request; + this.request = request; } /** * - * @param passwordMD5 the user password hashed in md5 * @return false if the email address isn't already registered, true * otherwise */ - protected boolean alreadyRegistered(String passwordMD5) { + protected boolean alreadyRegistered() { boolean result = true; - if (email != null && passwordMD5 != null) { - if (!email.isEmpty() && !passwordMD5.equals(StringUtil.encodeMD5(""))) { - WikittyProxy proxy = getProxy(); - Criteria criteria = Search.query().eq(VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria(); //Retrieves user by user name (email) - - //If the user doesn't already exist - if (proxy.findByCriteria(VradiUser.class, criteria) == null) { - result = false; - } else { //The email address is already used by someone - addFieldError("email", getText(n_("vradi.register.emailAldyUsed"))); - } - } - } - return result; + WikittyProxy proxy = getProxy(); + Criteria criteria = Search.query().eq( + VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria(); //Retrieves user by user name (email) + VradiUser user = proxy.findByCriteria(VradiUser.class, criteria); + //If the user doesn't already exist + if (user == null) { + result = false; + } else { //The email address is already used by someone + addFieldError("email", getText(n_("vradi.register.emailAldyUsed"))); + } + return result; } /** @@ -106,18 +103,17 @@ String result = INPUT; try { - if (email != null) { + if (!StringUtils.isBlank(email)) { email = email.trim(); - if (password != null) { + if (!StringUtils.isBlank(password)) { if (!password.equals(repeatPassword)) { addActionError(getText(n_("vradi.register.pwdDontMatch"))); } else { - String md5 = StringUtil.encodeMD5(password); - //If the email address isn't already used - if (!alreadyRegistered(md5)) { + if (!alreadyRegistered()) { WikittyProxy proxy = getProxy(); VradiUserImpl newUser = new VradiUserImpl(); + String md5 = StringUtil.encodeMD5(password); newUser.setPassword(md5); newUser.setLogin(email); VradiUser login = proxy.store(newUser); //Stores the new user @@ -126,8 +122,14 @@ if (login == null) { addFieldError("email", getText(n_("vradi.register.invalidLogin"))); } else { - getVradiSession().setUser(login); + // meme si la suite echoue, la creation du compte + // a ete un succes + result = SUCCESS; + // la creation c bien passe, on authen la personne + // peut-etre ne pas le faire pour eviter les robots ? + getVradiSession().login(email, md5); + try { String mailContent; @@ -145,7 +147,6 @@ addActionError(n_(message)); log.error(message + "(" + e.getMessage() + ")", e); } - result = SUCCESS; } } } Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-05-21 12:43:44 UTC (rev 38) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-05-21 15:53:43 UTC (rev 39) @@ -9,6 +9,7 @@ import java.util.Map; import org.apache.struts2.interceptor.SessionAware; import org.chorem.vradi.VradiSession; +import org.chorem.vradi.VradiWebConfig; import org.chorem.vradi.services.VradiDataService; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; @@ -56,7 +57,7 @@ } public ApplicationConfig getConfig() { - return getVradiSession().getConfig(); + return VradiWebConfig.getConfig(); } @Override Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LogoutInterceptor.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LogoutInterceptor.java 2011-05-21 12:43:44 UTC (rev 38) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LogoutInterceptor.java 2011-05-21 15:53:43 UTC (rev 39) @@ -16,7 +16,7 @@ @Override public String intercept(ActionInvocation invocation) throws Exception { Map<String, Object> session = ActionContext.getContext().getSession(); - VradiSession.getVradiSession(session).invalidate(); + VradiSession.getVradiSession(session).invalidate(session); String result = invocation.invoke(); return result; }

1 0

r38 - trunk/vradi-entities/src/main/xmi
by bpoussin＠users.chorem.org May 21, 2011

May 21, 2011

Author: bpoussin Date: 2011-05-21 14:43:44 +0200 (Sat, 21 May 2011) New Revision: 38 Url: http://chorem.org/repositories/revision/vradi/38 Log: add new class for FormNote (aka AO reponse) Modified: trunk/vradi-entities/src/main/xmi/vradi.zargo Modified: trunk/vradi-entities/src/main/xmi/vradi.zargo =================================================================== (Binary files differ)

1 0

r37 - trunk/vradi-web/src/main/java/org/chorem/vradi/actions
by bpoussin＠users.chorem.org May 21, 2011

May 21, 2011

Author: bpoussin Date: 2011-05-21 14:42:40 +0200 (Sat, 21 May 2011) New Revision: 37 Url: http://chorem.org/repositories/revision/vradi/37 Log: add constant to find current action in context Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-05-21 12:05:26 UTC (rev 36) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-05-21 12:42:40 UTC (rev 37) @@ -27,6 +27,16 @@ protected static final Log log = LogFactory.getLog(VradiBaseAction.class); + /** + * Key to find current action in context. + * child can have method + * <pre> + * static public ChildAction getAction() { + * return (ChildAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + * } + * </pre> + */ + protected static final String CONTEXT_ACTION_KEY = "action"; public static final String UNTRANSLATED_MARKER = "???"; protected Map<String, Object> session;

1 0

r36 - trunk/vradi-web/src/main/resources
by bpoussin＠users.chorem.org May 21, 2011

May 21, 2011

Author: bpoussin Date: 2011-05-21 14:05:26 +0200 (Sat, 21 May 2011) New Revision: 36 Url: http://chorem.org/repositories/revision/vradi/36 Log: modfication de la conf par defaut pour facilement tester l'application Modified: trunk/vradi-web/src/main/resources/vradi-web.properties Modified: trunk/vradi-web/src/main/resources/vradi-web.properties =================================================================== --- trunk/vradi-web/src/main/resources/vradi-web.properties 2011-05-21 11:25:12 UTC (rev 35) +++ trunk/vradi-web/src/main/resources/vradi-web.properties 2011-05-21 12:05:26 UTC (rev 36) @@ -1,3 +1,7 @@ +# +# Configuration file for vradi-web, that use standalone wikitty instance +# located in /var/local/vradi-web and used h2 database +# application.name=${project.name} application.version=${project.version} application.site.url=http://maven-site.chorem.org/vradi/index.html @@ -6,11 +10,28 @@ application.organisation.name=${project.organization.name} application.organisation.url=${project.organization.url} +vradi.data.dir=/var/local/vradi-web +vradi.smtp.host=mail.codelutin.com +vradi.smtp.port=1194 + # Wikitty -wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceHessianClient,\ +wikitty.data.directory=${vradi.data.dir} +wikitty.storage.jdbc.driver=org.h2.Driver +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db +wikitty.storage.jdbc.login=sa +wikitty.storage.jdbc.password= +wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceCached,\ org.nuiton.wikitty.services.WikittyServiceSecurity +wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ +org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ +org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr wikitty.service.cache.allwaysRestoreCopies=false wikitty.service.event.propagate=false wikitty.service.event.listen=true

1 0

r35 - trunk/vradi-services/src/main/java/org/chorem/vradi
by bpoussin＠users.chorem.org May 21, 2011

May 21, 2011

Author: bpoussin Date: 2011-05-21 13:25:12 +0200 (Sat, 21 May 2011) New Revision: 35 Url: http://chorem.org/repositories/revision/vradi/35 Log: add some acceptable default value Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java 2011-05-20 19:00:23 UTC (rev 34) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java 2011-05-21 11:25:12 UTC (rev 35) @@ -199,22 +199,22 @@ SMTP_HOST( "vradi.smtp.host", _("vradi.service.config.smtp.host.description"), - null, String.class, false, false), + "localhost", String.class, false, false), SMTP_PORT( "vradi.smtp.port", _("vradi.service.config.smtp.port.description"), - null, Integer.class, false, false), + "25", Integer.class, false, false), IMAP_HOST( "vradi.imap.host", _("vradi.service.config.imap.host.description"), - null, Integer.class, false, false), + "localhost", Integer.class, false, false), IMAP_PORT( "vradi.imap.port", _("vradi.service.config.imap.port.description"), - null, Integer.class, false, false), + "143", Integer.class, false, false), MAIL_USER( "vradi.mail.user", @@ -224,12 +224,12 @@ MAIL_FROM( "vradi.mail.from", _("vradi.service.config.mail.from.description"), - null, String.class, false, false), + "noreply(a)vradi.chorem.org", String.class, false, false), MAIL_FROM_NAME( "vradi.mail.fromname", _("vradi.service.config.mail.fromname.description"), - null, String.class, false, false), + "Vradi", String.class, false, false), MAIL_PASSWORD( "vradi.mail.password", @@ -239,7 +239,7 @@ MAIL_OFFER_SUBJECT( "vradi.mail.offer.subject", _("vradi.service.config.mail.offer.subject.description"), - null, String.class, false, false), + "Today vradi selection", String.class, false, false), SESSION_DEFAULT_PARAGRAPH( "vradi.session.defaultParagraph",

1 0

r34 - in trunk: . vradi-web vradi-web/src/main/java/org/chorem/vradi vradi-web/src/main/java/org/chorem/vradi/actions vradi-web/src/main/resources vradi-web/src/main/resources/i18n vradi-web/src/main/webapp vradi-web/src/main/webapp/jsp
by sletellier＠users.chorem.org May 20, 2011

May 20, 2011

Author: sletellier Date: 2011-05-20 21:00:23 +0200 (Fri, 20 May 2011) New Revision: 34 Url: http://chorem.org/repositories/revision/vradi/34 Log: #378 Cr?\195?\169ation de la zone de recherche et de resultats Added: trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java trunk/vradi-web/src/main/webapp/jsp/search.jsp Removed: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/HomeAction.java trunk/vradi-web/src/main/webapp/jsp/home.jsp 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/java/org/chorem/vradi/actions/VradiBaseAction.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/struts.xml trunk/vradi-web/src/main/webapp/index.html Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-20 15:25:09 UTC (rev 33) +++ trunk/pom.xml 2011-05-20 19:00:23 UTC (rev 34) @@ -419,7 +419,20 @@ <version>${struts2Version}</version> </dependency> +  <dependency> + <groupId>displaytag</groupId> + <artifactId>displaytag</artifactId> + <version>1.2</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl104-over-slf4j</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>3.12.1.GA</version> Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-05-20 15:25:09 UTC (rev 33) +++ trunk/vradi-web/pom.xml 2011-05-20 19:00:23 UTC (rev 34) @@ -79,7 +79,14 @@ <artifactId>xwork-core</artifactId> </dependency> +  <dependency> + <groupId>displaytag</groupId> + <artifactId>displaytag</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <scope>runtime</scope> @@ -174,6 +181,7 @@ <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> + </dependencies> <build> @@ -212,6 +220,7 @@ <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx> <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> </namespaces> </configuration> Added: trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/FormPaginatedList.java 2011-05-20 19:00:23 UTC (rev 34) @@ -0,0 +1,60 @@ +package org.chorem.vradi; + +import org.chorem.vradi.beans.FormPagedResult; +import org.chorem.vradi.entities.Form; +import org.displaytag.pagination.PaginatedList; +import org.displaytag.properties.SortOrderEnum; +import org.nuiton.wikitty.WikittyProxy; + +import java.util.List; + +/** + * @author sletellier + */ +public class FormPaginatedList implements PaginatedList { + + protected FormPagedResult result; + protected WikittyProxy proxy; + + public FormPaginatedList(WikittyProxy proxy, FormPagedResult result) { + this.result = result; + this.proxy = proxy; + } + + @Override + public List<Form> getList() { + List<String> formsIdsToShow = result.getFormsIdsToShow(); + + return proxy.restore(Form.class, formsIdsToShow); + } + + @Override + public int getPageNumber() { + return result.getPageToShow(); + } + + @Override + public int getObjectsPerPage() { + return result.getNbFormsToShow(); + } + + @Override + public int getFullListSize() { + return result.getTotalFoundFormNb(); + } + + @Override + public String getSortCriterion() { + return null; + } + + @Override + public SortOrderEnum getSortDirection() { + return null; + } + + @Override + public String getSearchId() { + return null; + } +} 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-20 15:25:09 UTC (rev 33) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-05-20 19:00:23 UTC (rev 34) @@ -7,6 +7,8 @@ import org.apache.commons.logging.Log; 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.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.util.ApplicationConfig; @@ -33,6 +35,8 @@ protected WikittyProxy proxy; protected ApplicationConfig config; + protected VradiDataService dataService; + private VradiUser user; public VradiSession() { @@ -42,6 +46,8 @@ WikittyService ws = WikittyServiceFactory.buildWikittyService(config); proxy = new WikittyProxy(config, ws); + dataService = new VradiDataServiceImpl(config, proxy); + // init I18n I18n.init(new DefaultI18nInitializer("vradi-i18n", getClass().getClassLoader(), "/"), null); } @@ -82,6 +88,10 @@ return proxy; } + public VradiDataService getDataService() { + return dataService; + } + public VradiUser getUser() { return user; } Deleted: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/HomeAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/HomeAction.java 2011-05-20 15:25:09 UTC (rev 33) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/HomeAction.java 2011-05-20 19:00:23 UTC (rev 34) @@ -1,18 +0,0 @@ -package org.chorem.vradi.actions; - -/** - * Prepare l'affichage de la page d'accueil - * - * @author poussin - */ -public class HomeAction extends VradiBaseAction { - - private static final long serialVersionUID = -3735250067223062719L; - - /** - * Initializes everything before displaying the home page - */ - public String execute() { - return SUCCESS; - } -} \ No newline at end of file Copied: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java (from rev 32, trunk/vradi-web/src/main/java/org/chorem/vradi/actions/HomeAction.java) =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/SearchAction.java 2011-05-20 19:00:23 UTC (rev 34) @@ -0,0 +1,65 @@ +package org.chorem.vradi.actions; + +import org.apache.struts2.interceptor.ServletRequestAware; +import org.chorem.vradi.FormPaginatedList; +import org.chorem.vradi.beans.FormPagedResult; +import org.chorem.vradi.beans.QueryParameters; +import org.chorem.vradi.services.VradiException; +import org.chorem.vradi.services.search.UnsupportedQueryException; + +import javax.servlet.http.HttpServletRequest; + +/** + * Search action + * + * @author sletellier + */ +public class SearchAction extends VradiBaseAction implements ServletRequestAware { + + private static final long serialVersionUID = -3735250067223062719L; + + public static final int NB_FORMS_TO_SHOW = 100; + + protected String query; + protected FormPagedResult result; + protected HttpServletRequest request; + + public String getQuery() { + return query; + } + + public void setQuery(String query) { + this.query = query; + } + + @Override + public void setServletRequest(HttpServletRequest request) { + this.request = request; + } + + /** + * Initializes everything before displaying the home page + */ + public String execute() { + + if (result == null) { + result = new FormPagedResult(); + result.setNbFormsToShow(NB_FORMS_TO_SHOW); + } + + QueryParameters queryParameters = new QueryParameters(query); + + try { + result = getDataService().findForms(queryParameters, result); + log.info(result.getTotalFoundFormNb() + " forms found"); + } catch (VradiException eee) { + log.error("Failed to execute query", eee); + } catch (UnsupportedQueryException eee) { + log.error("Unsuported query", eee); + } + + request.setAttribute("forms", new FormPaginatedList(getProxy(), result)); + + return SUCCESS; + } +} \ No newline at end of file Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-05-20 15:25:09 UTC (rev 33) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-05-20 19:00:23 UTC (rev 34) @@ -9,6 +9,7 @@ import java.util.Map; import org.apache.struts2.interceptor.SessionAware; import org.chorem.vradi.VradiSession; +import org.chorem.vradi.services.VradiDataService; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; @@ -40,6 +41,10 @@ return result; } + public VradiDataService getDataService() { + return getVradiSession().getDataService(); + } + public ApplicationConfig getConfig() { return getVradiSession().getConfig(); } 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-20 15:25:09 UTC (rev 33) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-20 19:00:23 UTC (rev 34) @@ -21,4 +21,6 @@ vradi.register.mailPwd=Your password vradi.register.mailSubject=[Vradi] Your user informations vradi.register.submit=Login -vradi.register.title=Login \ No newline at end of file +vradi.register.title=Login +vradi.search.submit=Search +vradi.search.title=Search 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-20 15:25:09 UTC (rev 33) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-20 19:00:23 UTC (rev 34) @@ -22,3 +22,5 @@ vradi.register.pwdDontMatch=Les mots de passe sont différents vradi.register.submit=S'enregistrer vradi.register.title=S'enregistrer +vradi.search.submit=Rechercher +vradi.search.title=Recherche Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-05-20 15:25:09 UTC (rev 33) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-20 19:00:23 UTC (rev 34) @@ -56,7 +56,7 @@ <package name="login" extends="loginArea"> <action name="register_*" method="{1}" class="org.chorem.vradi.actions.RegisterAction"> <result name="input">/jsp/register.jsp</result> - <result type="redirectAction">home</result> + <result type="redirectAction">search</result> </action> <action name="forgotPassword_*" method="{1}" class="org.chorem.vradi.actions.ForgotPasswordAction"> <result name="input">/jsp/forgotPassword.jsp</result> @@ -64,8 +64,8 @@ </action> <action name="login_*" method="{1}" class="org.chorem.vradi.actions.LoginAction"> <result name="input">/jsp/login.jsp</result> - <result name="login" type="redirectAction">home</result> - <result type="redirectAction">home</result> + <result name="login" type="redirectAction">search</result> + <result type="redirectAction">search</result> </action> <action name="logout" class="org.chorem.vradi.actions.LogoutAction"> <result type="redirectAction">login_input</result> @@ -73,9 +73,9 @@ </package> <package name="misc" extends="restrictedArea"> - <action name="home" class="org.chorem.vradi.actions.HomeAction"> - <result>/jsp/home.jsp</result> - <result name="input" type="redirectAction">home</result> + <action name="search" class="org.chorem.vradi.actions.SearchAction"> + <result>/jsp/search.jsp</result> + <result name="input" type="redirectAction">search</result> </action> </package> Modified: trunk/vradi-web/src/main/webapp/index.html =================================================================== --- trunk/vradi-web/src/main/webapp/index.html 2011-05-20 15:25:09 UTC (rev 33) +++ trunk/vradi-web/src/main/webapp/index.html 2011-05-20 19:00:23 UTC (rev 34) @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="refresh" content="0;URL=home.action"/> + <meta http-equiv="refresh" content="0;URL=search.action"/> <title>Vradi web</title> </head> Deleted: trunk/vradi-web/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/home.jsp 2011-05-20 15:25:09 UTC (rev 33) +++ trunk/vradi-web/src/main/webapp/jsp/home.jsp 2011-05-20 19:00:23 UTC (rev 34) @@ -1,5 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> -<html> -<head><title>Simple jsp page</title></head> -<body>Place your content here</body> -</html> \ No newline at end of file Copied: trunk/vradi-web/src/main/webapp/jsp/search.jsp (from rev 32, trunk/vradi-web/src/main/webapp/jsp/home.jsp) =================================================================== --- trunk/vradi-web/src/main/webapp/jsp/search.jsp (rev 0) +++ trunk/vradi-web/src/main/webapp/jsp/search.jsp 2011-05-20 19:00:23 UTC (rev 34) @@ -0,0 +1,21 @@ +<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> +<%@taglib prefix="displaytag" uri="http://displaytag.sf.net"%> +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="vradi.search.title" /></title> + <s:head /> + </head> + <body> + <s:form id="searchForm" action="search" method="post"> + <s:textarea id="searchArea" name="query"/> + <s:submit key="vradi.search.submit" name="submit" /> + </s:form> + <displaytag:table name="forms" id="f" requestURI="search.action"> + <displaytag:column titleKey="vradi.form.title" property="creationDate"/> + <displaytag:column titleKey="vradi.form.title" property="objet"/> + <displaytag:column titleKey="vradi.form.title" property="sourceURL"/> + </displaytag:table> + </body> +</html> \ No newline at end of file

1 0

r33 - in trunk: . vradi-web vradi-web/src/main/i18n vradi-web/src/main/java/org/chorem/vradi vradi-web/src/main/java/org/chorem/vradi/actions vradi-web/src/main/resources vradi-web/src/main/resources/i18n
by sletellier＠users.chorem.org May 20, 2011

May 20, 2011

Author: sletellier Date: 2011-05-20 17:25:09 +0200 (Fri, 20 May 2011) New Revision: 33 Url: http://chorem.org/repositories/revision/vradi/33 Log: - Use stable wikitty version - Fix I18n Modified: trunk/pom.xml trunk/vradi-web/pom.xml trunk/vradi-web/src/main/i18n/jsp.rules trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 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.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-20 14:08:45 UTC (rev 32) +++ trunk/pom.xml 2011-05-20 15:25:09 UTC (rev 33) @@ -114,7 +114,7 @@ <nuitonI18nVersion>2.4</nuitonI18nVersion> <nuitonWidgetVersion>1.1.1</nuitonWidgetVersion> <generatorPluginVersion>2.3.3</generatorPluginVersion> - <wikittyVersion>3.1.3-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.1.2</wikittyVersion> <oooVersion>3.2.1</oooVersion> <javamailVersion>1.4.3</javamailVersion> <slf4jVersion>1.6.1</slf4jVersion> @@ -128,6 +128,12 @@  <license.licenseName>agpl_v3</license.licenseName> +  + <i18n.bundles>fr_FR,en_GB</i18n.bundles> + <i18n.silent>true</i18n.silent> + <i18n.bundleOutputEncoding>UTF-8</i18n.bundleOutputEncoding> + <i18n.bundleFormatConverter>toMessageFormat</i18n.bundleFormatConverter> + </properties> <dependencyManagement> Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-05-20 14:08:45 UTC (rev 32) +++ trunk/vradi-web/pom.xml 2011-05-20 15:25:09 UTC (rev 33) @@ -24,13 +24,11 @@ <packaging>war</packaging> <properties> - <i18n.bundles>fr_FR,en_GB</i18n.bundles> + <i18n.silent>true</i18n.silent> - <i18n.bundleOutputName>vradi-web-i18n</i18n.bundleOutputName> - <i18n.bundleOutputDir> - ${basedir}/target/generated-sources/resources - </i18n.bundleOutputDir> - <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> + <i18n.bundleOutputName>vradi-i18n</i18n.bundleOutputName> + <i18n.bundleOutputPackage/> + </properties> <dependencies> @@ -213,6 +211,7 @@ <namespaces> <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx> + <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sj> <jsp>http://java.sun.com/JSP/Page</jsp> </namespaces> </configuration> Modified: trunk/vradi-web/src/main/i18n/jsp.rules =================================================================== --- trunk/vradi-web/src/main/i18n/jsp.rules 2011-05-20 14:08:45 UTC (rev 32) +++ trunk/vradi-web/src/main/i18n/jsp.rules 2011-05-20 15:25:09 UTC (rev 33) @@ -3,7 +3,11 @@ //s:text/@name //s:submit/@key //s:textfield/@key +//s:checkbox/@key //s:password/@key //s:file/@key +//s:label/@key +//s:optiontransferselect/@key +//s:select/@key //sx:datetimepicker/@key 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-20 14:08:45 UTC (rev 32) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-05-20 15:25:09 UTC (rev 33) @@ -43,7 +43,7 @@ proxy = new WikittyProxy(config, ws); // init I18n -// I18n.init(new DefaultI18nInitializer("vradi-i18n"), null); + I18n.init(new DefaultI18nInitializer("vradi-i18n", getClass().getClassLoader(), "/"), null); } public void invalidate() { Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java 2011-05-20 14:08:45 UTC (rev 32) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java 2011-05-20 15:25:09 UTC (rev 33) @@ -108,7 +108,7 @@ REMOTE_ENDPOINT( "vradi.remote.endpoint", _("vradi.config.remote.endpoint.description"), - "http://localhost:8080", String.class, false, false); + null, String.class, false, false); public String key; Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-05-20 14:08:45 UTC (rev 32) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-05-20 15:25:09 UTC (rev 33) @@ -131,7 +131,7 @@ try { String mailContent; - mailContent = getText(n_("vradi.register.mailHi")) + ",\n\n" + getText(n_("vradi.register.mailPwd")) + ": " + password + "\n\n" + getText(n_("bow.register.mailEmail")) + ": " + email + "\n\n"; + mailContent = getText(n_("vradi.register.mailHi")) + ",\n\n" + getText(n_("vradi.register.mailPwd")) + ": " + password + "\n\n" + getText(n_("vradi.register.mailEmail")) + ": " + email + "\n\n"; MailingManager.postMail(getConfig(), email, getText(n_("vradi.register.mailSubject")), false, mailContent); } catch (AddressException e) { //If the email address is invalid 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-20 14:08:45 UTC (rev 32) +++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-20 15:25:09 UTC (rev 33) @@ -1,4 +1,3 @@ -bow.register.mailEmail= vradi.config.configFileName.description=Fichier de configuration de Vradi web vradi.config.database.version.description=Version de la base de donnée vradi.config.last.version.description=Dernière version de Vradi web lancée @@ -6,7 +5,7 @@ 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.forgotPassword.emailDoesntExist=Cette adresse email n''existe pas +vradi.forgotPassword.emailDoesntExist=Cette adresse email n'existe pas vradi.forgotpwd.submit=Envoyer vradi.forgotpwd.title=Vous avez oublié votre mot de passe ? vradi.login.email=Email @@ -15,11 +14,11 @@ vradi.login.submit=Veuillez retaper votre mot de passe 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 +vradi.register.invalidLogin=Une erreur s'est produite pendant l'enregistrement de vos informations, merci d'essayer à nouveau vradi.register.mailEmail=Votre email vradi.register.mailHi=Bonjour vradi.register.mailPwd=Votre mot de passe vradi.register.mailSubject=[Vradi] Vos informations utilisateurs vradi.register.pwdDontMatch=Les mots de passe sont différents -vradi.register.submit=S''enregistrer -vradi.register.title=S''enregistrer +vradi.register.submit=S'enregistrer +vradi.register.title=S'enregistrer Modified: trunk/vradi-web/src/main/resources/log4j.properties =================================================================== --- trunk/vradi-web/src/main/resources/log4j.properties 2011-05-20 14:08:45 UTC (rev 32) +++ trunk/vradi-web/src/main/resources/log4j.properties 2011-05-20 15:25:09 UTC (rev 33) @@ -0,0 +1,12 @@ +# Global logging configuration +log4j.rootLogger=FATAL, stdout + +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.chorem.vradi=DEBUG +#log4j.logger.org.nuiton.util.TimeLog=WARN +log4j.logger.org.apache.struts2.dispatcher.mapper=DEBUG Modified: trunk/vradi-web/src/main/resources/struts.properties =================================================================== --- trunk/vradi-web/src/main/resources/struts.properties 2011-05-20 14:08:45 UTC (rev 32) +++ trunk/vradi-web/src/main/resources/struts.properties 2011-05-20 15:25:09 UTC (rev 33) @@ -34,7 +34,7 @@ struts.url.http.port = 80 struts.url.https.port = 443 -struts.custom.i18n.resources=vradi-web-i18n +struts.custom.i18n.resources=vradi-i18n struts.dispatcher.parametersWorkaround = false

1 0