- Pollen-commits - mailman.cloud.codelutin.com

r3266 - trunk
by tchemit＠users.chorem.org 13 Apr '12

13 Apr '12

Author: tchemit Date: 2012-04-13 18:52:34 +0200 (Fri, 13 Apr 2012) New Revision: 3266 Url: http://chorem.org/repositories/revision/pollen/3266 Log: updates to mavenpom 3.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 16:33:50 UTC (rev 3265) +++ trunk/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.1</version> </parent> <groupId>org.chorem</groupId>

1 0

r3265 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration
by tchemit＠users.chorem.org 13 Apr '12

13 Apr '12

Author: tchemit Date: 2012-04-13 18:33:50 +0200 (Fri, 13 Apr 2012) New Revision: 3265 Url: http://chorem.org/repositories/revision/pollen/3265 Log: fix migration script for pg Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 16:27:58 UTC (rev 3264) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 16:33:50 UTC (rev 3265) @@ -91,7 +91,7 @@ queries.add("ALTER TABLE comment ADD COLUMN author VARCHAR(255);"); - queries.add("UPDATE comment AS c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); + queries.add("UPDATE comment AS c SET author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); queries.add("ALTER TABLE comment ALTER COLUMN author TYPE VARCHAR(255);"); queries.add("UPDATE comment SET author = 'anonymous' WHERE author IS NULL;");

1 0

r3264 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration
by tchemit＠users.chorem.org 13 Apr '12

13 Apr '12

Author: tchemit Date: 2012-04-13 18:27:58 +0200 (Fri, 13 Apr 2012) New Revision: 3264 Url: http://chorem.org/repositories/revision/pollen/3264 Log: fix migration script for postgres Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 15:48:45 UTC (rev 3263) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 16:27:58 UTC (rev 3264) @@ -91,9 +91,11 @@ queries.add("ALTER TABLE comment ADD COLUMN author VARCHAR(255);"); - queries.add("UPDATE comment c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); + queries.add("UPDATE comment AS c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); - queries.add("ALTER TABLE comment ALTER COLUMN author VARCHAR(255) NOT NULL;"); + queries.add("ALTER TABLE comment ALTER COLUMN author TYPE VARCHAR(255);"); + queries.add("UPDATE comment SET author = 'anonymous' WHERE author IS NULL;"); + queries.add("ALTER TABLE comment ALTER COLUMN author SET NOT NULL;"); } private void addForeignKeyIndexes(List<String> queries) {

1 0

r3263 - / branches trunk
by maven-release＠users.chorem.org 13 Apr '12

13 Apr '12

Author: maven-release Date: 2012-04-13 17:48:45 +0200 (Fri, 13 Apr 2012) New Revision: 3263 Url: http://chorem.org/repositories/revision/pollen/3263 Log: move struts2 branch to trunk Added: trunk/ Removed: branches/pollen-1.2.6-struts2/ Property changes on: trunk ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3262 - /
by maven-release＠users.chorem.org 13 Apr '12

13 Apr '12

Author: maven-release Date: 2012-04-13 17:46:47 +0200 (Fri, 13 Apr 2012) New Revision: 3262 Url: http://chorem.org/repositories/revision/pollen/3262 Log: delete 2.0 beta trunk, the branch struts2 will be moved to trunk Removed: trunk/

1 0

r3261 - branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security
by fdesbois＠users.chorem.org 13 Apr '12

13 Apr '12

Author: fdesbois Date: 2012-04-13 17:41:56 +0200 (Fri, 13 Apr 2012) New Revision: 3261 Url: http://chorem.org/repositories/revision/pollen/3261 Log: use error style for security Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Vous devez être connecter en administrateur pour accéder à cette page.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Vous devez être connecter en administrateur pour accéder à cette page.</span></li> + </ul> +</div> \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Vous devez être connecter pour accéder à cette page.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Vous devez être connecter pour accéder à cette page.</span></li> + </ul> +</div> \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Vous n'êtes pas autorisé à accéder à cette page de sondage.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Vous n'êtes pas autorisé à accéder à cette page de sondage.</span></li> + </ul> +</div> \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Seul le créateur du sondage ou un administratuer peut accéder à cette page.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Seul le créateur du sondage ou un administratuer peut accéder à cette page.</span></li> + </ul> +</div> \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-04-13 15:41:50 UTC (rev 3260) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-04-13 15:41:56 UTC (rev 3261) @@ -22,7 +22,8 @@ #L% --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<html> -<head><title></title></head> -<body>Aucun sondage à l'url donné.</body> -</html> \ No newline at end of file +<div class="info_error"> + <ul class="actionErrors"> + <li><span>Aucun sondage à l'url donné.</span></li> + </ul> +</div> \ No newline at end of file

1 0

r3260 - in branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions: . admin poll user
by fdesbois＠users.chorem.org 13 Apr '12

13 Apr '12

Author: fdesbois Date: 2012-04-13 17:41:50 +0200 (Fri, 13 Apr 2012) New Revision: 3260 Url: http://chorem.org/repositories/revision/pollen/3260 Log: use enumeration for skin (pageLogo, jqueryTheme) Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -0,0 +1,35 @@ +package org.chorem.pollen.ui.actions; + +/** + * Created: 13/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public enum PageSkin { + + INDEX("Index", "yellow"), + + VOTE("Vote", "green"), + + RESULT("VoteCounting", "cupertino"), + + EDITION("Creation", "cupertino"); + + private String cssSuffix; + + private String theme; + + private PageSkin(String cssSuffix, String theme) { + this.cssSuffix = cssSuffix; + this.theme = theme; + } + + public String getCssSuffix() { + return cssSuffix; + } + + public String getTheme() { + return theme; + } +} Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -64,13 +64,7 @@ public class PollenActionSupport extends BaseAction implements TopiaTransactionAware { private static final long serialVersionUID = 1L; - - protected static final String JQUERY_THEME_BLUE = "cupertino"; - protected static final String JQUERY_THEME_YELLOW = "yellow"; - - protected static final String JQUERY_THEME_GREEN = "green"; - private static DateFormat dateTimeFormat; private DateFormat dateFormat; @@ -100,10 +94,18 @@ protected transient TopiaContext transaction; + public PageSkin getSkin() { + return PageSkin.INDEX; + } + public String getPageLogo() { - return "Index"; + return getSkin().getCssSuffix(); } + public String getJqueryTheme() { + return getSkin().getTheme(); + } + public PollenSession getPollenSession() { if (pollenSession == null) { pollenSession = PollenSession.get(getActionContext()); @@ -128,10 +130,6 @@ URL url = getServiceContext().getApplicationURL(); return url; } - - public String getJqueryTheme() { - return JQUERY_THEME_BLUE; - } /** * Fabrique pour récupérer le ServiceContext tel qu'il devrait être fourni Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -33,8 +33,4 @@ private static final long serialVersionUID = 1L; - @Override - public String getJqueryTheme() { - return JQUERY_THEME_YELLOW; - } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -43,11 +43,6 @@ protected UserAccount user; - @Override - public String getJqueryTheme() { - return JQUERY_THEME_YELLOW; - } - public UserAccount getUser() { if (user == null) { UserService service = newService(UserService.class); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -40,6 +40,7 @@ import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.services.PollenServiceFunctions; import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.util.Collection; @@ -105,8 +106,8 @@ private transient Function<Choice, Choice> imageChoiceCreator; @Override - public String getPageLogo() { - return "Creation"; + public PageSkin getSkin() { + return PageSkin.EDITION; } protected PollService getPollService() { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -46,6 +46,7 @@ import org.chorem.pollen.services.impl.PollResultsService; import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.services.impl.VoteService; +import org.chorem.pollen.ui.actions.PageSkin; import java.text.DateFormat; import java.util.Date; @@ -103,8 +104,8 @@ private Map<String, String[]> parameters; @Override - public String getPageLogo() { - return "Vote"; + public PageSkin getSkin() { + return PageSkin.VOTE; } protected PollResultsService getPollResultsService() { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -23,6 +23,7 @@ */ package org.chorem.pollen.ui.actions.poll; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -36,7 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String getPageLogo() { - return "Creation"; + public PageSkin getSkin() { + return PageSkin.EDITION; } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -23,6 +23,7 @@ */ package org.chorem.pollen.ui.actions.poll; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -36,12 +37,7 @@ private static final long serialVersionUID = 1L; @Override - public String getPageLogo() { - return "Vote"; + public PageSkin getSkin() { + return PageSkin.VOTE; } - - @Override - public String getJqueryTheme() { - return JQUERY_THEME_GREEN; - } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -44,6 +44,7 @@ import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.services.impl.PollResultsService; import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.ui.actions.PageSkin; import org.nuiton.util.StringUtil; import java.net.URL; @@ -89,8 +90,8 @@ private List<PollResult> topRanking; @Override - public final String getPageLogo() { - return "VoteCounting"; + public PageSkin getSkin() { + return PageSkin.RESULT; } public Poll getPoll() { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -27,6 +27,7 @@ import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -45,8 +46,9 @@ protected String newPassword2; - public String getPageLogo() { - return "Creation"; + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; } public UserAccount getUser() { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -32,6 +32,7 @@ import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException; import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException; import org.chorem.pollen.services.impl.FavoriteService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.util.Map; @@ -49,8 +50,8 @@ private Map<String, String[]> parameters; @Override - public String getPageLogo() { - return "Creation"; + public PageSkin getSkin() { + return PageSkin.EDITION; } protected String action; Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -27,6 +27,7 @@ import org.chorem.pollen.business.persistence.PersonList; import org.chorem.pollen.services.exceptions.FavoriteListAlreadyExistException; import org.chorem.pollen.services.impl.FavoriteService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.io.File; @@ -90,8 +91,8 @@ } @Override - public String getPageLogo() { - return "Creation"; + public PageSkin getSkin() { + return PageSkin.EDITION; } public String create() throws Exception { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -27,6 +27,7 @@ import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -59,8 +60,9 @@ this.password2 = password2; } - public String getPageLogo() { - return "Creation"; + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; } @Override Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-04-13 15:41:42 UTC (rev 3259) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-04-13 15:41:50 UTC (rev 3260) @@ -24,6 +24,7 @@ package org.chorem.pollen.ui.actions.user; import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** @@ -36,8 +37,9 @@ private static final long serialVersionUID = 1L; - public String getPageLogo() { - return "Creation"; + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; } public UserAccount getUser() {

1 0

r3259 - in branches/pollen-1.2.6-struts2: pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-services/src/main/resources/i18n pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user pollen-ui-struts2/src/main/resources pollen-ui-struts2/src/main/resources/config pollen-ui-struts2/src/main/resources/i18n pollen-ui-struts2/src/main/webapp/WEB-INF pollen-ui-struts2/src/main/webapp/WEB-INF/decorators
by fdesbois＠users.chorem.org 13 Apr '12

13 Apr '12

Author: fdesbois Date: 2012-04-13 17:41:42 +0200 (Fri, 13 Apr 2012) New Revision: 3259 Url: http://chorem.org/repositories/revision/pollen/3259 Log: fixes #86 : lost password link Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/SendMail.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -0,0 +1,12 @@ +package org.chorem.pollen.services.exceptions; + +/** + * Created: 13/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public class InvalidEmailException extends Exception { + + private static final long serialVersionUID = 1L; +} Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -64,14 +64,36 @@ user.getDisplayName(), user.getLogin(), user.getPassword(), url); - PollEmail pollEmail = createPollEmail(user.getEmail(), - subject, - content); + PollenEmail pollenEmail = createPollenEmail(user.getEmail(), + subject, + content); - sendEmail(pollEmail); + sendEmail(pollenEmail); } } + public void onLostPassword(UserAccount user, String newPassword) { + + URL url = serviceContext.getApplicationURL(); + + if (url != null) { + + Locale locale = getLocale(); + + String subject = l_(locale, "pollen.email.lostPassword.subject", + user.getLogin()); + String content = l_(locale, "pollen.email.lostPassword.content", + user.getDisplayName(), + user.getLogin(), newPassword, url); + + PollenEmail pollenEmail = createPollenEmail(user.getEmail(), + subject, + content); + + sendEmail(pollenEmail); + } + } + public void onVoteAdded(Poll poll, PollUrl voteURL, PollUrl modifURL) { URL url = serviceContext.getApplicationURL(); @@ -93,10 +115,10 @@ String content = l_(locale, "pollen.email.voteEmail.content", pollTitle, nbVotes, voteURL, modifURL); - PollEmail pollEmail = createPollEmail( + PollenEmail pollenEmail = createPollenEmail( poll.getCreator().getEmail(), subject, content); - sendEmail(pollEmail); + sendEmail(pollenEmail); } } @@ -119,10 +141,10 @@ String content = l_(locale, "pollen.email.creatorEmail.content", pollTitle, voteURL, modifURL); - PollEmail pollEmail = createPollEmail( + PollenEmail pollenEmail = createPollenEmail( poll.getCreator().getEmail(), subject, content); - sendEmail(pollEmail); + sendEmail(pollenEmail); } // Mails à tous les votants @@ -132,13 +154,13 @@ String subject = l_(locale, "pollen.email.votingEmail.subject", pollTitle); - List<PollEmail> emails = Lists.newArrayList(); + List<PollenEmail> emails = Lists.newArrayList(); for (PollAccount account : votingPollAccounts) { - PollEmail pollEmail = + PollenEmail pollenEmail = createVotingEmail(locale, pollTitle, account, voteURL); - emails.add(pollEmail); + emails.add(pollenEmail); } sendEmail(emails); @@ -156,34 +178,13 @@ String pollTitle = poll.getTitle(); - PollEmail pollEmail = + PollenEmail pollenEmail = createVotingEmail(locale, pollTitle, account, voteURL); - sendEmail(pollEmail); + sendEmail(pollenEmail); } } - - private PollEmail createVotingEmail(Locale locale, - String pollTitle, - PollAccount account, - PollUrl voteURL) { - String subject = l_(locale, "pollen.email.votingEmail.subject", - pollTitle); - - PollUrl accountVoteURL = - PollUrl.newPollUrl(voteURL, account.getAccountId()); - - String content = - l_(locale, "pollen.email.votingEmail.content", - pollTitle, account.getVotingId(), accountVoteURL); - - PollEmail result = createPollEmail( - account.getEmail(), subject, content); - - return result; - } - public void onPollReminder(Poll poll, PollUrl voteURL) { URL url = serviceContext.getApplicationURL(); @@ -201,7 +202,7 @@ String subject = l_(locale, "pollen.email.reminderEmail.subject", pollTitle); - List<PollEmail> emails = Lists.newArrayList(); + List<PollenEmail> emails = Lists.newArrayList(); for (PollAccount account : votingPollAccounts) { PollUrl accountVoteURL = PollUrl.newPollUrl(voteURL, account.getAccountId()); @@ -210,21 +211,42 @@ l_(locale, "pollen.email.reminderEmail.content", pollTitle, account.getVotingId(), accountVoteURL); - PollEmail pollEmail = createPollEmail( + PollenEmail pollenEmail = createPollenEmail( account.getEmail(), subject, content); - emails.add(pollEmail); + emails.add(pollenEmail); } sendEmail(emails); } } } - protected void sendEmail(Iterable<PollEmail> pollEmails) { + private PollenEmail createVotingEmail(Locale locale, + String pollTitle, + PollAccount account, + PollUrl voteURL) { + String subject = l_(locale, "pollen.email.votingEmail.subject", + pollTitle); + + PollUrl accountVoteURL = + PollUrl.newPollUrl(voteURL, account.getAccountId()); + + String content = + l_(locale, "pollen.email.votingEmail.content", + pollTitle, account.getVotingId(), accountVoteURL); + + PollenEmail result = createPollenEmail( + account.getEmail(), subject, content); + + return result; + } + + protected void sendEmail(Iterable<PollenEmail> pollEmails) { + //TODO tchemit If two much mails then use SendEmail thread... - for (PollEmail pollEmail : pollEmails) { - sendEmail(pollEmail); + for (PollenEmail pollenEmail : pollEmails) { + sendEmail(pollenEmail); } // // send mail preparation @@ -239,17 +261,17 @@ } - protected void sendEmail(PollEmail pollEmail) { + protected void sendEmail(PollenEmail pollenEmail) { - Preconditions.checkNotNull(pollEmail); + Preconditions.checkNotNull(pollenEmail); - String to = pollEmail.getTo(); + String to = pollenEmail.getTo(); Preconditions.checkNotNull(to); - String subject = pollEmail.getSubject(); + String subject = pollenEmail.getSubject(); Preconditions.checkNotNull(subject); - String content = pollEmail.getContent(); + String content = pollenEmail.getContent(); Preconditions.checkNotNull(content); try { @@ -284,13 +306,13 @@ } } - public static PollEmail createPollEmail(String to, - String subject, - String content) { - return new PollEmail(to, subject, content); + public static PollenEmail createPollenEmail(String to, + String subject, + String content) { + return new PollenEmail(to, subject, content); } - public static class PollEmail { + public static class PollenEmail { protected String subject; @@ -299,7 +321,7 @@ protected String to; - private PollEmail(String to, String subject, String content) { + private PollenEmail(String to, String subject, String content) { this.subject = subject; this.content = content; this.to = to; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/SendMail.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/SendMail.java 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/SendMail.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -191,13 +191,13 @@ // index contains next index to treat so == is ok if (currentIndex >= index) { - EmailService.PollEmail pollEmail = - EmailService.createPollEmail( + EmailService.PollenEmail pollenEmail = + EmailService.createPollenEmail( receiver, subject, body ); - emailService.sendEmail(pollEmail); + emailService.sendEmail(pollenEmail); // MailUtil.sendMail(configuration.getProperty("email_host"), // Integer.parseInt(configuration.getProperty("email_port")), @@ -249,7 +249,7 @@ * @throws IOException */ public void prepareMails(String id, - List<EmailService.PollEmail> mailData) throws IOException { + List<EmailService.PollenEmail> mailData) throws IOException { Writer fileWriter = null; CSVWriter cvsWriter = null; @@ -260,7 +260,7 @@ fileWriter = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(emailFile))); cvsWriter = new CSVWriter(fileWriter); - for (EmailService.PollEmail singleMailData : mailData) { + for (EmailService.PollenEmail singleMailData : mailData) { String[] nextLine = new String[]{ singleMailData.getTo(), singleMailData.getSubject(), Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -33,6 +33,7 @@ import org.chorem.pollen.business.persistence.UserAccountDAO; import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.services.exceptions.InvalidEmailException; import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; @@ -101,7 +102,7 @@ if (byAdmin) { // let's generate the new password - password = RandomStringUtils.randomAlphanumeric(8); + password = generatePassword(); user.setPassword(password); } @@ -189,6 +190,47 @@ } } + /** + * This service is used to retrieve the userAccount associated to the given + * {@code email}. If the user is found, an email will be send with a new + * password. Otherwise an error will occured. + * + * @param email User email + * @throws InvalidEmailException if the email is not valid + * @throws UserNotFoundException if no user matches the given email + */ + public void lostPassword(String email) throws UserNotFoundException, InvalidEmailException { + + Preconditions.checkNotNull(email); + + if (!StringUtil.isEmail(email)) { + throw new InvalidEmailException(); + } + + UserAccount user; + UserAccountDAO dao = getDAO(UserAccount.class); + try { + user = dao.findByEmail(email); + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + + if (user == null) { + throw new UserNotFoundException(); + } + + String newPassword = generatePassword(); + String encodedPassword = encodePassword(newPassword); + + user.setPassword(encodedPassword); + + // send the email + EmailService emailService = newService(EmailService.class); + emailService.onLostPassword(user, newPassword); + + commitTransaction("Can't update lost user password"); + } + public UserAccount getNewUser() { UserAccountDAO dao = getDAO(UserAccount.class); UserAccount result = newInstance(dao); @@ -260,6 +302,10 @@ } } + protected String generatePassword() { + return RandomStringUtils.randomAlphanumeric(8); + } + protected String encodePassword(String password) { return StringUtil.encodeMD5(password); } Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-04-13 15:41:42 UTC (rev 3259) @@ -10,6 +10,8 @@ pollen.common.numberVote-total-votes=Total votes pollen.email.creatorEmail.content=You had just created the new poll\: "%s".\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nEdit page\: \n%s pollen.email.creatorEmail.subject=[Pollen] Poll creation (%s) +pollen.email.lostPassword.content=Hello %1$s. You have just asked for a new password generation for your Pollen account.\n\nLogin\: %2$s\nPassword\: %3$s\n\nYou can now manage your polls by logging on the website \: \n%4$s +pollen.email.lostPassword.subject=[Pollen] Lost password for %s pollen.email.reminderEmail.content=You have not yet voted for the poll "%s".\nYou can still participate with the identifier %s by following this link\: \n%s pollen.email.reminderEmail.subject=[Pollen] Reminder (%s) pollen.email.userRegister.content=Welcome %1$s. You had just created an account on the web application Pollen.\n\nLogin\: %2$s\nPassword\: %3$s\n\nYou can now manage your polls by logging on the website \: \n%4$s Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-04-13 15:41:42 UTC (rev 3259) @@ -12,6 +12,8 @@ pollen.email.createPoll.subject=[Pollen] Création d'un sondage (%1$s) pollen.email.creatorEmail.content=Vous venez de créer le sondage "%s".\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nPage de vote \: \n%s\nPage de modification \: \n%s pollen.email.creatorEmail.subject=[Pollen] Création d'un sondage (%s) +pollen.email.lostPassword.content=Bonjour %1$s. Vous venez de demander la génération d'un nouveau mot de passe d'accès à votre compte Pollen.\n\nIdentifiant \: %2$s\nMot de passe \: %3$s\n\nVous pouvez dès maintenant gérer vos sondages en vous identifiant sur le site \: \n%4$s +pollen.email.lostPassword.subject=[Pollen] Mot de passe perdu du compte %s pollen.email.reminderEmail.content=Vous n'avez pas encore voté pour le sondage "%s".\nVous pouvez encore y participer avec l'identifiant %s à l'adresse suivante \: \n%s pollen.email.reminderEmail.subject=[Pollen] Rappel (%s) pollen.email.userRegister.content=Bienvenue %1$s. Vous venez de créer un compte sur l'application de sondage en ligne Pollen.\n\nIdentifiant \: %2$s\nMot de passe \: %3$s\n\nVous pouvez dès maintenant gérer vos sondages en vous identifiant sur le site \: \n%4$s Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-04-13 15:41:42 UTC (rev 3259) @@ -0,0 +1,49 @@ +package org.chorem.pollen.ui.actions.user; + +import org.apache.commons.lang.StringUtils; +import org.chorem.pollen.services.exceptions.UserNotFoundException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.util.StringUtil; + +/** + * Created: 13/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public class LostPassword extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + private String email; + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + @Override + public String execute() throws Exception { + + if (StringUtils.isBlank(email) || !StringUtil.isEmail(email)) { + addActionError( _("pollen.error.lostPassword.email")); + + } else { + + UserService service = newService(UserService.class); + try { + service.lostPassword(email); + + addActionMessage(_("pollen.information.lostPassword.success")); + + } catch (UserNotFoundException e) { + addActionError(_("pollen.error.lostPassword.user")); + } + } + return SUCCESS; + } +} Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-04-13 15:41:42 UTC (rev 3259) @@ -58,6 +58,12 @@ </result> </action> +  + <action name="lostPassword" class="org.chorem.pollen.ui.actions.user.LostPassword"> + <result name="input">/WEB-INF/jsp/user/dialogLostPassword.jsp</result> + <result type="redirectToHome"/> + </action> +  <action name="logout" class="org.chorem.pollen.ui.actions.user.Logout"> <result type="redirectToHome"/> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-13 15:41:42 UTC (rev 3259) @@ -1,3 +1,4 @@ +email=E-mail pollen.action.addChoice=Add choice pollen.action.addComment=Add a comment pollen.action.addPersonToList=Add a voter @@ -39,6 +40,7 @@ pollen.action.pollVotingListDelete=Supprimer le groupe de votants pollen.action.pollVotingListEdit=Editer ce groupe de votants pollen.action.register=Register +pollen.action.send=Send pollen.action.validate=Submit pollen.common.aboutPoll=About the poll pollen.common.addingChoices=Adding choices @@ -131,6 +133,8 @@ pollen.error.favoriteList.participant.not.found.in.list=Member not found in favorite list pollen.error.favoriteListName.required=List name mandatory pollen.error.login.required=You must provide a login +pollen.error.lostPassword.email=The provided e-mail is not valid. +pollen.error.lostPassword.user=No user matches the given e-mail pollen.error.no.poll.found=Poll not found with id %s pollen.error.password.required=Your must provide a password pollen.error.password2.required=You must repeat your password for confirmation @@ -160,6 +164,7 @@ pollen.error.user.alreadyVoted=Someone has already used the name %s to vote. pollen.error.user.bad.login.or.password=Login or password invalid. pollen.error.user.email.already.used=This email is already used +pollen.error.user.invalid.email=Invalid e-mail pollen.error.user.invalid.password=Invalid password pollen.error.user.login.already.used=This login is already used pollen.error.user.not.found=User not found @@ -192,6 +197,7 @@ pollen.information.favoriteList.created=Favorite list %s created. pollen.information.favoriteList.deleted=Favorite list %s deleted. pollen.information.irreversible.operation=Be ware, this operation is irreversible. +pollen.information.lostPassword.success=An e-mail was sent with your new password. You can change it on your user account page. pollen.information.need.login=You must be logged to access this page. Please fill the form below. pollen.information.poll.created=Poll created pollen.information.poll.form.voteStarted=Votes are started, some options can't be updated. @@ -217,6 +223,7 @@ pollen.legend.login=Login pollen.legend.select.favoriteList.to.add=Sélectionner la liste de favoris à ajouter pollen.legend.select.personList.to.create.votingList=Sélectionner la liste des votant à importer dans le nouveau groupe +pollen.link.lostPassword=Forget password ? pollen.menu.admin=Administration pollen.menu.createPoll=Create a poll pollen.menu.home=Home Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-13 15:41:42 UTC (rev 3259) @@ -1,3 +1,4 @@ +email=E-mail pollen.action.addChoice=Ajouter un choix pollen.action.addComment=Ajouter un commentaire pollen.action.addPersonListFromVotingList=Ajouter des votants à partir d'une liste de votants @@ -44,6 +45,7 @@ pollen.action.pollVotingListDelete=Supprimer le groupe de votants pollen.action.pollVotingListEdit=Editer ce groupe de votants pollen.action.register=S'enregistrer +pollen.action.send=Envoyer pollen.action.validate=Valider pollen.common.aboutPoll=A propos du sondage pollen.common.addingChoices=Ajout des choix @@ -138,6 +140,8 @@ pollen.error.favoriteList.participant.not.found.in.list=Membre non trouvé dans la liste pollen.error.favoriteListName.required=Nom de liste obligatoire pollen.error.login.required=Login obligatoire +pollen.error.lostPassword.email=L'e-mail saisi n'est pas valide. +pollen.error.lostPassword.user=Aucun utilisateur correspond au courriel renseigné. pollen.error.no.poll.found=Sondage non trouvé avec l'id %s pollen.error.password.required=Mot de passe obligatoire pollen.error.password2.required=Mot de passe répété obligatoire @@ -167,6 +171,7 @@ pollen.error.user.alreadyVoted=Une personne a déjà voté sous le nom %s. pollen.error.user.bad.login.or.password=Mauvais identifiant ou mot de passe. pollen.error.user.email.already.used=Le courriel saisi est déjà utilisé par un autre utilisateur +pollen.error.user.invalid.email=E-mail invalide pollen.error.user.invalid.password=Mot de passe invalide pollen.error.user.login.already.used=Le login saisie est déjà utilisé par un autre utilisateur pollen.error.user.not.found=Utilisateur non trouvé @@ -200,6 +205,8 @@ pollen.information.favoriteList.created=La liste %s a été créée. pollen.information.favoriteList.deleted=La liste %s a été supprimée. pollen.information.irreversible.operation=Attention, Cette opération est irréversible. +pollen.information.lostPassword=Vous allez recevoir un nouveau mot de passe sur l'e-mail suivant +pollen.information.lostPassword.success=Un e-mail vous a été envoyé avec votre nouveau mot de passe. Vous pouvez le changer sur la page d'édition de votre compte. pollen.information.need.login=Vous devez être identifié pour pouvoir accéder à cette page. Veuillez remplir le formulaire ci-dessous. pollen.information.poll.created=Sondage créé pollen.information.poll.form.voteStarted=Les votes ont commencé, certaines options ne sont pas modifiables. @@ -225,6 +232,7 @@ pollen.legend.login=Login pollen.legend.select.favoriteList.to.add=Sélectionner la liste de favoris à ajouter pollen.legend.select.personList.to.create.votingList=Sélectionner la liste des votant à importer dans le nouveau groupe +pollen.link.lostPassword=Mot de passe oublié ? pollen.menu.admin=Administration pollen.menu.createPoll=Créer un sondage pollen.menu.home=Accueil Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini 2012-04-13 15:41:42 UTC (rev 3259) @@ -18,8 +18,9 @@ [urls] # anon urls -/user/login = anon -/user/register** = anon +/user/login=anon +/user/register**=anon +/user/lostPassword**=anon # connected urls /user/**=connected Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-13 15:41:42 UTC (rev 3259) @@ -52,7 +52,19 @@ jQuery(document).ready(function () { // apply common style - $('fieldset').attr('class', 'ui-widget-content ui-corner-all') + $('fieldset').attr('class', 'ui-widget-content ui-corner-all'); + + // Popup for lostPassword + $('#lostPasswordLink').click(function() { + + $('.ui-dialog-title').html('<s:text name="pollen.link.lostPassword"/>'); + + var url = '<s:url action="lostPassword" method="input" namespace="/user"/>'; + var dialog = $("#lostPasswordDialog"); + dialog.load(url); + dialog.dialog('open'); + return false; + }); }); </script> <s:set var="user" value="%{#session.pollenSession.userAccount}"/> @@ -119,6 +131,9 @@ <div class="dropdown_menu" id="login_menu" style="display: none;"> <div class="top_right${pageLogo}"></div> <div class="top_left${pageLogo}"></div> + + <sj:dialog id="lostPasswordDialog" autoOpen="false" modal="true" width="500"/> + <s:form id="connection" method="POST" namespace="/user" action="login"> <ul class="top_middle${pageLogo}"> <li> @@ -136,6 +151,11 @@ label="" theme="simple"/> </li> <li> + <a id="lostPasswordLink"> + <s:text name="pollen.link.lostPassword"/> + </a> + </li> + <li> <s:submit id="submitform" action="login" key="pollen.action.login" align="right"/> </li> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-04-13 15:41:30 UTC (rev 3258) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-04-13 15:41:42 UTC (rev 3259) @@ -29,10 +29,9 @@ <pattern>/images/*</pattern> <pattern>/config-browser/*</pattern> <pattern>/json/*</pattern> - <pattern>/user/confirm*</pattern> - <pattern>/admin/confirm*</pattern> - <pattern>/poll/confirm*</pattern> + <pattern>/*/confirm*</pattern> <pattern>/poll/display*</pattern> + <pattern>/user/lostPassword*</pattern> <pattern>/poll/importPersonList*</pattern> <pattern>/poll/selectPersonListTo*</pattern> <pattern>/io/*</pattern> Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-04-13 15:41:42 UTC (rev 3259) @@ -0,0 +1,50 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<script type="text/javascript"> + function cancel() { + $('#lostPasswordDialog').dialog('close'); + return false; + } +</script> +<s:form method="POST" namespace="/user"> + <fieldset class="ui-widget-content ui-corner-all"> + + <s:text name="pollen.information.lostPassword"/> + + <div style="padding: 1em; margin-bottom: 3em;"> + <s:textfield key="email" required="true" size="30"/> + </div> + + <hr/> + + <div align="right"> + <s:submit onclick="return cancel();" theme="simple" + key="pollen.action.cancel"/> + <s:submit key="pollen.action.send" theme="simple" + action="lostPassword"/> + </div> + </fieldset> +</s:form> \ No newline at end of file

1 0

r3258 - branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp
by fdesbois＠users.chorem.org 13 Apr '12

13 Apr '12

Author: fdesbois Date: 2012-04-13 17:41:30 +0200 (Fri, 13 Apr 2012) New Revision: 3258 Url: http://chorem.org/repositories/revision/pollen/3258 Log: repair broken links on home page Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-04-13 11:28:02 UTC (rev 3257) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-04-13 15:41:30 UTC (rev 3258) @@ -32,13 +32,9 @@ </div> <div class="center"> - <s:a action="create" namespace="/poll" method="input"> + <s:a action="create" namespace="/poll"> <img src="<s:url value='/img/smallCreation_%{safeLanguage}.png' />" alt="poll creation"/> </s:a> - <s:a action="createForm" namespace="/poll"> - <img src="<s:url value='/img/smallVote_%{safeLanguage}.png' />" alt="vote"/> - </s:a> - <s:a action="createForm" namespace="/poll"> - <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" alt="voteCounting"/> - </s:a> + <img src="<s:url value='/img/smallVote_%{safeLanguage}.png' />" alt="vote"/> + <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" alt="voteCounting"/> </div> \ No newline at end of file

1 0

r3257 - in branches/pollen-1.2.6-struts2: pollen-domain/src/main/java/org/chorem/poll/domain pollen-domain/src/main/java/org/chorem/poll/domain/poll pollen-domain/src/main/java/org/chorem/poll/domain/strategy pollen-domain/src/test/java/org/chorem/poll/domain pollen-domain/src/test/java/org/chorem/poll/domain/strategy pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/java/org/chorem/pollen/entities/migration pollen-persistence/src/main/xmi pollen-persistence/src
by fdesbois＠users.chorem.org 13 Apr '12

13 Apr '12

Author: fdesbois Date: 2012-04-13 13:28:02 +0200 (Fri, 13 Apr 2012) New Revision: 3257 Url: http://chorem.org/repositories/revision/pollen/3257 Log: set version 1.3 (replace @since 1.2.6 and update migration model version) Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java Removed: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/ImportExportService.java branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/VoteCountingService.java branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/poll/I18nAble.java branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/ImportExportService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/ImportExportService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/ImportExportService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -53,7 +53,7 @@ * Service to import / export a poll to or from his xml representation. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ImportExportService { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -4,7 +4,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenDomainFunctions { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/VoteCountingService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/VoteCountingService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/VoteCountingService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -49,7 +49,7 @@ * Service qui permet le dépouillement d'un sondage. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteCountingService { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/poll/I18nAble.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/poll/I18nAble.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/poll/I18nAble.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * Contract to expose a i18n key. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public interface I18nAble { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -9,7 +9,7 @@ * Contract of a strategy of a vote countig. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public interface VoteCountingStrategy { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ImportExportServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteCountingServiceTest { @Test Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class CondorcetVoteCountingStrategyTest { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class NumberVoteCountingStrategyTest { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PercentageVoteCountingStrategyTest { Modified: branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -6,7 +6,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class StandardVoteCountingStrategyTest { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * Some utils IO methods. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PolleIOUtil { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -46,7 +46,7 @@ * Pollen configuration. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenConfiguration { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * All Pollen configuration options. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -48,7 +48,7 @@ * Usefull pollen functions. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenFunctions { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -25,7 +25,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenTechnicalException extends RuntimeException { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -41,7 +41,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenTopiaRootContextFactory { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Pollen Migration callback. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenMigrationCallback extends TopiaMigrationCallbackByClass { @@ -42,11 +42,11 @@ public static final Version V_1_2 = VersionUtil.valueOf("1.2"); - public static final Version V_1_2_6 = VersionUtil.valueOf("1.2.6"); + public static final Version V_1_3 = VersionUtil.valueOf("1.3"); /** Les versions de mise à jour disponibles. */ public static final Version[] AVAILABLE_VERSIONS = new Version[]{ - V_1_1, V_1_2, V_1_2_6 + V_1_1, V_1_2, V_1_3 }; public PollenMigrationCallback() { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Migration for version {@code 1.1}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenMigrationCallbackV1_1 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Migration for version {@code 1.2}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenMigrationCallbackV1_2 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { Deleted: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -1,314 +0,0 @@ -/* - * #%L - * Pollen :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.entities.migration; - -import com.google.common.base.Function; -import com.google.common.collect.Maps; -import org.apache.commons.lang3.tuple.Pair; -import org.chorem.pollen.PollenTechnicalException; -import org.chorem.pollen.common.ChoiceType; -import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; - -/** - * Migration for version {@code 1.2.6}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 - */ -public class PollenMigrationCallbackV1_2_6 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { - - public PollenMigrationCallbackV1_2_6(TopiaMigrationCallbackByClass callBack) { - super(PollenMigrationCallback.V_1_2_6, callBack); - } - - @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, - List<String> queries, - boolean showSql, - boolean showProgression) throws TopiaException { - -// Dialect dialect = -// Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); -// -// if (dialect instanceof PostgreSQLDialect) { -// -// } else if (dialect instanceof H2Dialect) { -// } - - // change choice type to use enumeration - migrateChoiceTypes(tx, queries); - - // change poll type to use enumeration - migratePollTypes(tx, queries); - - // change vote counting type to use enumeration - migrateVoteCountingTypes(tx, queries); - - // change all Boolean properties to boolean - migrateToPrimitiveTypes(queries); - - // add foreign key indexes - addForeignKeyIndexes(queries); - - // add author column for Comment - addCommentAuthorColumn(queries); - } - - private void addCommentAuthorColumn(List<String> queries) { - - queries.add("ALTER TABLE comment ADD COLUMN author VARCHAR(255);"); - - queries.add("UPDATE comment c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); - - queries.add("ALTER TABLE comment ALTER COLUMN author VARCHAR(255) NOT NULL;"); - } - - private void addForeignKeyIndexes(List<String> queries) { - - queries.add("CREATE INDEX idx_PollAccount_pollsCreated ON poll(creator);"); - queries.add("CREATE INDEX idx_PollAccount_comment ON comment(pollAccount);"); - queries.add("CREATE INDEX idx_PollAccount_vote ON vote(pollAccount);"); - queries.add("CREATE INDEX idx_Poll_vote ON vote(poll);"); - queries.add("CREATE INDEX idx_Poll_choice ON choice(poll);"); - queries.add("CREATE INDEX idx_Poll_result ON result(poll);"); - queries.add("CREATE INDEX idx_Poll_comment ON comment(poll);"); - queries.add("CREATE INDEX idx_Poll_preventRule ON preventRule(poll);"); - queries.add("CREATE INDEX idx_Poll_votingList ON votingList(poll);"); - queries.add("CREATE INDEX idx_UserAccount_favoriteList ON personList(owner);"); - queries.add("CREATE INDEX idx_UserAccount_pollAccount ON pollAccount(userAccount);"); - queries.add("CREATE INDEX idx_PersonList_pollAccount ON pollAccount(personList);"); - } - - private void migrateToPrimitiveTypes(List<String> queries) throws TopiaException { - - migrateBoolean(queries, "useraccount", "administrator"); - migrateBoolean(queries, "choice", "validate"); - migrateBoolean(queries, "personToList", "hasVoted"); - migrateBoolean(queries, "poll", "closed"); - migrateBoolean(queries, "poll", "choiceAddAllowed"); - migrateBoolean(queries, "poll", "anonymousVoteAllowed"); - migrateBoolean(queries, "poll", "anonymous"); - migrateBoolean(queries, "poll", "publicResults"); - migrateBoolean(queries, "poll", "continuousResults"); - migrateBoolean(queries, "preventRule", "repeated"); - migrateBoolean(queries, "preventRule", "active"); - migrateBoolean(queries, "preventRule", "oneTime"); - migrateBoolean(queries, "result", "byGroup"); - migrateBoolean(queries, "vote", "anonymous"); - - migrateNumber(queries, "poll", "maxChoiceNb"); - migrateNumber(queries, "preventRule", "sensibility"); - - migrateNumber(queries, "PersonToList", "weight"); - migrateNumber(queries, "VotingList", "weight"); - migrateNumber(queries, "Vote", "weight"); - } - - public static final String UPDATE_PRIMITIVE_TO_DEFAULT_VALUE = "UPDATE %1$s SET %2$s = %3$s where %2$s IS NULL;"; - - public static final String ADD_PRIMITIVE_NOT_NULL_CONSTRAINST = "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL;"; - - public static final String ADD_PRIMITIVE_DEFAULT_VALUE = "ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;"; - - private void migrateBoolean(List<String> queries, String tableName, String field) { - - Object defaultValue = false; - queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); - queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); - queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); - - } - - private void migrateNumber(List<String> queries, String tableName, String field) { - - Object defaultValue = 0; - queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); - queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); - queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); - } - - private void migrateChoiceTypes(TopiaContextImplementor tx, - List<String> queries) throws TopiaException { - - // build the new mapping between old choice type id associated to new choicetype enum ordinal - Map<String, Integer> mapping = getMapping(tx, "choicetype", ChoiceType.values()); - - replaceColumn(tx, - "poll", - "fk3497bf5b0b3601", - "choicetype", - "choicetype", - mapping, - queries); - - // drop choicetype table - queries.add("DROP TABLE choicetype;"); - } - - private void migratePollTypes(TopiaContextImplementor tx, - List<String> queries) throws TopiaException { - - // build the new mapping between old choice type id associated to new choicetype enum ordinal - Map<String, Integer> mapping = getMapping(tx, "polltype", PollType.values()); - - replaceColumn(tx, - "poll", - "fk3497bf978bfd", - "polltype", - "polltype", - mapping, - queries); - - // drop pollType table - queries.add("DROP TABLE polltype;"); - } - - private void migrateVoteCountingTypes(TopiaContextImplementor tx, - List<String> queries) throws TopiaException { - - // build the new mapping between old id associated to new enum ordinal - Map<String, Integer> mapping = getMapping(tx, "votecounting", VoteCountingType.values()); - - replaceColumn(tx, - "poll", - "fk3497bf7d358045", - "votecounting", - "votecountingtype", - mapping, - queries); - - replaceColumn(tx, - "result", - "fkc84dc81d7d358045", - "votecounting", - "votecountingtype", - mapping, - queries); - - // drop votecounting table - queries.add("DROP TABLE votecounting;"); - } - - private <E extends Enum<E>> Map<String, Integer> getMapping(TopiaContextImplementor tx, String tableName, E... enums) throws TopiaException { - - List<Pair<String, String>> entitiesFromDb = - new TopiaIdSQLQueryToPair("select topiaId, name from " + tableName).findMultipleResult(tx); - - Map<String, Pair<String, String>> entityByTopiaIdAndName = - Maps.uniqueIndex(entitiesFromDb, PAIR_TO_VALUE); - - // build the new mapping between old id associated to new enum ordinal - Map<String, Integer> result = Maps.newHashMap(); - - for (Enum choiceType : enums) { - - // find it in existing mapping - String name = choiceType.name(); - Pair<String, String> choiceTypePair = entityByTopiaIdAndName.get(name); - if (choiceTypePair == null) { - - // this can not happen - throw new PollenTechnicalException( - "Could not find in db to migrate choicetype with name " + name); - } - - String id = choiceTypePair.getKey(); - result.put(id, choiceType.ordinal()); - } - return result; - } - - private void replaceColumn(TopiaContextImplementor tx, - String tableName, String fk, - String oldColumn, - String newColum, - Map<String, Integer> mapping, - List<String> queries) throws TopiaException { - - List<Pair<String, String>> rowsToReplace = - new TopiaIdSQLQueryToPair("select topiaId, " + oldColumn + " from " + tableName).findMultipleResult(tx); - - queries.add("ALTER TABLE " + tableName + " DROP CONSTRAINT " + fk + ";"); - queries.add("ALTER TABLE " + tableName + " DROP COLUMN " + oldColumn + ";"); - queries.add("ALTER TABLE " + tableName + " ADD COLUMN " + newColum + " INT NOT NULL DEFAULT 0;"); - queries.add("ALTER TABLE " + tableName + " ALTER COLUMN " + newColum + " DROP NOT NULL;"); - - String updateRequest = "update " + tableName + " set " + newColum + " = %s where topiaid = '%s';"; - for (Pair<String, String> pollByChoice : rowsToReplace) { - - String tableRowId = pollByChoice.getKey(); - String typeId = pollByChoice.getValue(); - - Integer ordinalValue = mapping.get(typeId); - if (ordinalValue == null) { - - // use a 0 value - ordinalValue = 0; - } - String query = String.format(updateRequest, ordinalValue, tableRowId); - queries.add(query); - } - } - - private static class TopiaIdSQLQueryToPair extends TopiaSQLQuery<Pair<String, String>> { - - protected final String request; - - private TopiaIdSQLQueryToPair(String request) { - this.request = request; - } - - @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement prepareStatement = connection.prepareStatement(request); - return prepareStatement; - } - - @Override - protected Pair<String, String> prepareResult(ResultSet set) throws SQLException { - Pair<String, String> result = Pair.of(set.getString(1), set.getString(2)); - return result; - } - } - - public static final Function<Pair<String, String>, String> PAIR_TO_VALUE = new Function<Pair<String, String>, String>() { - @Override - public String apply(Pair<String, String> input) { - return input.getValue(); - } - }; - -} Copied: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java (from rev 3256, branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -0,0 +1,314 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.entities.migration; + +import com.google.common.base.Function; +import com.google.common.collect.Maps; +import org.apache.commons.lang3.tuple.Pair; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.common.VoteCountingType; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; +import java.util.Map; + +/** + * Migration for version {@code 1.2.6}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 + */ +public class PollenMigrationCallbackV1_3 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { + + public PollenMigrationCallbackV1_3(TopiaMigrationCallbackByClass callBack) { + super(PollenMigrationCallback.V_1_3, callBack); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + +// Dialect dialect = +// Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); +// +// if (dialect instanceof PostgreSQLDialect) { +// +// } else if (dialect instanceof H2Dialect) { +// } + + // change choice type to use enumeration + migrateChoiceTypes(tx, queries); + + // change poll type to use enumeration + migratePollTypes(tx, queries); + + // change vote counting type to use enumeration + migrateVoteCountingTypes(tx, queries); + + // change all Boolean properties to boolean + migrateToPrimitiveTypes(queries); + + // add foreign key indexes + addForeignKeyIndexes(queries); + + // add author column for Comment + addCommentAuthorColumn(queries); + } + + private void addCommentAuthorColumn(List<String> queries) { + + queries.add("ALTER TABLE comment ADD COLUMN author VARCHAR(255);"); + + queries.add("UPDATE comment c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); + + queries.add("ALTER TABLE comment ALTER COLUMN author VARCHAR(255) NOT NULL;"); + } + + private void addForeignKeyIndexes(List<String> queries) { + + queries.add("CREATE INDEX idx_PollAccount_pollsCreated ON poll(creator);"); + queries.add("CREATE INDEX idx_PollAccount_comment ON comment(pollAccount);"); + queries.add("CREATE INDEX idx_PollAccount_vote ON vote(pollAccount);"); + queries.add("CREATE INDEX idx_Poll_vote ON vote(poll);"); + queries.add("CREATE INDEX idx_Poll_choice ON choice(poll);"); + queries.add("CREATE INDEX idx_Poll_result ON result(poll);"); + queries.add("CREATE INDEX idx_Poll_comment ON comment(poll);"); + queries.add("CREATE INDEX idx_Poll_preventRule ON preventRule(poll);"); + queries.add("CREATE INDEX idx_Poll_votingList ON votingList(poll);"); + queries.add("CREATE INDEX idx_UserAccount_favoriteList ON personList(owner);"); + queries.add("CREATE INDEX idx_UserAccount_pollAccount ON pollAccount(userAccount);"); + queries.add("CREATE INDEX idx_PersonList_pollAccount ON pollAccount(personList);"); + } + + private void migrateToPrimitiveTypes(List<String> queries) throws TopiaException { + + migrateBoolean(queries, "useraccount", "administrator"); + migrateBoolean(queries, "choice", "validate"); + migrateBoolean(queries, "personToList", "hasVoted"); + migrateBoolean(queries, "poll", "closed"); + migrateBoolean(queries, "poll", "choiceAddAllowed"); + migrateBoolean(queries, "poll", "anonymousVoteAllowed"); + migrateBoolean(queries, "poll", "anonymous"); + migrateBoolean(queries, "poll", "publicResults"); + migrateBoolean(queries, "poll", "continuousResults"); + migrateBoolean(queries, "preventRule", "repeated"); + migrateBoolean(queries, "preventRule", "active"); + migrateBoolean(queries, "preventRule", "oneTime"); + migrateBoolean(queries, "result", "byGroup"); + migrateBoolean(queries, "vote", "anonymous"); + + migrateNumber(queries, "poll", "maxChoiceNb"); + migrateNumber(queries, "preventRule", "sensibility"); + + migrateNumber(queries, "PersonToList", "weight"); + migrateNumber(queries, "VotingList", "weight"); + migrateNumber(queries, "Vote", "weight"); + } + + public static final String UPDATE_PRIMITIVE_TO_DEFAULT_VALUE = "UPDATE %1$s SET %2$s = %3$s where %2$s IS NULL;"; + + public static final String ADD_PRIMITIVE_NOT_NULL_CONSTRAINST = "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL;"; + + public static final String ADD_PRIMITIVE_DEFAULT_VALUE = "ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;"; + + private void migrateBoolean(List<String> queries, String tableName, String field) { + + Object defaultValue = false; + queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); + queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); + queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); + + } + + private void migrateNumber(List<String> queries, String tableName, String field) { + + Object defaultValue = 0; + queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); + queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); + queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); + } + + private void migrateChoiceTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + // build the new mapping between old choice type id associated to new choicetype enum ordinal + Map<String, Integer> mapping = getMapping(tx, "choicetype", ChoiceType.values()); + + replaceColumn(tx, + "poll", + "fk3497bf5b0b3601", + "choicetype", + "choicetype", + mapping, + queries); + + // drop choicetype table + queries.add("DROP TABLE choicetype;"); + } + + private void migratePollTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + // build the new mapping between old choice type id associated to new choicetype enum ordinal + Map<String, Integer> mapping = getMapping(tx, "polltype", PollType.values()); + + replaceColumn(tx, + "poll", + "fk3497bf978bfd", + "polltype", + "polltype", + mapping, + queries); + + // drop pollType table + queries.add("DROP TABLE polltype;"); + } + + private void migrateVoteCountingTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + // build the new mapping between old id associated to new enum ordinal + Map<String, Integer> mapping = getMapping(tx, "votecounting", VoteCountingType.values()); + + replaceColumn(tx, + "poll", + "fk3497bf7d358045", + "votecounting", + "votecountingtype", + mapping, + queries); + + replaceColumn(tx, + "result", + "fkc84dc81d7d358045", + "votecounting", + "votecountingtype", + mapping, + queries); + + // drop votecounting table + queries.add("DROP TABLE votecounting;"); + } + + private <E extends Enum<E>> Map<String, Integer> getMapping(TopiaContextImplementor tx, String tableName, E... enums) throws TopiaException { + + List<Pair<String, String>> entitiesFromDb = + new TopiaIdSQLQueryToPair("select topiaId, name from " + tableName).findMultipleResult(tx); + + Map<String, Pair<String, String>> entityByTopiaIdAndName = + Maps.uniqueIndex(entitiesFromDb, PAIR_TO_VALUE); + + // build the new mapping between old id associated to new enum ordinal + Map<String, Integer> result = Maps.newHashMap(); + + for (Enum choiceType : enums) { + + // find it in existing mapping + String name = choiceType.name(); + Pair<String, String> choiceTypePair = entityByTopiaIdAndName.get(name); + if (choiceTypePair == null) { + + // this can not happen + throw new PollenTechnicalException( + "Could not find in db to migrate choicetype with name " + name); + } + + String id = choiceTypePair.getKey(); + result.put(id, choiceType.ordinal()); + } + return result; + } + + private void replaceColumn(TopiaContextImplementor tx, + String tableName, String fk, + String oldColumn, + String newColum, + Map<String, Integer> mapping, + List<String> queries) throws TopiaException { + + List<Pair<String, String>> rowsToReplace = + new TopiaIdSQLQueryToPair("select topiaId, " + oldColumn + " from " + tableName).findMultipleResult(tx); + + queries.add("ALTER TABLE " + tableName + " DROP CONSTRAINT " + fk + ";"); + queries.add("ALTER TABLE " + tableName + " DROP COLUMN " + oldColumn + ";"); + queries.add("ALTER TABLE " + tableName + " ADD COLUMN " + newColum + " INT NOT NULL DEFAULT 0;"); + queries.add("ALTER TABLE " + tableName + " ALTER COLUMN " + newColum + " DROP NOT NULL;"); + + String updateRequest = "update " + tableName + " set " + newColum + " = %s where topiaid = '%s';"; + for (Pair<String, String> pollByChoice : rowsToReplace) { + + String tableRowId = pollByChoice.getKey(); + String typeId = pollByChoice.getValue(); + + Integer ordinalValue = mapping.get(typeId); + if (ordinalValue == null) { + + // use a 0 value + ordinalValue = 0; + } + String query = String.format(updateRequest, ordinalValue, tableRowId); + queries.add(query); + } + } + + private static class TopiaIdSQLQueryToPair extends TopiaSQLQuery<Pair<String, String>> { + + protected final String request; + + private TopiaIdSQLQueryToPair(String request) { + this.request = request; + } + + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement prepareStatement = connection.prepareStatement(request); + return prepareStatement; + } + + @Override + protected Pair<String, String> prepareResult(ResultSet set) throws SQLException { + Pair<String, String> result = Pair.of(set.getString(1), set.getString(2)); + return result; + } + } + + public static final Function<Pair<String, String>, String> PAIR_TO_VALUE = new Function<Pair<String, String>, String>() { + @Override + public String apply(Pair<String, String> input) { + return input.getValue(); + } + }; + +} Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-04-13 11:28:02 UTC (rev 3257) @@ -25,6 +25,6 @@ #model.tagvalue.dbSchema=Pollen model.tagvalue.constantPrefix=PROPERTY_ model.tagvalue.java.lang.String=text -model.tagvalue.version=1.2.6 +model.tagvalue.version=1.3 model.tagvalue.doNotGenerateBooleanGetMethods=true model.tagvalue.indexForeignKeys=true Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -43,7 +43,7 @@ * Base test for daos. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class AbstractDAOTest { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * Test the {@link PollAccountDAO}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollAccountDAOTest extends AbstractDAOTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * (during poll creation). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollDateChoice extends ChoiceImpl { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * (during poll creation). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollImageChoice extends ChoiceImpl { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ /** * Classe DTO représentant un résultat de sondage. * - * @since 1.2.6 + * @since 1.3 */ public class PollResult implements Serializable { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollUri implements Serializable { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * Instances of this class will be given to service factory. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DefaultPollenServiceContext implements PollenServiceContext { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -44,7 +44,7 @@ * store in {@link PreventRule}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenNotifierWorker implements Runnable, Closeable { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @see PollenServiceContext - * @since 1.2.6 + * @since 1.3 */ public interface PollenService { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * {@link PollenServiceFactory#newService(Class, PollenServiceContext)} * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public interface PollenServiceContext { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * Factory of services. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenServiceFactory { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -43,7 +43,7 @@ * Usefull functions for the service (and higher) layers. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenServiceFunctions { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -39,7 +39,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenServiceSupport implements PollenService { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class FavoriteListAlreadyExistException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class FavoriteListNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class FavoriteListNotOwnedByUserException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipantAlreadyFoundInListException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipantExistWithoutMailException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipantNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipantNotFoundInListException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollAccountNotFound extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollAlreadyClosedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollAlreadyExistException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * When a poll choice not found. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollChoiceNotFoundException extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollCommentNotFound extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * When a pooll vote not found. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollVoteNotFoundException extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UnauthorizedPollAccessException extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UserEmailAlreadyUsedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UserInvalidPasswordException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UserLoginAlreadyUsedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class UserNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteDoubloonException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteNotAllowedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * When a vote is not found. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteNotFoundException extends Exception { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -43,7 +43,7 @@ * Manage comments on a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollCommentService extends PollenServiceSupport { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -56,7 +56,7 @@ * Service to manage feed of a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollFeedService extends PollenServiceSupport { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -65,7 +65,7 @@ * Deals with poll results. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollResultsService extends PollenServiceSupport { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Manage prevent rules of a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PreventRuleService extends PollenServiceSupport { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * Test {@link EmailService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class EmailServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Tests the {@link FavoriteService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ @Ignore public class FavoriteServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Tests the {@link PollService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ @Ignore public class PollServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * Tests the {@link UserService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ @Ignore public class UserServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * Tests the {@link VoteService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenApplicationContext { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -56,7 +56,7 @@ * On stop, just release the application configuration. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenApplicationListener implements ServletContextListener { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -38,7 +38,7 @@ * User session to put in servlet session. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenSession { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -39,7 +39,7 @@ * EchoBase implementation of the {@link TopiaTransactionFilter}. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenTopiaTransactionFilter extends TopiaTransactionFilter { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * Usefull ui methods. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenUIUtils { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -59,7 +59,7 @@ * untranslated key. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenActionSupport extends BaseAction implements TopiaTransactionAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Action for confirmation * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Confirm extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Delete a selected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteUser extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ManagePolls extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ManageUsers extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -46,7 +46,7 @@ * Action to generate a chart given the values (and optional subtitles). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GenerateChart extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * Obtain the image choice of a given choice of an image-like poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetPollImageChoice extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Abstract JSON action with pagination support. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public abstract class AbstractJSONPaginedAction extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Obtain created polls to put in grid for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetCreatedPolls extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Get given favorite list. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetFavoriteList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -35,7 +35,7 @@ * Get pagined list of poll accounts of a given favorite list. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetFavoriteListPollAccount extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -36,7 +36,7 @@ * Get pagined list of poll accounts of a given favorite list. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetFavoriteListPollAccounts extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Get pagined list of favorite lists of the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetFavoriteLists extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -40,7 +40,7 @@ * Obtain invited polls to put in grid for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetInvitedPolls extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Obtain participated polls to put in grid for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetParticipatedPolls extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -40,7 +40,7 @@ * Get paginated list of poll comments. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetPollComments extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Obtain paginated users. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetPolls extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -35,7 +35,7 @@ * Get user datas. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetUser extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Obtain paginated users. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetUsers extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * To generate the display for a text choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public abstract class AbstractDisplayChoice extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public abstract class AbstractPollUriIdAction extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -57,7 +57,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public abstract class AbstractVoteAction extends AbstractPollUriIdAction implements ParameterAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -42,7 +42,7 @@ * To add a poll comment. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class AddChoice extends AbstractVoteAction implements Preparable, FileUploadAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * To add a poll comment. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class AddComment extends AbstractVoteAction implements Preparable { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Closes an existing poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ClosePoll extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * To confirm delete of a poll choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ConfirmDeleteChoice extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * To confirm a comment delete. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ConfirmDeleteComment extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -32,7 +32,7 @@ * To confirm delete of a poll vote * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ConfirmDeleteVote extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -31,7 +31,7 @@ * To confirm a poll action (such as delete or close). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ConfirmPollAction extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Display list of created polls. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class CreatedList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * To delete a poll choice * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteChoice extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * To delete a poll comment. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteComment extends AbstractVoteAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Deletes an existing poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeletePoll extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * To delete a poll vote. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteVote extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * To generate the display for a date choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayDateChoice extends AbstractDisplayChoice { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * To generate the display for a image choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayImageChoice extends AbstractDisplayChoice { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * To display a personToList (use at a poll creation). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayPersonToList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * To generate the display for a text choice. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayTextChoice extends AbstractDisplayChoice { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * To display a voting list of a poll (use at a poll creation). * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DisplayVotingList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -28,7 +28,7 @@ * uri with {@code accountId} and {@code pollId}. * * @author fdesbois <fdesbois(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class EditVote extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Exports an existing poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ExportPoll extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -38,7 +38,7 @@ * Obtain the feed of a given poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class GetPollFeed extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Load in session a personToList to import into a votingList. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ImportPersonListToVotingList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Display list of participated polls. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ParticipatedList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -57,7 +57,7 @@ * Display results of a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ResultForPoll extends AbstractPollUriIdAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -69,7 +69,7 @@ * Creates a new poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class SavePoll extends AbstractPollForm implements Preparable, ParameterAware, FileUploadAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -37,7 +37,7 @@ * Select a person list to add into an existing voting list. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class SelectPersonListToVotingList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -40,7 +40,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteForPoll extends AbstractVoteAction implements Preparable { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Action for confirmation * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Confirm extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Delete a selected favorite list for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeleteFavoriteList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Delete a selected favorite list for the connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class DeletePollAccount extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Update a user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Edit extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -34,7 +34,7 @@ * Login user to pollen. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Login extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -29,7 +29,7 @@ * Logout from pollen. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Logout extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -40,7 +40,7 @@ * Manage a selected favorite lists of a connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ManageFavoriteList extends PollenActionSupport implements Preparable, ParameterAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -35,7 +35,7 @@ * Manage favorite lists of a connected user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ManageFavoriteLists extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -33,7 +33,7 @@ * Register a new user. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Register extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -30,7 +30,7 @@ * Show user account. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class Show extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -54,7 +54,7 @@ * TODO tchemit 2012-03-05 submit a patch to struts guys to avoid this fork. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class PollenFileUploadInterceptor extends FileUploadInterceptor { private static final long serialVersionUID = 1L; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -27,7 +27,7 @@ * Contract to expose a i18n key. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public interface I18nAble { Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -54,7 +54,7 @@ * Service to import / export a poll to or from his xml representation. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class ImportExportService { Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-04-13 11:07:28 UTC (rev 3256) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-04-13 11:28:02 UTC (rev 3257) @@ -49,7 +49,7 @@ * Service qui permet le dépouillement d'un sondage. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.2.6 + * @since 1.3 */ public class VoteCountingService {

1 0