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

r3766 - in tags: . pollen-1.5.1
by tchemit＠users.chorem.org 17 Dec '12

17 Dec '12

Author: tchemit Date: 2012-12-17 23:35:19 +0100 (Mon, 17 Dec 2012) New Revision: 3766 Url: http://chorem.org/projects/pollen/repository/revisions/3766 Log: [maven-release-plugin] copy for tag pollen-1.5.1 Added: tags/pollen-1.5.1/ Property changes on: tags/pollen-1.5.1 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3765 - 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:17 +0100 (Mon, 17 Dec 2012) New Revision: 3765 Url: http://chorem.org/projects/pollen/repository/revisions/3765 Log: [maven-release-plugin] prepare release pollen-1.5.1 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:25:49 UTC (rev 3764) +++ trunk/pollen-persistence/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-services/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-ui-struts2/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-votecounting-aggregator/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-votecounting-api/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-votecounting-borda/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-votecounting-condorcet/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-votecounting-coombs/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</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:25:49 UTC (rev 3764) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-votecounting-normal/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-votecounting-number/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pollen-votecounting-percentage/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) +++ trunk/pom.xml 2012-12-17 22:35:17 UTC (rev 3765) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> <modules> <module>pollen-votecounting-api</module> @@ -531,11 +531,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.1</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.1 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.1</url> </scm> <distributionManagement>

1 0

r3764 - trunk
by tchemit＠users.chorem.org 17 Dec '12

17 Dec '12

Author: tchemit Date: 2012-12-17 23:25:49 +0100 (Mon, 17 Dec 2012) New Revision: 3764 Url: http://chorem.org/projects/pollen/repository/revisions/3764 Log: fixes #838: Updates to nuiton-utils 2.6.5 fixes #839: Updates to eugene 2.6 fixes #841: Updates to jquery-struts2 3.5.0 fixes #844: Updates to selenium 2.28.0 fixes #847: Updates to mavenpom 3.4.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-03 15:57:23 UTC (rev 3763) +++ trunk/pom.xml 2012-12-17 22:25:49 UTC (rev 3764) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.4</version> + <version>3.4.6</version> </parent> <groupId>org.chorem</groupId> @@ -149,20 +149,20 @@  <topiaVersion>2.7.1</topiaVersion> - <eugenePluginVersion>2.5.6.1</eugenePluginVersion> + <eugenePluginVersion>2.6</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> - <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> <h2Version>1.3.170</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.7</struts2Version> - <jqueryPluginVersion>3.4.0</jqueryPluginVersion> + <jqueryPluginVersion>3.5.0</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.2</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <seleniumVersion>2.26.0</seleniumVersion> + <seleniumVersion>2.28.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle>

1 0

r3763 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui resources
by tchemit＠users.chorem.org 03 Dec '12

03 Dec '12

Author: tchemit Date: 2012-12-03 16:57:23 +0100 (Mon, 03 Dec 2012) New Revision: 3763 Url: http://chorem.org/projects/pollen/repository/revisions/3763 Log: fixes #863: Fix javascript bad encoding fixes #846: Use nice text rich editor for description in forms Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java 2012-12-03 15:57:23 UTC (rev 3763) @@ -0,0 +1,135 @@ +package org.chorem.pollen.ui; + +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ + + +import com.google.common.base.Charsets; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import org.apache.commons.io.IOUtils; +import org.apache.struts2.dispatcher.DefaultStaticContentLoader; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Calendar; + + +/** + * To fix some javascript loading problem. + * <p/> + * Some javascript files have some strange first caracter (ckeditor for example) + + * problem while loading charsets for french translate files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5.1 + */ +public class PollenStaticContentLoader extends DefaultStaticContentLoader { + + /** Logger. */ + private final Logger log = + LoggerFactory.getLogger(PollenStaticContentLoader.class); + + @Override + protected void process(InputStream is, + String path, + HttpServletRequest request, + HttpServletResponse response) throws IOException { + if (is != null) { + Calendar cal = Calendar.getInstance(); + + // check for if-modified-since, prior to any other headers + long ifModifiedSince = 0; + try { + ifModifiedSince = request.getDateHeader("If-Modified-Since"); + } catch (Exception e) { + log.warn("Invalid If-Modified-Since header value: '" + + request.getHeader("If-Modified-Since") + "', ignoring"); + } + long lastModifiedMillis = lastModifiedCal.getTimeInMillis(); + long now = cal.getTimeInMillis(); + cal.add(Calendar.DAY_OF_MONTH, 1); + long expires = cal.getTimeInMillis(); + + if (ifModifiedSince > 0 && ifModifiedSince <= lastModifiedMillis) { + // not modified, content is not sent - only basic + // headers and status SC_NOT_MODIFIED + response.setDateHeader("Expires", expires); + response.setStatus(HttpServletResponse.SC_NOT_MODIFIED); + is.close(); + return; + } + + // set the content-type header + String contentType = getContentType(path); + if (contentType != null) { + response.setContentType(contentType); + } + + if (serveStaticBrowserCache) { + // set heading information for caching static content + response.setDateHeader("Date", now); + response.setDateHeader("Expires", expires); + response.setDateHeader("Retry-After", expires); + response.setHeader("Cache-Control", "public"); + response.setDateHeader("Last-Modified", lastModifiedMillis); + } else { + response.setHeader("Cache-Control", "no-cache"); + response.setHeader("Pragma", "no-cache"); + response.setHeader("Expires", "-1"); + } + + try { + copy(is, response.getOutputStream(), path); + + } finally { + is.close(); + } + } + } + + protected void copy(InputStream input, + OutputStream output, + String path) throws IOException { + + if (path.contains(".js")) { + String content = IOUtils.toString(input); + if (content.indexOf("/") == 1) { + // fix nasty first strange caracter for ckeditor (only on firefox :() + content = content.substring(1); + } + if (log.isDebugEnabled()) { + log.info("Content:\n" + content); + } + // always want to have file in IS0 (even if we serve UTF8 files) + IOUtils.write(content, output, Charsets.ISO_8859_1); + } else { + + // no special tratment for other files + IOUtils.copy(input, output); + } + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-12-03 15:55:27 UTC (rev 3762) +++ trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-12-03 15:57:23 UTC (rev 3763) @@ -29,6 +29,9 @@ <struts> + <bean type="org.apache.struts2.dispatcher.StaticContentLoader" + class="org.chorem.pollen.ui.PollenStaticContentLoader" name="default" /> + <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider"/>

1 0

r3762 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 03 Dec '12

03 Dec '12

Author: tchemit Date: 2012-12-03 16:55:27 +0100 (Mon, 03 Dec 2012) New Revision: 3762 Url: http://chorem.org/projects/pollen/repository/revisions/3762 Log: fixes #864: show poll form when it is fully loaded Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 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 2012-12-01 12:34:54 UTC (rev 3761) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-12-03 15:55:27 UTC (rev 3762) @@ -105,7 +105,7 @@ </h1> <s:form method="POST" id="registerForm" namespace="/poll" - enctype="multipart/form-data" cssClass="KForm" action="KForm/create"> + enctype="multipart/form-data" cssClass="KForm hidden" action="KForm/create"> <s:hidden key="poll.topiaId" label=""/> @@ -390,6 +390,8 @@ } }); }); + + $('#registerForm').show(); }); </script>

1 0

r3761 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-persistence/src/test/java/org/chorem/pollen/business/persistence pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 01 Dec '12

01 Dec '12

Author: tchemit Date: 2012-12-01 13:34:54 +0100 (Sat, 01 Dec 2012) New Revision: 3761 Url: http://chorem.org/projects/pollen/repository/revisions/3761 Log: fixes #850: Send reminder emails work very well (send message all 10min) Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-12-01 12:28:56 UTC (rev 3760) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-12-01 12:34:54 UTC (rev 3761) @@ -98,10 +98,10 @@ return result; } - public List<E> findRunningPolls(Date currentTime) throws TopiaException { + public List<E> findRunningPollsWithEndTime(Date currentTime) throws TopiaException { String hql = "FROM PollImpl WHERE " + - "(endDate IS NULL OR endDate > :currentTime) AND " + + "(endDate IS NOT NULL AND endDate > :currentTime) AND " + "(beginDate IS NULL OR beginDate < :currentTime)"; List<E> results = findAllByQuery(hql, "currentTime", currentTime); Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java 2012-12-01 12:28:56 UTC (rev 3760) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java 2012-12-01 12:34:54 UTC (rev 3761) @@ -228,7 +228,7 @@ } @Test - public void findRunningPolls() throws Exception { + public void findRunningPollsWithEndTime() throws Exception { TopiaContext tx = beginTransaction(); PollDAO dao = PollenDAOHelper.getPollDAO(tx); @@ -257,36 +257,26 @@ List<Poll> actual; - actual = dao.findRunningPolls(now); + actual = dao.findRunningPollsWithEndTime(now); Assert.assertNotNull(actual); - Assert.assertEquals(5, actual.size()); - Assert.assertEquals(poll0, actual.get(0)); - Assert.assertEquals(poll1, actual.get(1)); - Assert.assertEquals(poll3, actual.get(2)); - Assert.assertEquals(poll4, actual.get(3)); - Assert.assertEquals(poll5, actual.get(4)); + Assert.assertEquals(3, actual.size()); + Assert.assertEquals(poll3, actual.get(0)); + Assert.assertEquals(poll4, actual.get(1)); + Assert.assertEquals(poll5, actual.get(2)); + actual = dao.findRunningPollsWithEndTime(lastYearNow); + Assert.assertNotNull(actual); + Assert.assertEquals(1, actual.size()); + Assert.assertEquals(poll5, actual.get(0)); - actual = dao.findRunningPolls(lastYearNow); + actual = dao.findRunningPollsWithEndTime(nextMonthNow); Assert.assertNotNull(actual); Assert.assertEquals(2, actual.size()); - Assert.assertEquals(poll0, actual.get(0)); + Assert.assertEquals(poll3, actual.get(0)); Assert.assertEquals(poll5, actual.get(1)); - actual = dao.findRunningPolls(nextMonthNow); + actual = dao.findRunningPollsWithEndTime(nextYearNow); Assert.assertNotNull(actual); - Assert.assertEquals(5, actual.size()); - Assert.assertEquals(poll0, actual.get(0)); - Assert.assertEquals(poll1, actual.get(1)); - Assert.assertEquals(poll2, actual.get(2)); - Assert.assertEquals(poll3, actual.get(3)); - Assert.assertEquals(poll5, actual.get(4)); - - actual = dao.findRunningPolls(nextYearNow); - Assert.assertNotNull(actual); - Assert.assertEquals(3, actual.size()); - Assert.assertEquals(poll0, actual.get(0)); - Assert.assertEquals(poll1, actual.get(1)); - Assert.assertEquals(poll2, actual.get(2)); + Assert.assertEquals(0, actual.size()); } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-12-01 12:28:56 UTC (rev 3760) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-12-01 12:34:54 UTC (rev 3761) @@ -23,6 +23,8 @@ package org.chorem.pollen.services; import com.google.common.base.Preconditions; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PreventRule; @@ -47,6 +49,14 @@ */ public class PollenNotifierWorker implements Runnable, Closeable { + /** Logger. */ + private static final Log log = + LogFactory.getLog(PollenNotifierWorker.class); + + public static final int ONE_MINUTE = 60 * 1000; + + public static final int ONE_HOUR = 60 * ONE_MINUTE; + /** Service context used to create other services. */ protected final PollenServiceContext serviceContext; @@ -75,6 +85,9 @@ @Override public void run() { try { + if (log.isDebugEnabled()) { + log.debug("New round of " + PollenNotifierWorker.this); + } TopiaContext transaction = rootContext.beginTransaction(); try { serviceContext.setTransaction(transaction); @@ -84,14 +97,21 @@ PreventRuleService preventRuleService = serviceContext.newService(PreventRuleService.class); - // Récupération des sondages en cours - Date currentTime = serviceContext.getCurrentTime(); + // Get running polls with filled end date + Date now = serviceContext.getCurrentTime(); List<Poll> polls = - pollService.getRunningPolls(currentTime); + pollService.getRunningPollsWithEndTime(now); + if (log.isDebugEnabled()) { + log.debug("Found " + polls.size() + + " running polls with end date to scan"); + } for (Poll poll : polls) { - preventRuleService.onPollToRemind(poll); + if (log.isDebugEnabled()) { + log.debug("Tests for poll " + poll.getTitle()); + } + preventRuleService.onPollToRemind(poll, now); } @@ -105,7 +125,7 @@ throw new PollenTechnicalException("Topia problem", e); } } - }, 600000, 600000); + }, 0, 10 * ONE_MINUTE); // repeat at ten minutes } @Override 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 2012-12-01 12:28:56 UTC (rev 3760) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-12-01 12:34:54 UTC (rev 3761) @@ -491,11 +491,11 @@ } } - public List<Poll> getRunningPolls(Date currentTime) { + public List<Poll> getRunningPollsWithEndTime(Date currentTime) { try { PollDAO dao = getDAO(Poll.class); - List<Poll> results = dao.findRunningPolls(currentTime); + List<Poll> results = dao.findRunningPollsWithEndTime(currentTime); return results; } catch (TopiaException e) { throw new PollenTechnicalException( @@ -1000,7 +1000,7 @@ } preventRuleLoaded.setMethod(preventRule.getMethod()); - preventRuleLoaded.setOneTime(preventRule.isOneTime()); +// preventRuleLoaded.setOneTime(preventRule.isOneTime()); preventRuleLoaded.setRepeated(preventRule.isRepeated()); preventRuleLoaded.setSensibility(preventRule.getSensibility()); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-12-01 12:28:56 UTC (rev 3760) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-12-01 12:34:54 UTC (rev 3761) @@ -27,6 +27,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PreventRule; +import org.chorem.pollen.services.PollenNotifierWorker; import org.chorem.pollen.services.PollenServiceSupport; import java.util.Date; @@ -67,112 +68,101 @@ if (poll.getEndDate() != null) { for (PreventRule rule : poll.getPreventRule()) { - onVoteAdded(poll, rule); - } - } - } - public void onPollToRemind(Poll poll) { + // send to creator a email to say hey a new vote was added! - // Parcours des preventRules de chaque sondage - // envoi d'un email si endDate-nowDate <= preventRuleSensibility - if (poll.getEndDate() != null) { + if (canExecuteRule(SCOPE_VOTE, rule, 1)) { - Date now = serviceContext.getCurrentTime(); + // ok can execute this task - // timeValue = endDate-nowDate - long timeValue = poll.getEndDate().getTime() - now.getTime(); + EmailService emailService = newService(EmailService.class); - if (log.isDebugEnabled()) { - log.debug("Now: " + now.getTime() + " End: " - + poll.getEndDate().getTime() + " timeValue: " - + timeValue + "(" + timeValue / 3600000 + "h)"); - } + // let's send an email + emailService.onVoteAdded(poll); - int hourBeforeEnd = (int) (timeValue / 3600000); - - for (PreventRule rule : poll.getPreventRule()) { - - onPollToRemind(poll, rule, hourBeforeEnd); + // and update prevent rule + commitTransaction("Could not update prevent rule"); + } } } } - protected void onVoteAdded(Poll poll, PreventRule preventRule) { + public void onPollToRemind(Poll poll, Date now) { - // send to creator a email to say hey a new vote was added! + Preconditions.checkNotNull(poll, "Poll can notbe nul."); - if (execute(SCOPE_VOTE, preventRule, 1)) { + Date endDate = poll.getEndDate(); + Preconditions.checkNotNull( + endDate, "End date can not be null to remind"); - // ok can execute this task + // envoi d'un email si endDate-nowDate <= preventRuleSensibility - EmailService emailService = newService(EmailService.class); + // timeValue = endDate-nowDate + long timeValue = endDate.getTime() - now.getTime(); - // let's send an email - emailService.onVoteAdded(poll); + int hourBeforeEnd = (int) (timeValue / PollenNotifierWorker.ONE_HOUR); - // and update prevent rule - commitTransaction("Could not update prevent rule"); + if (log.isDebugEnabled()) { + log.debug("Now: " + now.getTime() + " End: " + + endDate.getTime() + " timeValue: " + + timeValue + "(" + hourBeforeEnd + "h)"); } - } - protected void onPollToRemind(Poll poll, PreventRule preventRule, - int timeValue) { + for (PreventRule rule : poll.getPreventRule()) { - // send to all voting a email to say hey we need to vote + if (canExecuteRule(SCOPE_REMINDER, rule, hourBeforeEnd)) { - if (execute(SCOPE_REMINDER, preventRule, timeValue)) { + // ok can execute this task - // ok can execute this task + if (log.isInfoEnabled()) { + log.info("Execute reminder rule on poll " + poll.getTitle()); + } + EmailService emailService = newService(EmailService.class); - EmailService emailService = newService(EmailService.class); + // let's send an email + emailService.onPollReminder(poll); - // let's send an email - emailService.onPollReminder(poll); + // this rule must be desactivate now + rule.setActive(false); - // and update prevent rule - commitTransaction("Could not update prevent rule"); + // and update prevent rule + commitTransaction("Could not update prevent rule"); + } } } - protected boolean execute(String scope, PreventRule preventRule, - Integer value) { + protected boolean canExecuteRule(String scope, PreventRule preventRule, + Integer value) { Preconditions.checkNotNull(scope); Preconditions.checkNotNull(value); - // Si la règle n'est pas active, on ne fait rien - if (!preventRule.isActive()) { - log.debug("Règle non active"); - return false; - } + boolean result = false; - // Si la règle est à exécution unique, on la désactive - if (preventRule.isOneTime()) { - log.debug("Règle à exécution unique : désactivation"); - preventRule.setActive(false); - } + if (preventRule.isActive()) { - if (!scope.equals(preventRule.getScope())) { + // alive rule - // pas bon scope - return false; - } + if (scope.equals(preventRule.getScope())) { - // Si la règle est répétitive (exécution tous les n), on met à jour la valeur - if (preventRule.isRepeated() && preventRule.getSensibility() != 0) { - value = value % preventRule.getSensibility() - + preventRule.getSensibility(); - } + // rule in good scope - if (value != preventRule.getSensibility()) { + int sensibility = preventRule.getSensibility(); - // pas la bonne valeur - return false; + if (preventRule.isRepeated() && sensibility != 0) { + value = value % sensibility + sensibility; + } + + if (value == sensibility) { + + // ok good value, can execute this rule + result = true; + } + + } } - // ok on peut lancer la tâche - return true; + return result; } }

1 0

r3760 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org 01 Dec '12

01 Dec '12

Author: tchemit Date: 2012-12-01 13:28:56 +0100 (Sat, 01 Dec 2012) New Revision: 3760 Url: http://chorem.org/projects/pollen/repository/revisions/3760 Log: fixes #861: Can not access to restricted vote page when another restricted voter is connected Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-12-01 10:55:55 UTC (rev 3759) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-12-01 12:28:56 UTC (rev 3760) @@ -93,7 +93,25 @@ hql += "p.pollAccount.email = :email"; } - E result = findByQuery(hql, params.toArray()); + E result = null; + List<E> results = findAllByQuery(hql, params.toArray()); + if (CollectionUtils.isEmpty(results)) { + result = null; + } else if (results.size() == 1) { + result = results.get(0); + } else { + + // limit case when there is two different poll account + // (one for connected user and one for incoming accountId) + // In this case, we must use the accountId one + for (E e : results) { + String accountId1 = e.getAccountId(); + if (accountId1.equals(accountId)) { + result = e; + break; + } + } + } return result; }

1 0

r3759 - trunk
by tchemit＠users.chorem.org 01 Dec '12

01 Dec '12

Author: tchemit Date: 2012-12-01 11:55:55 +0100 (Sat, 01 Dec 2012) New Revision: 3759 Url: http://chorem.org/projects/pollen/repository/revisions/3759 Log: fixes #860: Updates to h2 1.3.170 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-01 10:50:33 UTC (rev 3758) +++ trunk/pom.xml 2012-12-01 10:55:55 UTC (rev 3759) @@ -154,7 +154,7 @@ <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> - <h2Version>1.3.168</h2Version> + <h2Version>1.3.170</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.7</struts2Version> <jqueryPluginVersion>3.4.0</jqueryPluginVersion>

1 0

r3758 - trunk
by tchemit＠users.chorem.org 01 Dec '12

01 Dec '12

Author: tchemit Date: 2012-12-01 11:50:33 +0100 (Sat, 01 Dec 2012) New Revision: 3758 Url: http://chorem.org/projects/pollen/repository/revisions/3758 Log: fixes #839: Updates to eugene 2.5.6.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-01 10:33:29 UTC (rev 3757) +++ trunk/pom.xml 2012-12-01 10:50:33 UTC (rev 3758) @@ -149,7 +149,7 @@  <topiaVersion>2.7.1</topiaVersion> - <eugenePluginVersion>2.5.6</eugenePluginVersion> + <eugenePluginVersion>2.5.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.12-beta-1</nuitonWebVersion>

1 0

r3757 - trunk/pollen-persistence/src/main/resources/i18n
by tchemit＠users.chorem.org 01 Dec '12

01 Dec '12

Author: tchemit Date: 2012-12-01 11:33:29 +0100 (Sat, 01 Dec 2012) New Revision: 3757 Url: http://chorem.org/projects/pollen/repository/revisions/3757 Log: fixes #859: pb orthographe Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-12-01 10:28:53 UTC (rev 3756) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-12-01 10:33:29 UTC (rev 3757) @@ -34,7 +34,7 @@ pollen.pollType.restricted=Restreint pollen.pollVoteVisibilty.creatorOnly=Visible pour le créateur pollen.pollVoteVisibilty.creatorOnly.help=Seul le créateur ou un administrateur peut voir les votes -pollen.pollVoteVisibilty.everybody=Vote publique +pollen.pollVoteVisibilty.everybody=Publique pollen.pollVoteVisibilty.everybody.help=Tout le monde peut voir les votes pollen.pollVoteVisibilty.nobody=Sondage anonyme pollen.pollVoteVisibilty.nobody.help=Le sondage est anonyme, personne ne peut voir les votes

1 0