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

r48 - trunk/vradi-web/src/main/webapp
by bpoussin＠users.chorem.org May 24, 2011

May 24, 2011

Author: bpoussin Date: 2011-05-25 01:38:12 +0200 (Wed, 25 May 2011) New Revision: 48 Url: http://chorem.org/repositories/revision/vradi/48 Log: remove index.html not used anymore Removed: trunk/vradi-web/src/main/webapp/index.html Deleted: trunk/vradi-web/src/main/webapp/index.html =================================================================== --- trunk/vradi-web/src/main/webapp/index.html 2011-05-24 23:37:42 UTC (rev 47) +++ trunk/vradi-web/src/main/webapp/index.html 2011-05-24 23:38:12 UTC (rev 48) @@ -1,11 +0,0 @@ -<!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=search.action"/> - <title>Vradi web</title> - </head> - - <body onload=""> - - </body> -</html> \ No newline at end of file

1 0

r47 - trunk/vradi-web/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org May 24, 2011

May 24, 2011

Author: bpoussin Date: 2011-05-25 01:37:42 +0200 (Wed, 25 May 2011) New Revision: 47 Url: http://chorem.org/repositories/revision/vradi/47 Log: fix bug in url construction Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-05-24 23:33:19 UTC (rev 46) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-05-24 23:37:42 UTC (rev 47) @@ -4,6 +4,7 @@ Author : poussin --%> +<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@page import="org.chorem.vradi.entities.FormNote"%> <%@page import="org.chorem.vradi.actions.FormNoteListAction"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> @@ -23,8 +24,10 @@ <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> + <% for (FormNote note : action.getFormNotes()) { + ActionContext.getContext().put("localNoteId", note.getWikittyId()); + %> + <li><s:a action="formNote/%{localNoteId}"><%=note.getCreationDate()%> <%=note.getSummary()%></s:a></li> <% } %> <li><s:a action="formNote/new?formId=%{formId}"><s:text name="vradi.new.formNote"/></s:a></li> </ul>

1 0

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

May 24, 2011

Author: bpoussin Date: 2011-05-25 01:33:19 +0200 (Wed, 25 May 2011) New Revision: 46 Url: http://chorem.org/repositories/revision/vradi/46 Log: - / redirect to /search.action - redirect to requested page after login Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java trunk/vradi-web/src/main/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/web.xml Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 23:33:19 UTC (rev 46) @@ -3,11 +3,13 @@ import com.opensymphony.xwork2.ActionContext; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; /** * @@ -26,10 +28,20 @@ return (EditAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); } + /** restraint les modifications possibles sur certaine extension */ + protected String restrictedExtension; protected HttpServletRequest request; protected String id; protected Wikitty wikitty; + public String getRestrictedExtension() { + return restrictedExtension; + } + + public void setRestrictedExtension(String restrictedExtension) { + this.restrictedExtension = restrictedExtension; + } + @Override public void setServletRequest(HttpServletRequest request) { this.request = request; @@ -47,6 +59,21 @@ return wikitty; } + protected boolean isAcceptableExtension(String fqfield) { + boolean result = false; + if (StringUtils.isBlank(restrictedExtension)) { + result = true; + } else { + try { + String extName = WikittyExtension.extractExtensionName(fqfield); + result = restrictedExtension.contains(extName); + } catch(Exception eee) { + log.debug("Not acceptable extension format", eee); + } + } + return result; + } + @Override public String execute() throws Exception { String result = SUCCESS; @@ -57,7 +84,7 @@ for (Object key : request.getParameterMap().keySet()) { String k = String.valueOf(key); log.debug(String.format("Look for field(%s)", k)); - if (wikitty.hasField(k)) { + if (wikitty.hasField(k) && isAcceptableExtension(k)) { Object v = request.getParameter(k); log.debug(String.format("Put value(%s) in field(%s)", v, k)); wikitty.setFqField(k, v); 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-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-05-24 23:33:19 UTC (rev 46) @@ -17,8 +17,11 @@ private static final long serialVersionUID = 6891064800288772246L; + public static final String REDIRECT_AFTER_LOGIN = "redirectAfterLogin"; + protected String email; protected String password; + protected String redirectTo; public String getEmail() { return email; @@ -36,12 +39,22 @@ this.password = password; } + public String getRedirectTo() { + return redirectTo; + } + /** * Authenticates the user if his email and password are valid */ + @Override public String execute() { String result = INPUT; + // si un utilisateur est deja connecte, on commence par le deloggue + VradiUser user = getVradiSession().getUser(); + if (user != null) { + getVradiSession().invalidate(session); + } try { if (email != null) { email = email.trim(); @@ -49,6 +62,13 @@ if (password != null) { String md5 = StringUtil.encodeMD5(password); getVradiSession().login(email, md5); + redirectTo = (String)session.get(REDIRECT_AFTER_LOGIN); + // on ne laisse pas de trace dans la session + session.remove(REDIRECT_AFTER_LOGIN); + if (redirectTo == null) { + redirectTo = "/"; + } + log.debug(String.format("Login ok, we go to '%s'", redirectTo)); result = SUCCESS; } } @@ -58,4 +78,4 @@ } return result; } -} \ No newline at end of file +} Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-05-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-05-24 23:33:19 UTC (rev 46) @@ -1,13 +1,18 @@ package org.chorem.vradi.interceptors; import java.util.Map; +import javax.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.vradi.VradiSession; +import org.chorem.vradi.actions.LoginAction; import org.chorem.vradi.entities.VradiUser; /** @@ -15,8 +20,12 @@ * where logging is mandatory */ public class LoginInterceptor extends AbstractInterceptor { + private static final long serialVersionUID = -7520186185205372272L; + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(VradiSession.class); + protected String loginRedirect; /** @@ -36,6 +45,25 @@ //If the user isn't logged in if (user == null) { + // put in session url where we must go after login + HttpServletRequest request = ServletActionContext.getRequest(); + String action = request.getPathInfo(); + String redirect = null; + // si l'utilisateur n'a pas demande explicitement la page de login + // on essaiera de le rediriger vers la page qu'il a demande apres + // le login + if (!StringUtils.startsWith(action, loginRedirect)) { + StringBuffer url = request.getRequestURL(); + String query = request.getQueryString(); + if (query != null) { + url.append('?'); + url.append(query); + } + redirect = url.toString(); + } + session.put(LoginAction.REDIRECT_AFTER_LOGIN, redirect); + log.debug(String.format("User not loggued redirect to '%s' and '%s'", + loginRedirect, redirect)); ServletActionContext.getResponse().sendRedirect(loginRedirect); } else { result = invocation.invoke(); Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-05-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-24 23:33:19 UTC (rev 46) @@ -71,15 +71,14 @@ </action> <action name="forgotPassword_*" method="{1}" class="org.chorem.vradi.actions.ForgotPasswordAction"> <result name="input">/WEB-INF/jsp/forgotPassword.jsp</result> - <result type="redirectAction">login_input</result> + <result type="redirectAction">login</result> </action> - <action name="login_*" method="{1}" class="org.chorem.vradi.actions.LoginAction"> + <action name="login" class="org.chorem.vradi.actions.LoginAction"> <result name="input">/WEB-INF/jsp/login.jsp</result> - <result name="login" type="redirectAction">search</result> - <result type="redirectAction">search</result> + <result type="redirect">${redirectTo}</result> </action> <action name="logout" class="org.chorem.vradi.actions.LogoutAction"> - <result type="redirectAction">login_input</result> + <result type="redirectAction">login</result> </action> </package> @@ -109,6 +108,7 @@ +--> <action name="edit/*" class="org.chorem.vradi.actions.EditAction"> <param name="id">{1}</param> + <param name="restrictedExtension">FormNote</param> <result type="wikitty-json"/> </action> </package> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-24 00:35:31 UTC (rev 45) +++ trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-24 23:33:19 UTC (rev 46) @@ -22,27 +22,19 @@ 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> - -  - <filter> - <filter-name>struts2</filter-name> - <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>struts2</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - -  - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - +<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> +  + <filter> + <filter-name>struts2</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>struts2</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> +  + <welcome-file-list> + <welcome-file>search.action</welcome-file> + </welcome-file-list> </web-app>

1 0

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

May 24, 2011

Author: bpoussin Date: 2011-05-24 02:35:31 +0200 (Tue, 24 May 2011) New Revision: 45 Url: http://chorem.org/repositories/revision/vradi/45 Log: edit work correctly Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 00:15:51 UTC (rev 44) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 00:35:31 UTC (rev 45) @@ -1,10 +1,11 @@ package org.chorem.vradi.actions; import com.opensymphony.xwork2.ActionContext; -import java.util.Map; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts2.interceptor.RequestAware; +import org.apache.struts2.interceptor.ServletRequestAware; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; @@ -16,7 +17,7 @@ * Last update: $Date$ * by : $Author$ */ -public class EditAction extends VradiBaseAction implements RequestAware { +public class EditAction extends VradiBaseAction implements ServletRequestAware { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(EditAction.class); @@ -25,11 +26,12 @@ return (EditAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); } - protected Map<String,Object> request; + protected HttpServletRequest request; protected String id; protected Wikitty wikitty; - public void setRequest(Map<String,Object> request) { + @Override + public void setServletRequest(HttpServletRequest request) { this.request = request; } @@ -52,9 +54,11 @@ wikitty = proxy.restore(getId()); if (wikitty != null) { try { - for (String k : request.keySet()) { + for (Object key : request.getParameterMap().keySet()) { + String k = String.valueOf(key); + log.debug(String.format("Look for field(%s)", k)); if (wikitty.hasField(k)) { - Object v = request.get(k); + Object v = request.getParameter(k); log.debug(String.format("Put value(%s) in field(%s)", v, k)); wikitty.setFqField(k, v); }

1 0

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

May 24, 2011

Author: bpoussin Date: 2011-05-24 02:15:51 +0200 (Tue, 24 May 2011) New Revision: 44 Url: http://chorem.org/repositories/revision/vradi/44 Log: minor model change for FormNote Modified: trunk/vradi-entities/src/main/xmi/vradi.zargo Modified: trunk/vradi-entities/src/main/xmi/vradi.zargo =================================================================== (Binary files differ)

1 0

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

May 24, 2011

Author: bpoussin Date: 2011-05-24 02:15:14 +0200 (Tue, 24 May 2011) New Revision: 43 Url: http://chorem.org/repositories/revision/vradi/43 Log: - add edit action to directly modify some wikitty field (not work currently) - add wikitty-json respond in struts.xml to return wikitty objet in json format - begin to add ajax tabbed to view/edit rst text Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java Modified: trunk/pom.xml trunk/vradi-web/pom.xml trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java trunk/vradi-web/src/main/resources/struts.xml trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/pom.xml 2011-05-24 00:15:14 UTC (rev 43) @@ -421,6 +421,18 @@ </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${struts2Version}</version> Modified: trunk/vradi-web/pom.xml =================================================================== --- trunk/vradi-web/pom.xml 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/vradi-web/pom.xml 2011-05-24 00:15:14 UTC (rev 43) @@ -60,6 +60,11 @@ </dependency> <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -75,6 +80,24 @@ </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> </dependency> @@ -148,11 +171,6 @@ </dependency> <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>jrst</artifactId> - </dependency> - - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <scope>runtime</scope> @@ -171,12 +189,6 @@ </dependency> <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <scope>compile</scope> Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java =================================================================== --- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java (rev 0) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/EditAction.java 2011-05-24 00:15:14 UTC (rev 43) @@ -0,0 +1,71 @@ +package org.chorem.vradi.actions; + +import com.opensymphony.xwork2.ActionContext; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.RequestAware; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class EditAction extends VradiBaseAction implements RequestAware { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(EditAction.class); + + static public EditAction getAction() { + return (EditAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + + protected Map<String,Object> request; + protected String id; + protected Wikitty wikitty; + + public void setRequest(Map<String,Object> request) { + this.request = request; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Wikitty getWikitty() { + return wikitty; + } + + @Override + public String execute() throws Exception { + String result = SUCCESS; + WikittyProxy proxy = getProxy(); + wikitty = proxy.restore(getId()); + if (wikitty != null) { + try { + for (String k : request.keySet()) { + if (wikitty.hasField(k)) { + Object v = request.get(k); + log.debug(String.format("Put value(%s) in field(%s)", v, k)); + wikitty.setFqField(k, v); + } + } + wikitty = proxy.store(wikitty); + } catch(Exception eee) { + log.error("Can't edit wikitty", eee); + result = ERROR; + } + } + return result; + } + +} 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:51:55 UTC (rev 42) +++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/FormNoteAction.java 2011-05-24 00:15:14 UTC (rev 43) @@ -1,7 +1,9 @@ package org.chorem.vradi.actions; import com.opensymphony.xwork2.ActionContext; +import java.util.Date; import java.util.Set; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.vradi.entities.Attachment; @@ -74,10 +76,18 @@ return summary; } + public void setSummary(String summary) { + this.summary = summary; + } + public String getContent() { return content; } + public void setContent(String content) { + this.content = content; + } + public PagedResult<Attachment> getAttachments() { return attachments; } @@ -88,18 +98,34 @@ formNote = proxy.restore(FormNote.class, getFormNoteId()); if (formNote == null) { formNote = new FormNoteImpl(); + formNote.setCreationDate(new Date()); formNote.setForm(getFormId()); formNote.addPartners(proxy.getUser().getWikittyId()); + formNote.setSummary(StringUtils.trimToEmpty(summary)); + formNote.setContent(StringUtils.trimToEmpty(content)); + formNote.setSeekingPartner(false); + formNote.setState("Open"); + formNote.addHistory(String.format("%tF creation", + formNote.getCreationDate())); + proxy.store(formNote); } 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(); - + try { + summary = JRST.generate(JRST.TYPE_HTML, formNote.getSummary()); + } catch(Exception eee) { + log.info("Can't generate HTML from RST", eee); + summary = formNote.getSummary(); + } + try { + content = JRST.generate(JRST.TYPE_HTML, formNote.getContent()); + } catch(Exception eee) { + log.info("Can't generate HTML from RST", eee); + content = formNote.getContent(); + } + Criteria criteria = Search.query() .eq(Attachment.FQ_FIELD_ATTACHMENT_FORMNOTE, getFormNoteId()) .criteria().addSortDescending(Attachment.FQ_FIELD_ATTACHMENT_DATE); Modified: trunk/vradi-web/src/main/resources/struts.xml =================================================================== --- trunk/vradi-web/src/main/resources/struts.xml 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-24 00:15:14 UTC (rev 43) @@ -13,9 +13,20 @@ | - surcharge de parametre de certain intercepteur +--> <package name="publicArea" extends="struts-default"> + <result-types> + <result-type name="json" class="org.apache.struts2.json.JSONResult"/> + <result-type name="wikitty-json" class="org.apache.struts2.json.JSONResult"> + <param name="includeProperties">id,extensionNames\[\d+\],fieldValue\..*\..*</param> + <param name="root">wikitty</param> + </result-type> + </result-types> <interceptors> + <interceptor name="json" class="org.apache.struts2.json.JSONInterceptor"/> <interceptor-stack name="publicAreaStack"> <interceptor-ref name="defaultStack"/> + <interceptor-ref name="json"> + <param name="enableSMD">true</param> + </interceptor-ref> </interceptor-stack> </interceptors> <default-interceptor-ref name="publicAreaStack"/> @@ -43,7 +54,7 @@ <package name="restrictedArea" extends="publicArea"> <interceptors> <interceptor name="login" class="org.chorem.vradi.interceptors.LoginInterceptor"> - <param name="loginRedirect">login.action</param> + <param name="loginRedirect">/login.action</param> </interceptor> <interceptor-stack name="restrictedAreaStack"> <interceptor-ref name="login"/> @@ -92,6 +103,14 @@ <param name="formNoteId">{1}</param> <result>/WEB-INF/jsp/formNote.jsp</result> </action> +  + <action name="edit/*" class="org.chorem.vradi.actions.EditAction"> + <param name="id">{1}</param> + <result type="wikitty-json"/> + </action> </package> </struts> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNote.jsp 2011-05-24 00:15:14 UTC (rev 43) @@ -4,15 +4,22 @@ Author : poussin --%> +<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@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"%> +<%@taglib prefix="sx" uri="/struts-dojo-tags"%> <% FormNoteAction action = FormNoteAction.getAction(); -FormNote note = action.getFormNote(); +FormNote formNote = action.getFormNote(); + +ActionContext.getContext().put("localNoteId", formNote.getWikittyId()); +ActionContext.getContext().put("localFieldSummary", FormNote.FQ_FIELD_FORMNOTE_SUMMARY); +ActionContext.getContext().put("localFieldContent", FormNote.FQ_FIELD_FORMNOTE_CONTENT); +ActionContext.getContext().put("localNote", formNote); %> <!DOCTYPE html> @@ -20,35 +27,56 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title><s:text name="vradi.formNote.title" /></title> + <sx:head /> </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> + <s:a action="formNoteEdit/%{localNoteId}?state=close"><s:text name="vradi.formNote.close" /></s:a> + <s:a action="delete/%{localNoteId}"><s:text name="vradi.delete" /></s:a> </div> <div> - <% for (String h : note.getHistory()) { %> + <% for (String h : formNote.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"/> + <s:select size="5" list="partners" listKey="wikittyId" listValue="login"/> + <s:a action="seekPartners/%{localNoteId}"><s:text name="vradi.formNote.seekPartners" /></s:a> + <s:checkbox label="seeking partners" name="formNote.seekingPartners" + onchange="var xhr=new XMLHttpRequest(); xhr.open('GET', 'edit/%{localNoteId}.action?seekingPartners='+this.checked, true);xhr.send(null);"/> </div> <div> - <%=action.getSummary()%> - <div><s:a action="editText?id=<%=note.getWikittyId()%>&field=<%=FormNote.FQ_FIELD_FORMNOTE_SUMMARY%>" label="vradi.text.edit"/></div> + <sx:tabbedpanel id="tabContainer"> + <sx:div label="Summary" > + <iframe> + <%=action.getSummary()%> + </iframe> + </sx:div> + <sx:div label="Edit" > + <s:textarea><%=formNote.getSummary()%></s:textarea> + </sx:div> + </sx:tabbedpanel> + <div> + <s:a action="editText?id=%{localNoteId}&field=%{localFieldSummary}"> + <s:text name="vradi.text.edit"/> + </s:a> + </div> </div> <div> - <%=action.getContent()%> - <div><s:a action="editText?id=<%=note.getWikittyId()%>&field=<%=FormNote.FQ_FIELD_FORMNOTE_CONTENT%>" label="vradi.text.edit"/></div> + <iframe> + <%=action.getContent()%> + </iframe> + <div> + <s:a action="editText?id=%{localNoteId}&field=%{localFieldContent}"> + <s:text name="vradi.text.edit"/> + </s:a> + </div> </div> <div> Modified: trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp =================================================================== --- trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-05-23 07:51:55 UTC (rev 42) +++ trunk/vradi-web/src/main/webapp/WEB-INF/jsp/formNoteList.jsp 2011-05-24 00:15:14 UTC (rev 43) @@ -24,9 +24,9 @@ <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/%{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> + <li><s:a action="formNote/new?formId=%{formId}"><s:text name="vradi.new.formNote"/></s:a></li> </ul> </body> </html>

1 0

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