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

r3776 - trunk
by tchemit＠users.chorem.org 23 Apr '13

23 Apr '13

Author: tchemit Date: 2013-04-23 23:33:56 +0200 (Tue, 23 Apr 2013) New Revision: 3776 Url: http://chorem.org/projects/pollen/repository/revisions/3776 Log: update to next topia version (2.8-rc-1) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-22 20:49:16 UTC (rev 3775) +++ trunk/pom.xml 2013-04-23 21:33:56 UTC (rev 3776) @@ -148,7 +148,7 @@ <projectId>pollen</projectId>  - <topiaVersion>2.8-SNAPSHOT</topiaVersion> + <topiaVersion>2.8-rc-1-SNAPSHOT</topiaVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion>

1 0

r3775 - in trunk/pollen-ui-struts2/src/main/webapp/WEB-INF: decorators jsp/admin jsp/poll jsp/user
by tchemit＠users.chorem.org 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 22:49:16 +0200 (Mon, 22 Apr 2013) New Revision: 3775 Url: http://chorem.org/projects/pollen/repository/revisions/3775 Log: replace required attribute by requiredLabel attribute Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -168,14 +168,14 @@ <label for="connection_login"> <s:text name="pollen.common.login"/> : </label> - <s:textfield key="login" size="10" required="true" theme="simple" + <s:textfield key="login" size="10" requiredLabel="true" theme="simple" label='' id='connection_login'/> </li> <li> <label for="connection_password"> <s:text name="pollen.common.password"/> : </label> - <s:password key="password" size="10" required="true" + <s:password key="password" size="10" requiredLabel="true" id='connection_password' label="" theme="simple"/> </li> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -89,10 +89,10 @@ <fieldset> <legend><s:text name="pollen.fieldset.userInformation.toCreate"/></legend> <s:textfield key="createUser.login" - label="%{getText('pollen.common.login')}" required="true" + label="%{getText('pollen.common.login')}" requiredLabel="true" size="40"/> <s:textfield key="createUser.email" - label="%{getText('pollen.common.email')}" required="true" + label="%{getText('pollen.common.email')}" requiredLabel="true" size="40"/> <s:textfield key="createUser.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> @@ -114,9 +114,9 @@ <fieldset> <legend><s:text name="pollen.fieldset.userInformation.toUpdate"/></legend> <s:textfield key="editUser.login" label="%{getText('pollen.common.login')}" - required="true" readonly="true" size="40"/> + requiredLabel="true" readonly="true" size="40"/> <s:textfield key="editUser.email" label="%{getText('pollen.common.email')}" - required="true" size="40" disabled="true"/> + requiredLabel="true" size="40" disabled="true"/> <s:textfield key="editUser.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> <s:textfield key="editUser.lastName" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -36,7 +36,7 @@ <s:textarea key='comment.text' readonly="true" rows="3" label="%{getText('pollen.common.commentText')}"/> - <s:textarea key='reason' rows="3" required="true" + <s:textarea key='reason' rows="3" requiredLabel="true" label="%{getText('pollen.common.deleteReason')}"/> <hr/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -33,7 +33,7 @@ </s:param> </s:text>. - <s:textarea key='reason' rows="3" required="true" + <s:textarea key='reason' rows="3" requiredLabel="true" label="%{getText('pollen.common.deleteReason')}"/> <hr/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -22,6 +22,6 @@ --%> <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:textfield required="true" size="3" theme="simple" +<s:textfield requiredLabel="true" size="3" theme="simple" name="vote.choiceVoteToChoice[%{#status.index}].voteValue" value="%{vote.choiceVoteToChoice[#status.index].voteValue}"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -119,7 +119,7 @@ <fieldset> <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" - required="true" size="80"/> + requiredLabel="true" size="80"/> <s:url var="configUrl" value='/js/ckeditor.config.js'/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -248,7 +248,7 @@ </s:if> <s:else> <th id="voterName"> - <s:textfield key='pollAccount.votingId' required="true" label='' + <s:textfield key='pollAccount.votingId' requiredLabel="true" label='' value="%{pollAccount.votingId}" theme="simple"/> </th> </s:else> @@ -355,17 +355,17 @@ enctype="multipart/form-data"> <h4><s:text name="pollen.action.addChoice"/></h4> <s:if test="textType"> - <s:textfield key="choice.name" required="true" + <s:textfield key="choice.name" requiredLabel="true" label="%{getText('pollen.common.choice')}" /> </s:if> <s:elseif test="dateType"> - <sj:datepicker key="choice.date" required="true" + <sj:datepicker key="choice.date" requiredLabel="true" label="%{getText('pollen.common.choice')}" changeMonth="true" changeYear="true" timepicker="true" displayFormat="%{getText('pollen.common.datePickerPattern')}" /> </s:elseif> <s:elseif test="imageType"> - <s:file key="imageChoice[0]" required="true" cssClass="nameField" + <s:file key="imageChoice[0]" requiredLabel="true" cssClass="nameField" label="%{getText('pollen.common.choice')}" /> </s:elseif> <br/> @@ -395,11 +395,11 @@ <s:form id='addCommentForm' method="POST" namespace="/poll" validate="true"> - <s:textfield key="commentAuthor" required="true" size="78" + <s:textfield key="commentAuthor" requiredLabel="true" size="78" label="%{getText('pollen.common.commentAuthor')}"/> <s:url var="configUrl" value='/js/ckeditor.config.js'/> - <sjr:ckeditor key="commentText" required="true" + <sjr:ckeditor key="commentText" requiredLabel="true" value="" rows="3" cols="54" width="500" label="%{getText('pollen.common.commentText')}" toolbar="PollenToolbar" customConfig="%{configUrl}" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -92,7 +92,7 @@ <s:form namespace="/user" method="POST"> <s:textfield key="pollId" label='%{getText("pollen.common.pollId")}' - required="true" size="80" tooltipIconPath="/img/tooltip.png" + requiredLabel="true" size="80" tooltipIconPath="/img/tooltip.png" tooltip='%{getText("poll.help.pollId")}'/> <br/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -32,7 +32,7 @@ <s:text name="pollen.information.lostPassword"/> <div style="padding: 1em; margin-bottom: 3em;"> - <s:textfield key="email" required="true" size="30"/> + <s:textfield key="email" requiredLabel="true" size="30"/> </div> <hr/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -36,9 +36,9 @@ <s:hidden key="pollenUserAccount.topiaId" label=""/> <s:textfield name="pollenUserAccount.login" key="pollen.common.login" - required="true"/> + requiredLabel="true"/> <s:password name="pollenUserAccount.password" key="pollen.common.password" - required="true"/> + requiredLabel="true"/> <s:password name="newPassword" key="pollen.common.newPassword"/> <s:password name="newPassword2" key="pollen.common.newPassword2"/> </fieldset> @@ -47,7 +47,7 @@ <legend><s:text name="pollen.fieldset.userInformation"/></legend> <s:textfield name="pollenUserAccount.email" key="pollen.common.email" - required="true" disabled="%{exists}"/> + requiredLabel="true" disabled="%{exists}"/> <s:textfield name="pollenUserAccount.firstName" key="pollen.common.firstName"/> <s:textfield name="pollenUserAccount.lastName" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -102,9 +102,9 @@ <legend> <s:text name="pollen.fieldset.pollAccount.toAddToFavoriteList"/> </legend> - <s:textfield key="createPollAccount.votingId" required="true" + <s:textfield key="createPollAccount.votingId" requiredLabel="true" label="%{getText('pollen.common.name')}" size="40"/> - <s:textfield key="createPollAccount.email" required="true" + <s:textfield key="createPollAccount.email" requiredLabel="true" label="%{getText('pollen.common.email')}" size="40"/> </fieldset> @@ -124,9 +124,9 @@ <legend> <s:text name="pollen.fieldset.pollAccount.toEditToFavoriteList"/> </legend> - <s:textfield key="editPollAccount.votingId" required="true" + <s:textfield key="editPollAccount.votingId" requiredLabel="true" label="%{getText('pollen.common.name')}" size="40"/> - <s:textfield key="editPollAccount.email" required="true" + <s:textfield key="editPollAccount.email" requiredLabel="true" label="%{getText('pollen.common.email')}" size="40"/> </fieldset> <br/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -97,7 +97,7 @@ <legend> <s:text name="pollen.fieldset.userFavoriteList.toCreate"/> </legend> - <s:textfield key="createFavoriteList.name" required="true" size="40" + <s:textfield key="createFavoriteList.name" requiredLabel="true" size="40" label="%{getText('pollen.common.name')}"/> <s:file id='csvImport' key="csvImport[0]" label="%{getText('pollen.common.csvImport')}" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -38,10 +38,10 @@ <legend><s:text name="pollen.fieldset.login"/></legend> <s:textfield key="login" size="10" label="%{getText('pollen.common.login')}" - required="true"/> + requiredLabel="true"/> <s:password key="password" label="%{getText('pollen.common.password')}" size="10" - required="true"/> + requiredLabel="true"/> </fieldset> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2013-04-22 20:34:22 UTC (rev 3774) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2013-04-22 20:49:16 UTC (rev 3775) @@ -36,17 +36,17 @@ <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> <s:textfield name="pollenUserAccount.login" key="pollen.common.login" - required="true"/> + requiredLabel="true"/> <s:password name="pollenUserAccount.password" key="pollen.common.password" - required="true"/> - <s:password name="password2" key="pollen.common.password2" required="true"/> + requiredLabel="true"/> + <s:password name="password2" key="pollen.common.password2" requiredLabel="true"/> </fieldset> <fieldset> <legend><s:text name="pollen.fieldset.userInformation"/></legend> <s:textfield name="pollenUserAccount.email" key="pollen.common.email" - required="true"/> + requiredLabel="true"/> <s:textfield name="pollenUserAccount.firstName" key="pollen.common.firstName"/> <s:textfield name="pollenUserAccount.lastName"

1 0

r3774 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by tchemit＠users.chorem.org 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 22:34:22 +0200 (Mon, 22 Apr 2013) New Revision: 3774 Url: http://chorem.org/projects/pollen/repository/revisions/3774 Log: up to 1.5.2-SNAPSHOT version Modified: trunk/ trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea atlassian-ide-plugin.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-persistence/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-services/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-api/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-borda/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-normal/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-number/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) +++ trunk/pom.xml 2013-04-22 20:34:22 UTC (rev 3774) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module>

1 0

r3773 - trunk
by tchemit＠users.chorem.org 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 22:32:27 +0200 (Mon, 22 Apr 2013) New Revision: 3773 Url: http://chorem.org/projects/pollen/repository/revisions/3773 Log: fixes #895: updates struts2 to 2.3.12 fixes #896: updates struts-jquery to 3.5.1 fixes #897: updates eugene to 2.6.1 fixes #898: updates h2 to 1.3.171 fixes #899: updates slf4j to 1.7.3 fixes #900: updates nuiton-utils to 2.6.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-22 20:21:27 UTC (rev 3772) +++ trunk/pom.xml 2013-04-22 20:32:27 UTC (rev 3773) @@ -149,17 +149,17 @@  <topiaVersion>2.8-SNAPSHOT</topiaVersion> - <eugenePluginVersion>2.6</eugenePluginVersion> + <eugenePluginVersion>2.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> - <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> - <h2Version>1.3.170</h2Version> + <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> + <h2Version>1.3.171</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.7</struts2Version> - <jqueryPluginVersion>3.5.0</jqueryPluginVersion> + <struts2Version>2.3.12</struts2Version> + <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> - <slf4jVersion>1.7.2</slf4jVersion> + <slf4jVersion>1.7.3</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>4.2.0.Final</hibernateVersion> <seleniumVersion>2.28.0</seleniumVersion>

1 0

r3772 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 22:21:27 +0200 (Mon, 22 Apr 2013) New Revision: 3772 Url: http://chorem.org/projects/pollen/repository/revisions/3772 Log: fixes #858: Cannot see result after close manually Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2013-04-22 19:54:47 UTC (rev 3771) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2013-04-22 20:21:27 UTC (rev 3772) @@ -138,7 +138,12 @@ if (!publicResults) { // poll results are private, only poll admin can see results - return n_("pollen.security.error.poll.result.private.and.access.not.granted"); + + if (!securityContext.isCreator() && !securityContext.isAdmin()) { + + // not a poll admin, can not access result + return n_("pollen.security.error.poll.result.private.and.access.not.granted"); + } } return null;

1 0

r3771 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 21:54:47 +0200 (Mon, 22 Apr 2013) New Revision: 3771 Url: http://chorem.org/projects/pollen/repository/revisions/3771 Log: fixes #892: Cannot clone a closed poll Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2013-04-22 19:35:27 UTC (rev 3770) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2013-04-22 19:54:47 UTC (rev 3771) @@ -145,6 +145,12 @@ if (clone) { // reset id for clone case result.setPollId(null); + + // when cloning no more closed poll (see http://chorem.org/issues/892) + result.setClosed(false); + + // remove end date (otherwise can't vote any longer) + result.setEndDate(null); } // -- Creator -- // @@ -217,8 +223,11 @@ result.addPreventRule(preventRuleEditable); } - // Load votes to have the correct size used to check if vote is started - result.setVote(poll.getVote()); + if (!clone) { + // if cloned, then remove all votes (to be able to edit poll again see http://chorem.org/issues/892) + // Load votes to have the correct size used to check if vote is started + result.setVote(poll.getVote()); + } } return result; }

1 0

r3770 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 22 Apr '13

22 Apr '13

Author: tchemit Date: 2013-04-22 21:35:27 +0200 (Mon, 22 Apr 2013) New Revision: 3770 Url: http://chorem.org/projects/pollen/repository/revisions/3770 Log: fixes #891: Automatically fill the "begin date" when a poll is newly created Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2013-04-17 13:20:08 UTC (rev 3769) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2013-04-22 19:35:27 UTC (rev 3770) @@ -116,6 +116,9 @@ result.setPollVoteVisibility(configuration.getDefaultPollVoteVisibility()); result.setPollCommentVisibility(configuration.getDefaultPollCommentVisibility()); + // use default today as begin date (see http://chorem.org/issues/891) + result.setBeginDate(serviceContext.getCurrentTime()); + // Initialize creator of the poll PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); PollAccount creator = newInstance(pollAccountDAO);

1 0

r3769 - trunk
by tchemit＠users.chorem.org 17 Apr '13

17 Apr '13

Author: tchemit Date: 2013-04-17 15:20:08 +0200 (Wed, 17 Apr 2013) New Revision: 3769 Url: http://chorem.org/projects/pollen/repository/revisions/3769 Log: try to use topia 2.8-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-29 13:13:32 UTC (rev 3768) +++ trunk/pom.xml 2013-04-17 13:20:08 UTC (rev 3769) @@ -148,7 +148,7 @@ <projectId>pollen</projectId>  - <topiaVersion>2.7.1</topiaVersion> + <topiaVersion>2.8-SNAPSHOT</topiaVersion> <eugenePluginVersion>2.6</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> @@ -161,7 +161,7 @@ <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.2</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> - <hibernateVersion>3.6.10.Final</hibernateVersion> + <hibernateVersion>4.2.0.Final</hibernateVersion> <seleniumVersion>2.28.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion>

1 0

r3768 - trunk
by tchemit＠users.chorem.org 29 Dec '12

29 Dec '12

Author: tchemit Date: 2012-12-29 14:13:32 +0100 (Sat, 29 Dec 2012) New Revision: 3768 Url: http://chorem.org/projects/pollen/repository/revisions/3768 Log: Update mavenpom4redmine to 3.4.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) +++ trunk/pom.xml 2012-12-29 13:13:32 UTC (rev 3768) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.6</version> + <version>3.4.7</version> </parent> <groupId>org.chorem</groupId>

1 0

r3767 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by tchemit＠users.chorem.org 17 Dec '12

17 Dec '12

Author: tchemit Date: 2012-12-17 23:35:21 +0100 (Mon, 17 Dec 2012) New Revision: 3767 Url: http://chorem.org/projects/pollen/repository/revisions/3767 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-persistence/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-services/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-ui-struts2/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-votecounting-aggregator/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-votecounting-api/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-votecounting-borda/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-votecounting-condorcet/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-votecounting-coombs/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-votecounting-normal/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-votecounting-number/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pollen-votecounting-percentage/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-17 22:35:19 UTC (rev 3766) +++ trunk/pom.xml 2012-12-17 22:35:21 UTC (rev 3767) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -531,11 +531,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.1</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.1 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.1</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0