This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit de064ccc022f95f4a2a5cfa2440a29d5133cf303 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 19:37:55 2015 +0100 Add dev mode case for i18n init --- .../main/java/org/chorem/pollen/ui/PollenApplicationListener.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java index b3a69c0..fef2060 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java @@ -40,6 +40,7 @@ import org.chorem.pollen.services.PollenServiceFactory; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.votecounting.VoteCountingFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; @@ -94,7 +95,12 @@ public class PollenApplicationListener implements ServletContextListener { DefaultI18nInitializer i18nInitializer = new DefaultI18nInitializer("pollen-i18n"); i18nInitializer.setMissingKeyReturnNull(true); - I18n.init(i18nInitializer, Locale.getDefault()); + try { + I18n.init(i18nInitializer, Locale.getDefault()); + } catch (Exception e) { + // dev mode case + I18n.init(new ClassPathI18nInitializer(), Locale.getDefault()); + } PollenApplicationContext applicationContext = new PollenApplicationContext(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit aacf11c1bc39a9c4792cb346affc63bcf07e2a45 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 19:42:20 2015 +0100 Update h2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e8a8ce9..f08ed95 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ <nuitonWebVersion>1.13</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <h2Version>1.3.172</h2Version> + <h2Version>1.3.176</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.5.0</jqueryPluginVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 5b00d43333e92faf3cacb731c2de6389478a049b Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 19:52:08 2015 +0100 Update slf4j --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c90f6a4..b5beff0 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.5.0</jqueryPluginVersion> <shiroVersion>1.2.2</shiroVersion> - <slf4jVersion>1.7.5</slf4jVersion> + <slf4jVersion>1.7.13</slf4jVersion> <jettyVersion>8.1.11.v20130520</jettyVersion> <jettyPluginVersion>${jettyVersion}</jettyPluginVersion> <hibernateVersion>4.2.1.Final</hibernateVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 6be020f0e49749ae95cc7aa968e4836107b1be53 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 20:22:51 2015 +0100 Update commons-email --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 873da8c..5cc37cb 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.3.2</version> + <version>1.4</version> </dependency> <!-- Guava --> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit f0eb399ad88dc7f8c3ddd54c58c0a69c8935baaf Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 20:27:26 2015 +0100 Update guava --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 373cee3..f386644 100644 --- a/pom.xml +++ b/pom.xml @@ -255,7 +255,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>17.0</version> + <version>18.0</version> </dependency> <!-- ToPIA (and db) --> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 218eba6fae1e98a065ca166be5ec7c3202717c10 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:00:13 2015 +0100 Update hibernate --- pollen-persistence/pom.xml | 5 +++++ pollen-persistence/src/test/resources/db.properties | 8 +++++++- pollen-services/pom.xml | 4 ++++ pollen-services/src/test/resources/pollen-fake.properties | 8 +++++++- pollen-ui-struts2/src/test/resources/pollen-it.properties | 8 +++++++- pom.xml | 10 ++++++++-- 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index eacf3e9..e473e34 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -64,6 +64,11 @@ <artifactId>hibernate-core</artifactId> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> diff --git a/pollen-persistence/src/test/resources/db.properties b/pollen-persistence/src/test/resources/db.properties index 6d65c2a..e5d8eeb 100644 --- a/pollen-persistence/src/test/resources/db.properties +++ b/pollen-persistence/src/test/resources/db.properties @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2015 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 @@ -26,3 +26,9 @@ hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.username=sa hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver + +hibernate.c3p0.min_size=5 +hibernate.c3p0.max_size=20 +hibernate.c3p0.timeout=300 +hibernate.c3p0.max_statements=50 +hibernate.c3p0.idle_test_period=3000 diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index d231676..6676f02 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -67,6 +67,10 @@ <artifactId>hibernate-core</artifactId> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> diff --git a/pollen-services/src/test/resources/pollen-fake.properties b/pollen-services/src/test/resources/pollen-fake.properties index d2673a8..40601fe 100644 --- a/pollen-services/src/test/resources/pollen-fake.properties +++ b/pollen-services/src/test/resources/pollen-fake.properties @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +# Copyright (C) 2009 - 2015 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 @@ -28,6 +28,12 @@ hibernate.connection.username=sa hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver +hibernate.c3p0.min_size=5 +hibernate.c3p0.max_size=20 +hibernate.c3p0.timeout=300 +hibernate.c3p0.max_statements=50 +hibernate.c3p0.idle_test_period=300 + # Migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback diff --git a/pollen-ui-struts2/src/test/resources/pollen-it.properties b/pollen-ui-struts2/src/test/resources/pollen-it.properties index a9c0ee5..42c5ec6 100644 --- a/pollen-ui-struts2/src/test/resources/pollen-it.properties +++ b/pollen-ui-struts2/src/test/resources/pollen-it.properties @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2015 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 @@ -36,6 +36,12 @@ hibernate.connection.url=jdbc:h2:file:${pollen.dataDirectory}/db/pollendb hibernate.show_sql=false hibernate.hbm2ddl.auto=update +hibernate.c3p0.min_size=5 +hibernate.c3p0.max_size=20 +hibernate.c3p0.timeout=300 +hibernate.c3p0.max_statements=50 +hibernate.c3p0.idle_test_period=300 + # Database migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback diff --git a/pom.xml b/pom.xml index 64e59d3..e8dd0aa 100644 --- a/pom.xml +++ b/pom.xml @@ -167,8 +167,8 @@ <shiroVersion>1.2.4</shiroVersion> <slf4jVersion>1.7.13</slf4jVersion> <jettyVersion>8.1.11.v20130520</jettyVersion> - <jettyPluginVersion>${jettyVersion}</jettyPluginVersion> - <hibernateVersion>4.2.1.Final</hibernateVersion> + <!--jettyVersion>${jettyPluginVersion}</jettyVersion--> + <hibernateVersion>4.2.21.Final</hibernateVersion> <seleniumVersion>2.48.2</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> @@ -277,6 +277,12 @@ <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + <version>${hibernateVersion}</version> + </dependency> <dependency> <groupId>postgresql</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 90b8cd2d8b85b29e74fd13e1fa4b157774de37e8 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:15:40 2015 +0100 Update javax.mail --- pollen-services/pom.xml | 4 ++-- pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 64dcac4..b7db58f 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -72,8 +72,8 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>rome</groupId> diff --git a/pom.xml b/pom.xml index e8dd0aa..344df12 100644 --- a/pom.xml +++ b/pom.xml @@ -446,9 +446,9 @@ <!-- Others --> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.7</version> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + <version>1.5.4</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit aac7f6120e351f1202721ed857643e08c10c84a7 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:18:21 2015 +0100 Update junit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 970570e..355d98f 100644 --- a/pom.xml +++ b/pom.xml @@ -539,7 +539,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit e17fcdbcb1f7828cb05d5ad8eb16fe51d879e614 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 23:37:00 2015 +0100 Copy TransactionFilter for compatibility with topia 2 --- .../chorem/pollen/ui/TopiaTransactionFilter.java | 407 +++++++++++++++++++++ 1 file changed, 407 insertions(+) diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/TopiaTransactionFilter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/TopiaTransactionFilter.java new file mode 100644 index 0000000..a3ecfd8 --- /dev/null +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/TopiaTransactionFilter.java @@ -0,0 +1,407 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Transaction; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.framework.TopiaContextImplementor; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * <h2>Purpose of this filter</h2> + * This filter purpose is to inject in the request a transaction from + * {@link TopiaContext} and deal with the complete lifecycle of a topia + * transaction while a request. + * <p/> + * The injected transaction will be closed (if was really opened) at the end of + * the request. + * <h2>Configuration of the filter</h2> + * The filter accepts two configuration parameters: + * <ul> + * <li>{@code excludeMethods}: This parameters configure a set of method names + * which should never be called on the proxied transaction. + * When a such method is called on the transaction then the filter will pass in + * the hook {@link #onExcludeMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to throw an exception. + * </li> + * <li>{@code unusedMethods}: This parameters configure a set of method names + * which should be by-pass when the proxied transaction was not still open (via a {@link TopiaContext#beginTransaction()}. + * When a such method is called on the transaction then the filter will pass in + * the hook {@link #onUnusedMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to not return null values. + * </li> + * </ul> + * <h2>Obtain the transaction</h2> + * The (proxied) transaction is pushed as an attribute in the servlet request. + * <p/> + * The attribute name is defined by field {@link #requestAttributeName} + * (default value is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be + * changed. + * <p/> + * A convience method is created here to obtain the transaction {@link #getTransaction(ServletRequest)} : + * <pre> + * TopiaContext tx = TopiaTransactionFilter.getTransaction(ServletRequest); + * </pre> + * <p/> + * If you prefer to not use this nice method, you can also do this: + * <pre> + * TopiaContext tx = (TopiaContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + * </pre> + * <p/> + * Or + * <pre> + * TopiaContext tx = (TopiaContext) request.getAttribute(modifiedAttributeName); + * </pre> + * + * @author tchemit <chemit@codelutin.com> + * @since 1.6 + */ +public abstract class TopiaTransactionFilter implements Filter { + + public static final String TOPIA_TRANSACTION_REQUEST_ATTRIBUTE = + "topiaTransaction"; + + public static final String[] DEFAULT_EXCLUDE_METHODS = { + "beginTransaction", + "closeContext", + "clear" + }; + + public static final String[] DEFAULT_UNUSED_METHODS = { + "toString", + "isClosed", + "closeContext", + "clear", + "equals", + "hashCode", + "finalize", + "getClass" + }; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TopiaTransactionFilter.class); + + /** names of methods to forbid access while using proxy. */ + protected Set<String> excludeMethods; + + /** names of methods to by-pass if no transaction opened on proxy. */ + protected Set<String> unusedMethods; + + /** + * Name of the request attribute where to push the transaction. + * <p/> + * By default will use value of + * {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. + * + * @since 1.10 + */ + protected String requestAttributeName = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; + + public Set<String> getExcludeMethods() { + return excludeMethods; + } + + public Set<String> getUnusedMethods() { + return unusedMethods; + } + + /** + * to change the {@link #requestAttributeName}. + * + * @param requestAttributeName new name of the request attribute + * where to push the transaction. + * @since 1.10 + */ + public void setRequestAttributeName(String requestAttributeName) { + this.requestAttributeName = requestAttributeName; + } + + public static TopiaContext getTransaction(ServletRequest request) { + TopiaContext topiaContext = (TopiaContext) + request.getAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + return topiaContext; + } + + /** + * Method to open a new transaction. + * + * @param request incoming request + * @return the new freshly opened transaction + * @throws TopiaRuntimeException if any problem while opening a new transaction + */ + protected abstract TopiaContext beginTransaction(ServletRequest request) throws TopiaRuntimeException; + + @Override + public void destroy() { + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + String methodsFromConfig; + + methodsFromConfig = filterConfig.getInitParameter("excludeMethods"); + String[] methods; + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_EXCLUDE_METHODS; + } + excludeMethods = new HashSet<String>(Arrays.asList(methods)); + + methodsFromConfig = filterConfig.getInitParameter("unusedMethods"); + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_UNUSED_METHODS; + } + unusedMethods = new HashSet<String>(Arrays.asList(methods)); + } + + @Override + public void doFilter(ServletRequest request, + ServletResponse response, + FilterChain chain) throws IOException, ServletException { + + // creates a proxy of a lazy transaction + + TopiaTransactionProxyInvocationHandler proxyInvocationHandler = + new TopiaTransactionProxyInvocationHandler(request); + + TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + proxyInvocationHandler + ); + + // push it in request as an attribute + request.setAttribute(requestAttributeName, proxy); + try { + + // chain to next filter + chain.doFilter(request, response); + } finally { + + // close the real transaction + onCloseTransaction(proxyInvocationHandler.transaction); + } + } + + /** + * Hook method called when a method with his name in + * {@link #excludeMethods} was invoked on the proxied transaction. + * + * @param proxy proxied transaction + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onExcludeMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // not authorized + throw new IllegalAccessException( + "Not allowed to access method " + method.getName() + " on " + + proxy); + } + + /** + * Hook method to close the topia transaction of the request at the end of + * the request when all filter has been consumed. + * + * @param transaction the transaction to close (can be null if transaction + * was not required while the current request) + * @since 1.9.1 + */ + protected void onCloseTransaction(TopiaContext transaction) { + if (transaction == null) { + if (log.isTraceEnabled()) { + log.trace("no transaction to close"); + } + } else if (transaction.isClosed()) { + if (log.isTraceEnabled()) { + log.trace("transaction " + transaction + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("closing transaction " + transaction); + } + try { + // let's rollback transaction if the transaction was not rollbacked nor committed + // as the topia context close context does not affect hibernate transaction + // so if something bad happen then we will always have a + Transaction tx = ((TopiaContextImplementor) transaction).getHibernate().getTransaction(); + if (!tx.wasCommitted() && !tx.wasRolledBack()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction!"); + } + tx.rollback(); + } + transaction.closeContext(); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + } + + /** + * Hook method called when a method with his name in + * {@link #unusedMethods} was invoked on the proxied transaction + * while the underlying transaction is still not opened. + * + * @param proxy the proxy itself + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onUnusedMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // by-pass method since no transaction found + + String methodName = method.getName(); + if (log.isDebugEnabled()) { + log.debug("Skip execution of method " + methodName + + " since no transaction is instanciated."); + } + + Set<String> methods = getUnusedMethods(); + if (methods.contains("toString")) { + + return "No transaction opened yet for this proxy"; + } + + if (methods.contains("isClosed")) { + + return false; + } + + if (methods.contains("equals")) { + + return false; + } + + if (methods.contains("hashCode")) { + + return 0; + } + + if (methods.contains("getClass")) { + + return TopiaContext.class; + } + + return null; + } + + /** + * Handler of a proxy on a {@link TopiaContext}. + * + * @see #excludeMethods + */ + public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { + + /** Incoming request that creates this handler. */ + protected final ServletRequest request; + + /** Target to use for the proxy. */ + protected TopiaContext transaction; + + protected TopiaTransactionProxyInvocationHandler(ServletRequest request) { + this.request = request; + } + + @Override + public Object invoke(Object proxy, + Method method, + Object[] args) throws Throwable { + + String methodName = method.getName(); + + if (getExcludeMethods().contains(methodName)) { + + Object result = onExcludeMethod(proxy, method, args); + return result; + } + + if (transaction == null) { + + if (log.isTraceEnabled()) { + log.trace("transaction started due to a call to " + methodName); + } + + if (getUnusedMethods().contains(methodName)) { + + Object result = onUnusedMethod(proxy, method, args); + return result; + } + + // first time transaction is required, create its + transaction = beginTransaction(request); + + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } + } + + // can invoke the method on the transaction + try { + Object result = method.invoke(transaction, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } + } + } + +} -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 0f6d16ba9db44c583a617e8ec4f12cdba8354f61 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sat Nov 14 09:27:48 2015 +0100 Update postgresql --- .../entities/migration/PollenMigrationCallbackV1_1.java | 11 ++++++----- .../entities/migration/PollenMigrationCallbackV1_2.java | 11 ++++++----- .../entities/migration/PollenMigrationCallbackV1_3.java | 2 +- pom.xml | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java index 16986bf..ec1c02a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java @@ -22,18 +22,18 @@ */ package org.chorem.pollen.entities.migration; +import java.util.Arrays; +import java.util.List; + import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.PostgreSQLDialect; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; import org.nuiton.util.version.Version; import org.nuiton.util.version.Versions; -import java.util.Arrays; -import java.util.List; - /** * Migration for version {@code 1.1}. * @@ -60,7 +60,8 @@ public class PollenMigrationCallbackV1_1 extends TopiaMigrationCallbackByClassNG String[] sqls = null; // Script de migration - if (dialect instanceof PostgreSQLDialect) { + // PostgreSQL81Dialect must match PostgreSQLDialect and PostgreSQL9Dialect + if (dialect instanceof PostgreSQL81Dialect) { sqls = new String[]{ "alter table useraccount rename langage to language;", "alter table pollaccount add accountid varchar;", diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java index 175ff7e..a8e2e70 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java @@ -22,18 +22,18 @@ */ package org.chorem.pollen.entities.migration; +import java.util.Arrays; +import java.util.List; + import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.PostgreSQLDialect; +import org.hibernate.dialect.PostgreSQL81Dialect; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; import org.nuiton.util.version.Version; import org.nuiton.util.version.Versions; -import java.util.Arrays; -import java.util.List; - /** * Migration for version {@code 1.2}. * @@ -59,7 +59,8 @@ public class PollenMigrationCallbackV1_2 extends TopiaMigrationCallbackByClassNG String[] sqls = null; - if (dialect instanceof PostgreSQLDialect) { + // PostgreSQL81Dialect must match PostgreSQLDialect and PostgreSQL9Dialect + if (dialect instanceof PostgreSQL81Dialect) { sqls = new String[]{ "alter table poll add endchoicedate timestamp without time zone;"}; } else if (dialect instanceof H2Dialect) { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java index 43a0f23..edc5443 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java @@ -236,7 +236,7 @@ public class PollenMigrationCallbackV1_3 extends TopiaMigrationCallbackByClassNG // build the new mapping between old id associated to new enum ordinal Map<String, Integer> result = Maps.newHashMap(); - for (Enum choiceType : enums) { + for (Enum<E> choiceType : enums) { // find it in existing mapping String name = choiceType.name(); diff --git a/pom.xml b/pom.xml index 315835f..1939c54 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <h2Version>1.3.176</h2Version> - <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <postgresqlVersion>9.4-1205-jdbc41</postgresqlVersion> <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.5.0</jqueryPluginVersion> <shiroVersion>1.2.4</shiroVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit af1afb5352386fed7de3f1581300018d8b561482 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sat Nov 14 09:38:42 2015 +0100 Update postgresql --- pollen-ui-struts2/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index 5f3bbbd..75d6e65 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -207,7 +207,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> diff --git a/pom.xml b/pom.xml index 1939c54..f76ec06 100644 --- a/pom.xml +++ b/pom.xml @@ -283,7 +283,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <version>${postgresqlVersion}</version> </dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 851f4705b125ea447a9209cb7dbb0928fa792a16 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sat Nov 14 11:16:18 2015 +0100 Fix jquery attr/prop change (1.6+) --- pollen-ui-struts2/src/main/webapp/js/createPoll.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pollen-ui-struts2/src/main/webapp/js/createPoll.js b/pollen-ui-struts2/src/main/webapp/js/createPoll.js index e5da729..3be55ba 100644 --- a/pollen-ui-struts2/src/main/webapp/js/createPoll.js +++ b/pollen-ui-struts2/src/main/webapp/js/createPoll.js @@ -559,8 +559,8 @@ jQuery(document).ready(function () { container.removeClass('hidden').addClass('thispoll'). each(undisableAll); - $('[name="poll.pollType"]').attr('checked', false); - $('[name="poll.pollType"][value="' + type + '"]').attr('checked', 'checked'); + $('[name="poll.pollType"]').prop('checked', false); + $('[name="poll.pollType"][value="' + type + '"]').prop('checked', 'checked'); } function changeChoiceType(type) { @@ -573,8 +573,8 @@ jQuery(document).ready(function () { container.removeClass('hidden'). addClass('thischoice').each(undisableAll); - $('[name="poll.choiceType"]').attr('checked', false); - $('[name="poll.choiceType"][value="' + type + '"]').attr('checked', 'checked'); + $('[name="poll.choiceType"]').prop('checked', false); + $('[name="poll.choiceType"][value="' + type + '"]').prop('checked', 'checked'); } $('[name="poll.choiceAddAllowed"]').change(function () { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit f7898c202c3985f8d247009318e37bc621696cbd Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 18:36:45 2015 +0100 Strange: all migration queries are not working :( --- .../chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java index 83c1fbd..b39b07f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java @@ -130,7 +130,7 @@ public class PollenMigrationCallbackV1_5 extends TopiaMigrationCallbackByClassNG protected PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement ps = connection.prepareStatement( "SELECT p.pollid FROM poll p WHERE " + - "(SELECT COUNT(pa) > COUNT(DISTINCT(pa.useraccount)) " + + "(SELECT COUNT(pa.*) > COUNT(DISTINCT(pa.useraccount)) " + "FROM vote v,pollaccount pa WHERE " + "v.poll = p.topiaid AND v.pollaccount = pa.topiaid " + "AND pa.useraccount IS NOT NULL);"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 6c2b9f8a917c1333c221f22c323f39ab8cf1604e Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:55:19 2015 +0100 Fix jetty config for integration tests --- .../src/it/createPoll/src/jetty/jetty-context.xml | 32 ---------------------- .../src/jetty/jetty-context.xml | 32 ---------------------- .../pollVoteVisibility/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/it/pollen-ui-it/pom.xml | 3 +- .../src/it/security/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/jetty/jetty-context.xml | 32 ---------------------- 6 files changed, 1 insertion(+), 162 deletions(-) diff --git a/pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $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% - --> - -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> - -<Configure class="org.eclipse.jetty.webapp.WebAppContext"> - <Call name="setAttribute"> - <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> - <Arg>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> - </Call> -</Configure> \ No newline at end of file diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $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% - --> - -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> - -<Configure class="org.eclipse.jetty.webapp.WebAppContext"> - <Call name="setAttribute"> - <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> - <Arg>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> - </Call> -</Configure> \ No newline at end of file diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $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% - --> - -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> - -<Configure class="org.eclipse.jetty.webapp.WebAppContext"> - <Call name="setAttribute"> - <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> - <Arg>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> - </Call> -</Configure> \ No newline at end of file diff --git a/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml b/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml index 35e616f..a6ace8a 100644 --- a/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml +++ b/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml @@ -253,7 +253,6 @@ <configuration> <stopKey>A</stopKey> <stopPort>1269</stopPort> - <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> <webAppConfig> <contextPath>/${defaultWebContextPath}</contextPath> </webAppConfig> @@ -332,7 +331,7 @@ <id>start-pollen</id> <phase>pre-integration-test</phase> <goals> - <goal>run</goal> + <goal>start</goal> </goals> <configuration> <!--<daemon>true</daemon>--> diff --git a/pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $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% - --> - -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> - -<Configure class="org.eclipse.jetty.webapp.WebAppContext"> - <Call name="setAttribute"> - <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> - <Arg>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> - </Call> -</Configure> \ No newline at end of file diff --git a/pollen-ui-struts2/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $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% - --> - -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> - -<Configure class="org.eclipse.jetty.webapp.WebAppContext"> - <Call name="setAttribute"> - <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> - <Arg>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> - </Call> -</Configure> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 336ddfea9d731a9844484c27dd17b655ff7a0920 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:56:06 2015 +0100 Never in update mode --- pollen-ui-struts2/src/test/resources/pollen-it.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-struts2/src/test/resources/pollen-it.properties b/pollen-ui-struts2/src/test/resources/pollen-it.properties index 42c5ec6..7fd0587 100644 --- a/pollen-ui-struts2/src/test/resources/pollen-it.properties +++ b/pollen-ui-struts2/src/test/resources/pollen-it.properties @@ -34,7 +34,7 @@ hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:${pollen.dataDirectory}/db/pollendb hibernate.show_sql=false -hibernate.hbm2ddl.auto=update +hibernate.hbm2ddl.auto=none hibernate.c3p0.min_size=5 hibernate.c3p0.max_size=20 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 7f81723d19393edcb032f7382741a21cd608818e Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 23:03:16 2015 +0100 Update to log4j2 --- pollen-persistence/pom.xml | 16 +++++--- .../src/test/resources/log4j.properties | 32 --------------- pollen-persistence/src/test/resources/log4j2.xml | 14 +++++++ pollen-services/pom.xml | 16 +++++--- .../src/test/resources/log4j.properties | 32 --------------- pollen-services/src/test/resources/log4j2.xml | 14 +++++++ pollen-ui-struts2/pom.xml | 21 ++++++---- pollen-ui-struts2/src/it/createPoll/pom.xml | 8 ---- pollen-ui-struts2/src/main/resources/log4j2.xml | 31 ++++++++++++++ .../src/test/resources/log4j.properties | 30 -------------- pollen-ui-struts2/src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-api/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-borda/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-condorcet/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-coombs/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-instant-runoff/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-normal/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-number/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-percentage/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pom.xml | 48 ++++++++++++++++------ 36 files changed, 366 insertions(+), 390 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index b56ab8c..9c28d0b 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -88,14 +88,20 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-persistence/src/test/resources/log4j.properties b/pollen-persistence/src/test/resources/log4j.properties deleted file mode 100644 index fbba941..0000000 --- a/pollen-persistence/src/test/resources/log4j.properties +++ /dev/null @@ -1,32 +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% -### -log4j.rootCategory=WARN, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=[%p] %c %m%n - -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-persistence/src/test/resources/log4j2.xml b/pollen-persistence/src/test/resources/log4j2.xml new file mode 100644 index 0000000..d31e7d4 --- /dev/null +++ b/pollen-persistence/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="[%p] %c %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 3e33bd5..d95234f 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -108,14 +108,20 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-services/src/test/resources/log4j.properties b/pollen-services/src/test/resources/log4j.properties deleted file mode 100644 index e029737..0000000 --- a/pollen-services/src/test/resources/log4j.properties +++ /dev/null @@ -1,32 +0,0 @@ -### -# #%L -# Pollen :: Services -# $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% -### -log4j.rootCategory=WARN, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=[%p] %c %m%n - -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-services/src/test/resources/log4j2.xml b/pollen-services/src/test/resources/log4j2.xml new file mode 100644 index 0000000..d31e7d4 --- /dev/null +++ b/pollen-services/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="[%p] %c %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index 75d6e65..a8a125a 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -218,16 +218,19 @@ <scope>runtime</scope> </dependency> - <!--dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> - </dependency--> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> </dependency> <!-- Test dependencies --> diff --git a/pollen-ui-struts2/src/it/createPoll/pom.xml b/pollen-ui-struts2/src/it/createPoll/pom.xml index be52f6f..d620831 100644 --- a/pollen-ui-struts2/src/it/createPoll/pom.xml +++ b/pollen-ui-struts2/src/it/createPoll/pom.xml @@ -39,13 +39,5 @@ <name>Pollen :: IT createPoll</name> <description>createPoll</description> - <dependencies> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.4.01</version> - </dependency> - </dependencies> - </project> diff --git a/pollen-ui-struts2/src/main/resources/log4j2.xml b/pollen-ui-struts2/src/main/resources/log4j2.xml new file mode 100644 index 0000000..5240491 --- /dev/null +++ b/pollen-ui-struts2/src/main/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Properties> + <Property name="pollen.log.dir">/tmp</Property> + </Properties> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d [%p] %c %m%n"/> + </Console> + <RollingFile name="File" fileName="${sys:pollen.log.dir}/pollen.log" + filePattern="${sys:pollen.log.dir}/pollen-%d{yyyyMMdd}-%i.log"> + <PatternLayout> + <pattern>%d{yyyy/MM/dd HH:mm:ss} %5p (%F:%L) %m%n</pattern> + </PatternLayout> + <Policies> + <TimeBasedTriggeringPolicy /> + <SizeBasedTriggeringPolicy size="10 MB"/> + </Policies> + <DefaultRolloverStrategy max="5"/> + </RollingFile> + + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Logger name="org.nuiton" level="warn" /> + <Root level="warn"> + <AppenderRef ref="Console"/> + <AppenderRef ref="File" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-ui-struts2/src/test/resources/log4j.properties b/pollen-ui-struts2/src/test/resources/log4j.properties deleted file mode 100644 index 6a18cf2..0000000 --- a/pollen-ui-struts2/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-ui-struts2/src/test/resources/log4j2.xml b/pollen-ui-struts2/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-ui-struts2/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 34d2185..8aa8e8e 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -33,8 +33,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-api/src/test/resources/log4j.properties b/pollen-votecounting-api/src/test/resources/log4j.properties deleted file mode 100644 index 2c35996..0000000 --- a/pollen-votecounting-api/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting Api -# $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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-api/src/test/resources/log4j2.xml b/pollen-votecounting-api/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-api/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 9a3c2fd..37e0b6b 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -38,8 +38,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-borda/src/test/resources/log4j.properties b/pollen-votecounting-borda/src/test/resources/log4j.properties deleted file mode 100644 index 8db1a8e..0000000 --- a/pollen-votecounting-borda/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Condorcet -# $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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-borda/src/test/resources/log4j2.xml b/pollen-votecounting-borda/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-borda/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 52cc060..5abdc99 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -38,8 +38,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-condorcet/src/test/resources/log4j.properties b/pollen-votecounting-condorcet/src/test/resources/log4j.properties deleted file mode 100644 index 8db1a8e..0000000 --- a/pollen-votecounting-condorcet/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Condorcet -# $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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-condorcet/src/test/resources/log4j2.xml b/pollen-votecounting-condorcet/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-condorcet/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index d3437f0..2573557 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -38,8 +38,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-coombs/src/test/resources/log4j.properties b/pollen-votecounting-coombs/src/test/resources/log4j.properties deleted file mode 100644 index d87a163..0000000 --- a/pollen-votecounting-coombs/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Coombs -# $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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-coombs/src/test/resources/log4j2.xml b/pollen-votecounting-coombs/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-coombs/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 8ab00a1..ceab62e 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -38,8 +38,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-instant-runoff/src/test/resources/log4j.properties b/pollen-votecounting-instant-runoff/src/test/resources/log4j.properties deleted file mode 100644 index 8134979..0000000 --- a/pollen-votecounting-instant-runoff/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Instant Runoff -# $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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml b/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index d4348db..59a05ec 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -33,8 +33,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-normal/src/test/resources/log4j.properties b/pollen-votecounting-normal/src/test/resources/log4j.properties deleted file mode 100644 index 631d77b..0000000 --- a/pollen-votecounting-normal/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Normal -# $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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-normal/src/test/resources/log4j2.xml b/pollen-votecounting-normal/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-normal/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index df8cd13..cf5621d 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -33,8 +33,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-number/src/test/resources/log4j.properties b/pollen-votecounting-number/src/test/resources/log4j.properties deleted file mode 100644 index 0676156..0000000 --- a/pollen-votecounting-number/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Number -# $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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-number/src/test/resources/log4j2.xml b/pollen-votecounting-number/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-number/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 94f273e..c720cd6 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -33,8 +33,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-percentage/src/test/resources/log4j.properties b/pollen-votecounting-percentage/src/test/resources/log4j.properties deleted file mode 100644 index 3d8fafc..0000000 --- a/pollen-votecounting-percentage/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Percentage -# $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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-percentage/src/test/resources/log4j2.xml b/pollen-votecounting-percentage/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-percentage/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pom.xml b/pom.xml index e02cba0..07e623a 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ <struts2Version>2.3.24.1</struts2Version> <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <shiroVersion>1.2.4</shiroVersion> - <slf4jVersion>1.7.13</slf4jVersion> + <log4j>2.4.1</log4j> <jettyVersion>9.3.6.v20151106</jettyVersion> <jettyPluginVersion>9.3.6.v20151106</jettyPluginVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> @@ -275,6 +275,12 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -427,25 +433,41 @@ </dependency> <!-- Logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>2.4.1</version> + <scope>runtime</scope> + </dependency> - <!--dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - <scope>compile</scope> - </dependency--> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.4.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>2.4.1</version> + <scope>runtime</scope> + </dependency> + <!-- Temp : For hibernate to use log4j2 --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <version>${slf4jVersion}</version> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.3.0.Final</version> <scope>runtime</scope> </dependency> + <!-- Temp : For MLog to use log4j2 --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>com.mchange</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.5.1</version> + <scope>runtime</scope> </dependency> <!-- Others --> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 7ea9dc2bf075a60688dc861f1a2eacff14f4fedf Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Nov 16 15:05:01 2015 +0100 Fix java8 javadoc, deps... --- .../pollen/PollenApplicationConfigProvider.java | 2 +- .../org/chorem/pollen/PollenConfiguration.java | 2 +- .../chorem/pollen/PollenConfigurationOption.java | 2 +- .../java/org/chorem/pollen/PollenFunctions.java | 2 +- .../main/java/org/chorem/pollen/PollenIOUtil.java | 2 +- .../chorem/pollen/PollenTechnicalException.java | 2 +- .../pollen/PollenTopiaRootContextFactory.java | 2 +- .../pollen/business/persistence/I18nAble.java | 2 +- .../business/persistence/PersonToListDAOImpl.java | 4 +-- .../business/persistence/PollAccountDAOImpl.java | 4 +-- .../pollen/business/persistence/PollActions.java | 2 +- .../persistence/PollCommentVisibility.java | 2 +- .../business/persistence/PollVoteVisibility.java | 4 +-- .../chorem/pollen/business/persistence/Polls.java | 8 +++--- .../business/persistence/VotingListImpl.java | 2 +- .../business/persistence/AbstractDAOTest.java | 4 +-- .../business/persistence/CommentDAOImplTest.java | 2 +- .../persistence/PersonListDAOImplTest.java | 2 +- .../persistence/PersonToListDAOImplTest.java | 2 +- .../persistence/PollAccountDAOImplTest.java | 2 +- .../business/persistence/PollDAOImplTest.java | 2 +- .../pollen/business/persistence/PollTest.java | 2 +- .../persistence/UserAccountDAOImplTest.java | 2 +- .../business/persistence/VoteDAOImplTest.java | 2 +- pollen-persistence/src/test/resources/log4j2.xml | 21 ++++++++++++++ pollen-services/src/license/THIRD-PARTY.properties | 19 ++++++++----- .../chorem/pollen/PollenApplicationContext.java | 2 +- .../chorem/pollen/PollenUserSecurityContext.java | 14 ++++----- .../org/chorem/pollen}/TopiaTransactionFilter.java | 33 +++++++++++----------- .../org/chorem/pollen/bean/PollDateChoice.java | 2 +- .../org/chorem/pollen/bean/PollImageChoice.java | 2 +- .../main/java/org/chorem/pollen/bean/PollUri.java | 2 +- .../main/java/org/chorem/pollen/bean/PollUrl.java | 2 +- .../migration/PollenMigrationCallback.java | 2 +- .../migration/PollenMigrationCallbackV1_1.java | 2 +- .../migration/PollenMigrationCallbackV1_2.java | 2 +- .../migration/PollenMigrationCallbackV1_3.java | 2 +- .../migration/PollenMigrationCallbackV1_3_1.java | 2 +- .../migration/PollenMigrationCallbackV1_4.java | 2 +- .../migration/PollenMigrationCallbackV1_4_5.java | 2 +- .../migration/PollenMigrationCallbackV1_5.java | 2 +- .../services/DefaultPollenServiceContext.java | 2 +- .../pollen/services/PollenNotifierWorker.java | 2 +- .../org/chorem/pollen/services/PollenService.java | 2 +- .../pollen/services/PollenServiceContext.java | 2 +- .../pollen/services/PollenServiceFactory.java | 2 +- .../pollen/services/PollenServiceFunctions.java | 2 +- .../pollen/services/PollenServiceSupport.java | 2 +- .../FavoriteListAlreadyExistException.java | 2 +- .../exceptions/FavoriteListImportException.java | 2 +- .../exceptions/FavoriteListNotFoundException.java | 2 +- .../FavoriteListNotOwnedByUserException.java | 2 +- .../services/exceptions/InvalidEmailException.java | 2 +- .../ParticipantAlreadyFoundInListException.java | 2 +- .../ParticipantExistWithoutMailException.java | 2 +- .../exceptions/ParticipantNotFoundException.java | 2 +- .../ParticipantNotFoundInListException.java | 2 +- .../services/exceptions/PollAccountNotFound.java | 2 +- .../exceptions/PollAlreadyClosedException.java | 2 +- .../exceptions/PollAlreadyExistException.java | 2 +- .../exceptions/PollChoiceNotFoundException.java | 2 +- .../services/exceptions/PollCommentNotFound.java | 2 +- .../services/exceptions/PollNotFoundException.java | 2 +- .../exceptions/PollVoteNotFoundException.java | 2 +- .../UnauthorizedPollAccessException.java | 2 +- .../exceptions/UserEmailAlreadyUsedException.java | 2 +- .../exceptions/UserInvalidPasswordException.java | 2 +- .../exceptions/UserLoginAlreadyUsedException.java | 2 +- .../services/exceptions/UserNotFoundException.java | 2 +- .../services/exceptions/VoteDoubloonException.java | 2 +- .../exceptions/VoteNotAllowedException.java | 2 +- .../services/exceptions/VoteNotFoundException.java | 2 +- .../pollen/services/impl/PollCommentService.java | 2 +- .../pollen/services/impl/PollExportService.java | 2 +- .../pollen/services/impl/PollFeedService.java | 2 +- .../pollen/services/impl/PollUrlService.java | 2 +- .../services/impl/PollVoteCountingService.java | 4 +-- .../pollen/services/impl/PreventRuleService.java | 2 +- .../pollen/services/impl/SecurityService.java | 2 +- .../pollen/services/AbstractPollenServiceTest.java | 2 +- .../pollen/services/impl/EmailServiceTest.java | 2 +- .../pollen/services/impl/FavoriteServiceTest.java | 2 +- .../pollen/services/impl/PollServiceTest.java | 2 +- .../pollen/services/impl/UserServiceTest.java | 2 +- .../pollen/services/impl/VoteServiceTest.java | 2 +- pollen-services/src/test/resources/log4j2.xml | 21 ++++++++++++++ .../chorem/pollen/ui/it/CreateFreeDatePollIT.java | 4 +-- .../chorem/pollen/ui/it/CreateFreeTextPollIT.java | 4 +-- .../pollen/ui/it/CreateRestrictedTextPollIT.java | 4 +-- .../pollen/ui/it/CreateTextPollForGroupIT.java | 4 +-- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../org/chorem/pollen/ui/it/PollWithCommentIT.java | 2 +- .../chorem/pollen/ui/it/PollWithoutCommentIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../java/org/chorem/pollen/ui/it/AbstractIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../ui/it/freepoll/AnonymousPollByAdminIT.java | 4 +-- .../ui/it/freepoll/AnonymousPollByConnectedIT.java | 4 +-- .../it/freepoll/AnonymousPollByNotConnectedIT.java | 6 ++-- .../ui/it/freepoll/CreatorOnlyByAdminIT.java | 4 +-- .../ui/it/freepoll/CreatorOnlyByConnectedIT.java | 4 +-- .../it/freepoll/CreatorOnlyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/freepoll/EverybodyByAdminIT.java | 4 +-- .../ui/it/freepoll/EverybodyByConnectedIT.java | 4 +-- .../ui/it/freepoll/EverybodyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/freepoll/FreePollTestSuite.java | 2 +- .../pollen/ui/it/freepoll/VoterOnlyByAdminIT.java | 4 +-- .../ui/it/freepoll/VoterOnlyByConnectedIT.java | 4 +-- .../ui/it/freepoll/VoterOnlyByNotConnectedIT.java | 4 +-- .../chorem/pollen/ui/it/freepoll/java-info.java | 2 +- .../it/restrictedpoll/AnonymousPollByAdminIT.java | 4 +-- .../restrictedpoll/AnonymousPollByConnectedIT.java | 4 +-- .../AnonymousPollByNotConnectedIT.java | 4 +-- .../ui/it/restrictedpoll/CreatorOnlyByAdminIT.java | 4 +-- .../restrictedpoll/CreatorOnlyByConnectedIT.java | 4 +-- .../CreatorOnlyByNotConnectedIT.java | 4 +-- .../ui/it/restrictedpoll/EverybodyByAdminIT.java | 4 +-- .../it/restrictedpoll/EverybodyByConnectedIT.java | 4 +-- .../restrictedpoll/EverybodyByNotConnectedIT.java | 4 +-- .../it/restrictedpoll/RestrictedPollTestSuite.java | 2 +- .../ui/it/restrictedpoll/VoterOnlyByAdminIT.java | 4 +-- .../it/restrictedpoll/VoterOnlyByConnectedIT.java | 4 +-- .../restrictedpoll/VoterOnlyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/restrictedpoll/java-info.java | 2 +- .../java/org/chorem/pollen/ui/it/LoginSIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../org/chorem/pollen/ui/it/SecurityAccessSIT.java | 24 ++++++++-------- .../src/license/THIRD-PARTY.properties | 30 ++++++++++++-------- .../pollen/ui/PollenApplicationListener.java | 8 +++--- .../java/org/chorem/pollen/ui/PollenSession.java | 2 +- .../pollen/ui/PollenStaticContentLoader.java | 6 ++-- .../pollen/ui/PollenTopiaTransactionFilter.java | 3 +- .../java/org/chorem/pollen/ui/PollenUIUtils.java | 2 +- .../chorem/pollen/ui/actions/FileUploadAware.java | 8 +++--- .../org/chorem/pollen/ui/actions/PageSkin.java | 2 +- .../org/chorem/pollen/ui/actions/PollUriAware.java | 2 +- .../pollen/ui/actions/PollenActionSupport.java | 28 +++++++++--------- .../ui/actions/PollenActionSupportForEdition.java | 2 +- .../ui/actions/PollenActionSupportForVote.java | 2 +- .../pollen/ui/actions/PollenUserSecurityAware.java | 2 +- .../chorem/pollen/ui/actions/admin/Confirm.java | 2 +- .../chorem/pollen/ui/actions/admin/DeleteUser.java | 2 +- .../pollen/ui/actions/admin/ManagePolls.java | 2 +- .../pollen/ui/actions/admin/ManageUsers.java | 2 +- .../pollen/ui/actions/admin/package-info.java | 2 +- .../chorem/pollen/ui/actions/io/GenerateChart.java | 2 +- .../pollen/ui/actions/io/GetPollImageChoice.java | 2 +- .../chorem/pollen/ui/actions/io/package-info.java | 2 +- .../ui/actions/json/AbstractJSONPaginedAction.java | 2 +- .../ui/actions/json/AbstractJSONSimpleAction.java | 2 +- .../pollen/ui/actions/json/GetCreatedPolls.java | 2 +- .../pollen/ui/actions/json/GetFavoriteList.java | 2 +- .../actions/json/GetFavoriteListPollAccount.java | 2 +- .../actions/json/GetFavoriteListPollAccounts.java | 2 +- .../pollen/ui/actions/json/GetFavoriteLists.java | 2 +- .../pollen/ui/actions/json/GetInvitedPolls.java | 2 +- .../ui/actions/json/GetParticipatedPolls.java | 2 +- .../chorem/pollen/ui/actions/json/GetPolls.java | 2 +- .../org/chorem/pollen/ui/actions/json/GetUser.java | 2 +- .../chorem/pollen/ui/actions/json/GetUsers.java | 2 +- .../pollen/ui/actions/json/package-info.java | 2 +- .../org/chorem/pollen/ui/actions/package-info.java | 2 +- .../chorem/pollen/ui/actions/poll/GetPollFeed.java | 2 +- .../pollen/ui/actions/poll/ResultForPoll.java | 2 +- .../pollen/ui/actions/poll/admin/ClosePoll.java | 2 +- .../ui/actions/poll/admin/ConfirmPollAction.java | 2 +- .../pollen/ui/actions/poll/admin/DeletePoll.java | 2 +- .../pollen/ui/actions/poll/admin/ExportPoll.java | 2 +- .../pollen/ui/actions/poll/admin/SummaryPoll.java | 2 +- .../pollen/ui/actions/poll/admin/package-info.java | 2 +- .../actions/poll/form/AbstractDisplayChoice.java | 2 +- .../ui/actions/poll/form/AbstractPollForm.java | 2 +- .../pollen/ui/actions/poll/form/ClonePoll.java | 2 +- .../pollen/ui/actions/poll/form/CreatePoll.java | 2 +- .../ui/actions/poll/form/DisplayDateChoice.java | 2 +- .../ui/actions/poll/form/DisplayImageChoice.java | 2 +- .../ui/actions/poll/form/DisplayPersonToList.java | 2 +- .../ui/actions/poll/form/DisplayTextChoice.java | 2 +- .../ui/actions/poll/form/DisplayVotingList.java | 2 +- .../pollen/ui/actions/poll/form/EditPoll.java | 2 +- .../poll/form/ImportPersonListToVotingList.java | 2 +- .../poll/form/SelectPersonListToVotingList.java | 2 +- .../pollen/ui/actions/poll/form/package-info.java | 2 +- .../pollen/ui/actions/poll/package-info.java | 2 +- .../ui/actions/poll/vote/AbstractVoteAction.java | 4 +-- .../pollen/ui/actions/poll/vote/AddChoice.java | 2 +- .../pollen/ui/actions/poll/vote/AddComment.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteChoice.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteComment.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteVote.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteChoice.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteComment.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteVote.java | 2 +- .../pollen/ui/actions/poll/vote/ModeratePoll.java | 2 +- .../pollen/ui/actions/poll/vote/VoteForPoll.java | 4 +-- .../pollen/ui/actions/poll/vote/package-info.java | 2 +- .../chorem/pollen/ui/actions/user/AttachPoll.java | 2 +- .../chorem/pollen/ui/actions/user/ChangeLang.java | 2 +- .../org/chorem/pollen/ui/actions/user/Confirm.java | 2 +- .../pollen/ui/actions/user/CreateFavoriteList.java | 2 +- .../ui/actions/user/CreateFavoriteListVoter.java | 2 +- .../pollen/ui/actions/user/DeleteFavoriteList.java | 2 +- .../ui/actions/user/DeleteFavoriteListVoter.java | 2 +- .../org/chorem/pollen/ui/actions/user/Edit.java | 2 +- .../pollen/ui/actions/user/EditFavoriteList.java | 2 +- .../ui/actions/user/EditFavoriteListVoter.java | 2 +- .../org/chorem/pollen/ui/actions/user/Login.java | 2 +- .../org/chorem/pollen/ui/actions/user/Logout.java | 2 +- .../pollen/ui/actions/user/LostPassword.java | 2 +- .../chorem/pollen/ui/actions/user/Register.java | 2 +- .../pollen/ui/actions/user/package-info.java | 2 +- .../ui/converters/BooleanIntegerConverter.java | 2 +- .../chorem/pollen/ui/converters/DateConverter.java | 2 +- .../pollen/ui/converters/PollUriConverter.java | 2 +- .../chorem/pollen/ui/converters/package-info.java | 2 +- .../interceptors/PollenFileUploadInterceptor.java | 6 ++-- .../ui/interceptors/PollenSecurityInterceptor.java | 2 +- .../pollen/ui/interceptors/package-info.java | 2 +- .../java/org/chorem/pollen/ui/package-info.java | 2 +- .../org/chorem/pollen/ui/results/package-info.java | 2 +- .../ui/security/AbstractPollenAuthorization.java | 2 +- .../ui/security/PollCreatorAccessRequired.java | 2 +- .../ui/security/PollResultAccessRequired.java | 2 +- .../pollen/ui/security/PollVoteAccessRequired.java | 2 +- .../chorem/pollen/ui/security/package-info.java | 2 +- pollen-ui-struts2/src/main/resources/log4j2.xml | 21 ++++++++++++++ .../resources/template/jquery/theme.properties | 20 +++++++++++++ .../ui/converters/BooleanIntegerConverterTest.java | 2 +- .../org/chorem/pollen/ui/it/AbstractPollIT.java | 2 +- .../org/chorem/pollen/ui/it/AbstractPollenIT.java | 8 +++--- .../java/org/chorem/pollen/ui/it/CleanDrivers.java | 2 +- .../org/chorem/pollen/ui/it/PollenUrlFixtures.java | 10 +++---- .../chorem/pollen/ui/it/WebDriverResources.java | 2 +- .../strategy/VoteCountingFactoryTest.java | 2 +- pollen-ui-struts2/src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/AbstractVoteCounting.java | 2 +- .../votecounting/AbstractVoteCountingStrategy.java | 2 +- .../chorem/pollen/votecounting/VoteCounting.java | 2 +- .../pollen/votecounting/VoteCountingFactory.java | 2 +- .../pollen/votecounting/VoteCountingNotFound.java | 2 +- .../pollen/votecounting/VoteCountingStrategy.java | 2 +- .../pollen/votecounting/model/ChoiceIdAble.java | 2 +- .../pollen/votecounting/model/ChoiceScore.java | 4 +-- .../votecounting/model/ChoiceToVoteRenderType.java | 4 +-- .../pollen/votecounting/model/GroupOfVoter.java | 2 +- .../votecounting/model/GroupOfVoterBuilder.java | 2 +- .../model/GroupVoteCountingResult.java | 2 +- .../pollen/votecounting/model/SimpleVoter.java | 2 +- .../votecounting/model/SimpleVoterBuilder.java | 2 +- .../votecounting/model/VoteCountingResult.java | 4 +-- .../pollen/votecounting/model/VoteForChoice.java | 2 +- .../chorem/pollen/votecounting/model/Voter.java | 2 +- .../pollen/votecounting/model/VoterBuilder.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/BordaVoteCounting.java | 2 +- .../votecounting/BordaVoteCountingStrategy.java | 2 +- .../BordaVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/CondorcetVoteCounting.java | 2 +- .../CondorcetVoteCountingStrategy.java | 2 +- .../CondorcetVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/CoombsVoteCounting.java | 2 +- .../votecounting/CoombsVoteCountingStrategy.java | 2 +- .../CoombsVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../votecounting/InstantRunoffVoteCounting.java | 2 +- .../InstantRunoffVoteCountingStrategy.java | 2 +- .../InstantRunoffVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/NormalVoteCounting.java | 2 +- .../votecounting/NormalVoteCountingStrategy.java | 4 +-- .../NormalVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/NumberVoteCounting.java | 2 +- .../votecounting/NumberVoteCountingStrategy.java | 2 +- .../NumberVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../votecounting/PercentageVoteCounting.java | 2 +- .../PercentageVoteCountingStrategy.java | 2 +- .../PercentageVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ 290 files changed, 682 insertions(+), 401 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java index d2b7ad8..728db45 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java @@ -33,7 +33,7 @@ import org.nuiton.config.ConfigOptionDef; /** * Application config provider (for site generation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3.1 */ public class PollenApplicationConfigProvider implements ApplicationConfigProvider { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java index ef099ef..c7dfc25 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java @@ -50,7 +50,7 @@ import com.google.common.collect.Lists; /** * Pollen configuration. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenConfiguration { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java index f665c56..24e7cba 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java @@ -37,7 +37,7 @@ import org.nuiton.config.ConfigOptionDef; /** * All Pollen configuration options. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public enum PollenConfigurationOption implements ConfigOptionDef { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java index 2687899..8705ef2 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java @@ -35,7 +35,7 @@ import java.util.Map; /** * Usefull pollen functions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenFunctions { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java index 3fb77b8..48f5e4f 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java @@ -30,7 +30,7 @@ import java.io.File; /** * Some utils IO methods. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenIOUtil { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java index 752f644..c3c4b9e 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java @@ -23,7 +23,7 @@ package org.chorem.pollen; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenTechnicalException extends RuntimeException { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java index 8f8d07a..c7c3d07 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java @@ -39,7 +39,7 @@ import java.util.Properties; import java.util.Set; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenTopiaRootContextFactory { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/I18nAble.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/I18nAble.java index 4545cde..673b473 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/I18nAble.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/I18nAble.java @@ -25,7 +25,7 @@ package org.chorem.pollen.business.persistence; /** * Contract to expose a i18n key. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public interface I18nAble { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java index 1340a04..900db01 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; /** * Created: 28/03/12 * - * @author fdesbois <desbois@codelutin.com> - * @author tchemit <cheit@codelutin.com> + * @author fdesbois <desbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PersonToListDAOImpl<E extends PersonToList> extends PersonToListDAOAbstract<E> { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java index 53db2df..af5eafb 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java @@ -43,7 +43,7 @@ public class PollAccountDAOImpl<E extends PollAccount> extends PollAccountDAOAbs * Get a restricted poll account for a given poll (by his {@link Poll#getPollId()}) * using the {@link PollAccount#getAccountId()} of the pollAccount * and/or the {@link PollAccount#getEmail()}. - * <p/> + * * <strong>Note:</strong> {@code accountId} and {@code user} can not * be null at the same time. * @@ -118,7 +118,7 @@ public class PollAccountDAOImpl<E extends PollAccount> extends PollAccountDAOAbs /** * Get the pollAccount of a voter for a given {@code pollId} using his * {@code accountId} or {@code user}. - * <p/> + * * <strong>Note:</strong> {@code accountId} and {@code user} can not * be null at the same time. * diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java index 16305c7..f232852 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java @@ -25,7 +25,7 @@ package org.chorem.pollen.business.persistence; /** * Enumeration to get all possible actions on poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public enum PollActions { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollCommentVisibility.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollCommentVisibility.java index f47fc69..9883d2b 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollCommentVisibility.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollCommentVisibility.java @@ -27,7 +27,7 @@ import static org.nuiton.i18n.I18n.n; /** * Define how comment can be shown in a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public enum PollCommentVisibility implements I18nAble { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollVoteVisibility.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollVoteVisibility.java index e25f135..8e14d04 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollVoteVisibility.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollVoteVisibility.java @@ -27,14 +27,14 @@ import static org.nuiton.i18n.I18n.n; /** * Define how vote can be visible in a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public enum PollVoteVisibility implements I18nAble { /** * Nobody can see vote. - * <p/> + * * This means every votes are anonymous. */ NOBODY(n("pollen.pollVoteVisibilty.nobody"), diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java index 7e20e51..92ca136 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java @@ -40,7 +40,7 @@ import java.util.Set; /** * Useful methods around {@link Poll}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.6 */ public class Polls { @@ -52,9 +52,9 @@ public class Polls { /** * Collect all vote for all voters of the givne poll. - * <p/> + * * The result (a set of simple voters) are stored in a fictiv group of voter. - * <p/> + * * <strong>Note:</strong> Even if the poll is a group type, then no of his * group are used (just collect simple voters with no group linkage). * @@ -78,7 +78,7 @@ public class Polls { /** * Build the group of voter of the poll, using his group to build sub * group of the poll. - * <p/> + * * <strong>Note:</strong> This method can only be used for a group poll. * * @param poll the poll to scan diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java index ce7d7b7..295e383 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java @@ -29,7 +29,7 @@ import java.util.List; /** * Created: 05/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class VotingListImpl extends VotingListAbstract { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java index c23ad36..2f984b0 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java @@ -39,7 +39,7 @@ import java.io.File; /** * Base test for daos. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class AbstractDAOTest { @@ -65,7 +65,7 @@ public class AbstractDAOTest { /** * A new database created for each test. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public static class PollenDatabase extends TestWatcher { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java index cba0908..fa3e8e6 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java @@ -33,7 +33,7 @@ import java.util.List; /** * Tests the {@link CommentDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CommentDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java index e3b1894..ca14d9d 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java @@ -33,7 +33,7 @@ import java.util.List; /** * Tests the {@link PersonListDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PersonListDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java index 0f8935e..23d0734 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java @@ -30,7 +30,7 @@ import org.nuiton.topia.TopiaContext; /** * Tests the {@link PersonToListDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PersonToListDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java index 099b769..09e760f 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java @@ -33,7 +33,7 @@ import org.nuiton.topia.TopiaException; /** * Test the {@link PollAccountDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollAccountDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java index f499f14..2f1e906 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java @@ -38,7 +38,7 @@ import java.util.List; /** * Tests the {@link PollDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java index c4ddc34..f483ee3 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java @@ -32,7 +32,7 @@ import java.util.Date; /** * Tests the {@link PollImpl} methods. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java index e57b565..d4f4f2b 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java @@ -33,7 +33,7 @@ import java.util.List; /** * Tests the {@link UserAccountDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class UserAccountDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java index 7556c00..b526b7b 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java @@ -34,7 +34,7 @@ import java.util.List; /** * Tests the {@link VoteDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/resources/log4j2.xml b/pollen-persistence/src/test/resources/log4j2.xml index d31e7d4..2637cb6 100644 --- a/pollen-persistence/src/test/resources/log4j2.xml +++ b/pollen-persistence/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: Persistence + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-services/src/license/THIRD-PARTY.properties b/pollen-services/src/license/THIRD-PARTY.properties index ede0053..ac5fc50 100644 --- a/pollen-services/src/license/THIRD-PARTY.properties +++ b/pollen-services/src/license/THIRD-PARTY.properties @@ -1,17 +1,22 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License -# - CDDL +# - CDDL + GPLv2 with classpath exception +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 +# - Eclipse Public License, Version 1.0 # - GNU Affero General Public License version 3 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, version 2.1 +# - GNU Lesser General Public License, Version 2.1 # - GNU Library or Lesser General Public License -# - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -19,16 +24,16 @@ # - MIT License # - MPL 1.1 # - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Apr 29 11:02:34 CEST 2013 +#Mon Nov 16 14:38:43 CET 2015 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javassist--javassist--3.11.0.GA=Apache License, version 2.0 jdom--jdom--1.0=The Apache Software License, Version 2.0 rome--rome--1.0=The Apache Software License, Version 2.0 diff --git a/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java b/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java index 929e61c..3a6afc5 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java @@ -31,7 +31,7 @@ import javax.servlet.ServletContext; import java.util.Map; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenApplicationContext { diff --git a/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java b/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java index 231b4cb..cade5d3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java @@ -38,7 +38,7 @@ import java.util.Set; /** * To store security context for a given user at each request. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollenUserSecurityContext implements Serializable { @@ -47,7 +47,7 @@ public class PollenUserSecurityContext implements Serializable { /** * Connected user account. - * <p/> + * * Can be {@code null} if user is not connected. */ protected final UserAccount userAccount; @@ -61,14 +61,14 @@ public class PollenUserSecurityContext implements Serializable { /** * Current loaded poll according to the {@link #pollUri}. - * <p/> + * * <strong>Note:</strong> this poll should be used by any action needed it. */ protected Poll poll; /** * User roles on the poll. - * <p/> + * * Loaded by the method {@link #loadUserRoles(SecurityService)}. */ protected Set<PollenUserSecurityRole> userRoles; @@ -182,14 +182,14 @@ public class PollenUserSecurityContext implements Serializable { * To define a security role for a given pollen user which can be * identified by his user account or a accountId. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public enum PollenUserSecurityRole { /** * Creator of the poll. - * <p/> + * * This role can access to everything, but can not vote. */ CREATOR, @@ -197,7 +197,7 @@ public class PollenUserSecurityContext implements Serializable { VOTER, /** * A user that was invited to a restricted poll. - * <p/> + * * It might have alreay voted or not. */ RESTRICTED_VOTER diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/TopiaTransactionFilter.java b/pollen-services/src/main/java/org/chorem/pollen/TopiaTransactionFilter.java similarity index 95% rename from pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/TopiaTransactionFilter.java rename to pollen-services/src/main/java/org/chorem/pollen/TopiaTransactionFilter.java index a3ecfd8..8bfb887 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/TopiaTransactionFilter.java +++ b/pollen-services/src/main/java/org/chorem/pollen/TopiaTransactionFilter.java @@ -8,21 +8,20 @@ * Copyright (C) 2011 CodeLutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * 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.ui; +package org.chorem.pollen; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -52,7 +51,7 @@ import java.util.Set; * This filter purpose is to inject in the request a transaction from * {@link TopiaContext} and deal with the complete lifecycle of a topia * transaction while a request. - * <p/> + * * The injected transaction will be closed (if was really opened) at the end of * the request. * <h2>Configuration of the filter</h2> @@ -62,40 +61,40 @@ import java.util.Set; * which should never be called on the proxied transaction. * When a such method is called on the transaction then the filter will pass in * the hook {@link #onExcludeMethod(Object, Method, Object[])}. - * <p/> + * * Default implementation of this hook is to throw an exception. * </li> * <li>{@code unusedMethods}: This parameters configure a set of method names * which should be by-pass when the proxied transaction was not still open (via a {@link TopiaContext#beginTransaction()}. * When a such method is called on the transaction then the filter will pass in * the hook {@link #onUnusedMethod(Object, Method, Object[])}. - * <p/> + * * Default implementation of this hook is to not return null values. * </li> * </ul> * <h2>Obtain the transaction</h2> * The (proxied) transaction is pushed as an attribute in the servlet request. - * <p/> + * * The attribute name is defined by field {@link #requestAttributeName} * (default value is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be * changed. - * <p/> + * * A convience method is created here to obtain the transaction {@link #getTransaction(ServletRequest)} : * <pre> * TopiaContext tx = TopiaTransactionFilter.getTransaction(ServletRequest); * </pre> - * <p/> + * * If you prefer to not use this nice method, you can also do this: * <pre> * TopiaContext tx = (TopiaContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); * </pre> - * <p/> + * * Or * <pre> * TopiaContext tx = (TopiaContext) request.getAttribute(modifiedAttributeName); * </pre> * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public abstract class TopiaTransactionFilter implements Filter { @@ -132,7 +131,7 @@ public abstract class TopiaTransactionFilter implements Filter { /** * Name of the request attribute where to push the transaction. - * <p/> + * * By default will use value of * {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. * diff --git a/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java b/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java index adb91ea..8ddbaa1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java +++ b/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java @@ -31,7 +31,7 @@ import java.util.Date; * Extends the basic choice to keep the date (will be transformed to name) * (during poll creation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollDateChoice extends ChoiceImpl { diff --git a/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java b/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java index d880bbf..9fa3236 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java +++ b/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java @@ -29,7 +29,7 @@ import org.chorem.pollen.business.persistence.ChoiceImpl; * Extends the basic choice to keep location of uploaded image * (during poll creation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollImageChoice extends ChoiceImpl { diff --git a/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java b/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java index 8e75539..913d005 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java +++ b/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java @@ -31,7 +31,7 @@ import java.io.Serializable; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollUri implements Serializable { diff --git a/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java b/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java index 611f8f2..c508967 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java +++ b/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java @@ -25,7 +25,7 @@ package org.chorem.pollen.bean; /** * Created: 12/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class PollUrl { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java index 2116b8e..b3cea4f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java @@ -32,7 +32,7 @@ import java.util.List; /** * Pollen Migration callback. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenMigrationCallback extends TopiaMigrationCallbackByClassNG { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java index ec1c02a..390d3b3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java @@ -37,7 +37,7 @@ import org.nuiton.util.version.Versions; /** * Migration for version {@code 1.1}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenMigrationCallbackV1_1 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java index a8e2e70..4194c82 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java @@ -37,7 +37,7 @@ import org.nuiton.util.version.Versions; /** * Migration for version {@code 1.2}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenMigrationCallbackV1_2 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java index edc5443..4f20f39 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java @@ -45,7 +45,7 @@ import java.util.Map; /** * Migration for version {@code 1.3}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenMigrationCallbackV1_3 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java index c50cdc0..540d91d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java @@ -38,7 +38,7 @@ import java.util.List; /** * Migration for version {@code 1.3.1}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3.1 */ public class PollenMigrationCallbackV1_3_1 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java index 27ad9f1..75b206b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java @@ -58,7 +58,7 @@ import java.util.Locale; /** * Migration for version {@code 1.4}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollenMigrationCallbackV1_4 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java index 16d94f3..eeba824 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java @@ -34,7 +34,7 @@ import java.util.List; /** * Migration for version {@code 1.4.5}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollenMigrationCallbackV1_4_5 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java index b39b07f..6bb6bb4 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java @@ -60,7 +60,7 @@ import java.util.Set; /** * Migration for version {@code 1.4.5.2}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5.2 */ public class PollenMigrationCallbackV1_5 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java index 975fd9e..fd28e9f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java @@ -35,7 +35,7 @@ import java.util.UUID; /** * Instances of this class will be given to service factory. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DefaultPollenServiceContext implements PollenServiceContext { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java index 92af1df..084a79e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java @@ -44,7 +44,7 @@ import java.util.TimerTask; * This service run as a daemon seek to send some notification from running poll * store in {@link PreventRule}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenNotifierWorker implements Runnable, Closeable { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java index 8162f56..67f4347 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java @@ -27,7 +27,7 @@ package org.chorem.pollen.services; * Contract to place on each EchBase service to push the {@code serviceContext} * inside the service. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see PollenServiceContext * @since 1.3 */ diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java index c3a6ad4..5be55e1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java @@ -38,7 +38,7 @@ import java.util.Locale; * Objects provided may be injected in services returned by * {@link PollenServiceFactory#newService(Class, PollenServiceContext)} * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public interface PollenServiceContext { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java index 24657ff..ced2e21 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java @@ -29,7 +29,7 @@ import java.lang.reflect.InvocationTargetException; /** * Factory of services. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenServiceFactory { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java index 7f77bde..756959b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java @@ -42,7 +42,7 @@ import java.util.List; /** * Usefull functions for the service (and higher) layers. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenServiceFunctions { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java index 7d74d07..91167f3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java @@ -41,7 +41,7 @@ import java.util.Locale; import static org.nuiton.i18n.I18n.l; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenServiceSupport implements PollenService { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java index 06e4963..416d321 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class FavoriteListAlreadyExistException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java index a820b21..eea63c9 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java @@ -32,7 +32,7 @@ import static org.nuiton.i18n.I18n.n; * Exception during favorite list import. There is * always a cause from librairies used for import. * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class FavoriteListImportException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java index 7ee8651..bdd55af 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class FavoriteListNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java index af3f0fc..e022c50 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class FavoriteListNotOwnedByUserException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java index 112fdfb..ca55ea8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * Created: 13/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * @since 1.3 */ public class InvalidEmailException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java index 8e6becb..cc2fb03 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ParticipantAlreadyFoundInListException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java index a8b929d..78ab327 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ParticipantExistWithoutMailException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java index 42479e2..6430101 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ParticipantNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java index 0337098..dc12e02 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ParticipantNotFoundInListException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java index d7b5707..ee02640 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollAccountNotFound extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java index 7c7d2ca..193c6bf 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollAlreadyClosedException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java index 7c8bbf4..4c45dd1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollAlreadyExistException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java index b9da2e8..96c3475 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * When a poll choice not found. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollChoiceNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java index 6f9f7c1..e0a2e01 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollCommentNotFound extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java index c002226..db99213 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java index ccc60e4..3f1632e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * When a pooll vote not found. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollVoteNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java index ac88aec..32e5ab2 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UnauthorizedPollAccessException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java index 4f89559..3fa1433 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserEmailAlreadyUsedException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java index 2f45959..39b4b61 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserInvalidPasswordException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java index 2538ae6..8d66b61 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserLoginAlreadyUsedException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java index db4e2d5..a879c81 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java index 42304f9..7308bd2 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class VoteDoubloonException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java index 9e6dc36..53c6d3d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class VoteNotAllowedException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java index ba20c57..4b0aa29 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * When a vote is not found. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class VoteNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java index 6a174d9..5b28e0b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java @@ -40,7 +40,7 @@ import java.util.List; /** * Manage comments on a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollCommentService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollExportService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollExportService.java index 80da6a9..715f83f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollExportService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollExportService.java @@ -30,7 +30,7 @@ import org.chorem.pollen.services.exceptions.PollNotFoundException; /** * Service to export poll as xml format (or later other formats). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.5 */ public class PollExportService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java index 4d3da98..fc5120d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java @@ -59,7 +59,7 @@ import static org.nuiton.i18n.I18n.l; /** * Service to manage feed of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollFeedService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java index 5d97c95..8a78280 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java @@ -33,7 +33,7 @@ import org.chorem.pollen.services.PollenServiceSupport; /** * Service to deal with url used by application. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollUrlService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java index 701e266..c89453b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java @@ -51,7 +51,7 @@ import java.util.List; /** * New Poll vote counting service. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollVoteCountingService extends PollenServiceSupport { @@ -165,7 +165,7 @@ public class PollVoteCountingService extends PollenServiceSupport { /** * Supprime le 0 final d'un nombre à virgule. Le résultat peut-être un - * double : 1,0 -> 1 et 1,2 -> 1,2. + * double : 1,0 -> 1 et 1,2 -> 1,2. * * @param val le nombre * @return le nombre sans 0 final diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java index 4f32ef0..68ab11b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java @@ -35,7 +35,7 @@ import java.util.Date; /** * Manage prevent rules of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PreventRuleService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java index db6763c..78e9b02 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java @@ -49,7 +49,7 @@ import static org.nuiton.i18n.I18n.n; /** * Service to manager security. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class SecurityService extends PollenServiceSupport { diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java index 4422de4..19e8894 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java @@ -33,7 +33,7 @@ import java.util.Map; * The H2 file is stored in a directory depending on the test class name, the * test method name, and a timestamp (allowing you to run tests multiple times * to see how database changed between each test run). - * <p/> + * * Any unit test of a service should subclass this class and use the * {@link #newService(Class)} to get a service ready to be used. * diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java index 4f5011c..a08d1a1 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java @@ -29,7 +29,7 @@ import org.junit.Test; /** * Test {@link EmailService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class EmailServiceTest extends AbstractPollenServiceTest { diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java index 486d8e3..1e831cf 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java @@ -38,7 +38,7 @@ import java.util.List; /** * Tests the {@link FavoriteService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ @Ignore diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java index f3d34a2..4d2acb0 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java @@ -31,7 +31,7 @@ import org.nuiton.topia.TopiaException; /** * Tests the {@link PollService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ @Ignore diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java index 8999685..587eff9 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java @@ -38,7 +38,7 @@ import static org.chorem.pollen.services.impl.EmailService.PollenEmail; /** * Tests the {@link UserService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserServiceTest extends AbstractPollenServiceTest { diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java index 5a65d74..ae10530 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java @@ -29,7 +29,7 @@ import org.junit.Test; /** * Tests the {@link VoteService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class VoteServiceTest extends AbstractPollenServiceTest { diff --git a/pollen-services/src/test/resources/log4j2.xml b/pollen-services/src/test/resources/log4j2.xml index d31e7d4..7b2a2fb 100644 --- a/pollen-services/src/test/resources/log4j2.xml +++ b/pollen-services/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: Services + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeDatePollIT.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeDatePollIT.java index a2a8f3d..0ee8fac 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeDatePollIT.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeDatePollIT.java @@ -32,7 +32,7 @@ import java.util.List; /** * Test the well work of a Free Date poll creation page. - * <p/> + * * Tested cases : * <ul> * <li>Classic creation with filled mandatory fields (a title and at least 2 choices(OK)</li> @@ -42,7 +42,7 @@ import java.util.List; * <li>Classic creation with invalid date format for one of the choices (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> + * @author ymartel <martel@codelutin.com> * @since 1.4 */ public class CreateFreeDatePollIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java index 1dd96b7..7c725c0 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java @@ -35,7 +35,7 @@ import java.util.List; /** * Test the well work of a Free text poll creation page. - * <p/> + * * Tested cases : * <ul> * <li>Classic creation with filled mandatory fields (OK)</li> @@ -51,7 +51,7 @@ import java.util.List; * <li>Classic creation with choice adding ending date after poll ending date (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> + * @author ymartel <martel@codelutin.com> * @since 1.4 */ public class CreateFreeTextPollIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateRestrictedTextPollIT.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateRestrictedTextPollIT.java index a387cc1..d4d7177 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateRestrictedTextPollIT.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateRestrictedTextPollIT.java @@ -32,7 +32,7 @@ import java.util.List; /** * Test the well work of a text poll creation page with a restricted list of participant. - * <p/> + * * Tested cases : * <ul> * <li>Creation without participant (KO)</li> @@ -42,7 +42,7 @@ import java.util.List; * <li>Creation with a participant with only an email (no name) (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> + * @author ymartel <martel@codelutin.com> * @since 1.4 */ public class CreateRestrictedTextPollIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateTextPollForGroupIT.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateTextPollForGroupIT.java index 0bf9742..40eecf1 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateTextPollForGroupIT.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateTextPollForGroupIT.java @@ -32,7 +32,7 @@ import java.util.List; /** * Test the well work of a text poll creation page with the use of groups. - * <p/> + * * Tested cases : * <ul> * <li>Creation with a nonamed group (KO)</li> @@ -45,7 +45,7 @@ import java.util.List; * <li>Creation with two participants with same email in different group (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> + * @author ymartel <martel@codelutin.com> * @since 1.4 */ public class CreateTextPollForGroupIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java index 4b93f5a..5e49843 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * Tests to execute in that it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java index 083ae87..0fc11fb 100644 --- a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java +++ b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java @@ -32,7 +32,7 @@ import org.openqa.selenium.WebElement; /** * Poll with comment possible. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollWithCommentIT extends AbstractPollIT { diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java index 3d47168..8ddf6de 100644 --- a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java +++ b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java @@ -31,7 +31,7 @@ import org.openqa.selenium.WebElement; /** * Poll with no comment possible. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollWithoutCommentIT extends AbstractPollIT { diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java index 21f0111..1d019e2 100644 --- a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java +++ b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * Tests to execute in that it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/AbstractIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/AbstractIT.java index e9665c6..c587645 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/AbstractIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/AbstractIT.java @@ -32,7 +32,7 @@ import java.util.Set; /** * Abstrac it for this it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public abstract class AbstractIT extends AbstractPollIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java index ef0779d..d5c1bdb 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java @@ -30,7 +30,7 @@ import org.junit.runners.Suite; /** * Tests to execute in that it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByAdminIT.java index 74b6e2c..c5a55fc 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous free poll created by an administrator. - * <p/> + * * For that poll nobody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByConnectedIT.java index 03ab80f..7bdb134 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous free poll created by a connected user. - * <p/> + * * For that poll nobody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByNotConnectedIT.java index a9076f5..23b9430 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByNotConnectedIT.java @@ -29,16 +29,16 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous free poll created by a not connected user. - * <p/> + * * For that poll nobody can see other people votes. - * <p/> + * * Wen have 4 votes: * - creator one * - not connected one * - connected one * - admin one * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByAdminIT.java index 26e792a..339fbb1 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only free poll created by an administrator. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByConnectedIT.java index 884ee31..bbf6d23 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only free poll created by an connected user. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByNotConnectedIT.java index bbf5999..326d9f4 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only free poll created by a not connected user. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByAdminIT.java index a3ae4f1..2d8c28a 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody free poll created by a administrator user. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByConnectedIT.java index 8dd66de..7da9e51 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody free poll created by a connected user. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByNotConnectedIT.java index 8e6f7cc..cd47e0e 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody free poll created by a not connected user. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java index 60e3b08..bd61ab5 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * All tests of this package. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByAdminIT.java index a383556..6ff7fe5 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only free poll created by a administrator user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByConnectedIT.java index c4614cd..efae853 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only free poll created by a connected user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByNotConnectedIT.java index d7d5851..6419e89 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only free poll created by a not connected user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java index 995a3a6..89e9f3a 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java @@ -24,6 +24,6 @@ package org.chorem.pollen.ui.it.freepoll; /** * To test on free poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ \ No newline at end of file diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java index 4816a89..9407e84 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous restricted poll created by a administrator. - * <p/> + * * For that poll nobody can see other people votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java index 506385d..bcfa962 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous restricted poll created by a connected user. - * <p/> + * * For that poll nobody can see other people votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java index b95c816..cc822e0 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous restricted poll created by a not connected user. - * <p/> + * * For that poll nobody can see other people votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java index 94ba6d4..e6ef231 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only restricted poll created by an administrator. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java index 84a54b0..f3699b5 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only restricted poll created by an connected user. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java index 085f16d..96308e6 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only restricted poll created by an not connected user. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java index 1dbd912..11770bb 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody restricted poll created by an administrator. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java index b09fa33..465da1b 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody restricted poll created by an connected user. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java index a613fc4..1686db2 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody restricted poll created by an not connected user. - * <p/> + * * For that poll evrybody, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java index d943076..7ccdccd 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * All tests of this package. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java index 993d885..70c507d 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only restricted poll created by an administrator. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java index e233ac4..52e234c 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a vote only restricted poll created by an connected user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java index 51bf57c..94bc1e4 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only restricted poll created by an not connected user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java index e24600b..61dce0f 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java @@ -24,6 +24,6 @@ package org.chorem.pollen.ui.it.restrictedpoll; /** * To test on restricted poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ \ No newline at end of file diff --git a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/LoginSIT.java b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/LoginSIT.java index 09df39a..02fe223 100644 --- a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/LoginSIT.java +++ b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/LoginSIT.java @@ -33,7 +33,7 @@ import java.util.List; /** * Test the login action. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class LoginSIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java index 715b86c..cce9f26 100644 --- a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java +++ b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * Tests to execute in that it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java index c8f236d..33c37aa 100644 --- a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java +++ b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java @@ -28,7 +28,7 @@ import org.openqa.selenium.WebDriver; /** * Test the security on some restricted pages : - * <p/> + * * <ul> * <li>Access to "connected pages" when connected (OK)</li> * <li>Access to "connected pages" when not connected (KO)</li> @@ -42,7 +42,7 @@ import org.openqa.selenium.WebDriver; * <li>Access to "poll moderation page" with a good tokenId (OK)</li> * <li>Access to "poll moderation page" with a bad tokenId (KO)</li> * </ul> - * <p/> + * * TODO ymartel 2012/06/12 * Should check those security access to : * <ul> @@ -50,8 +50,8 @@ import org.openqa.selenium.WebDriver; * <li>Access to "restricted poll page" with a bad accountId (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author ymartel <martel@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class SecurityAccessSIT extends AbstractPollIT { @@ -70,7 +70,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to participatedList page</li> * <li>Try to access to favoriteLists page</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test @@ -101,7 +101,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to participatedList page</li> * <li>Try to access to favoriteLists page</li> * </ol> - * <p/> + * * All the page should be redirected to connected_required page. */ @Test @@ -127,7 +127,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin polls list page</li> * <li>Try to access to admin users list page</li> * </ol> - * <p/> + * * All the page should be redirected to connected_required page. */ @Test @@ -147,7 +147,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin polls list page</li> * <li>Try to access to admin users list page</li> * </ol> - * <p/> + * * All the page should be redirected to admin_required page. */ @Test @@ -170,7 +170,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin polls list page</li> * <li>Try to access to admin users list page</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test @@ -197,7 +197,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to modification page for normal poll with good pollId & good tokenId</li> * <li>Try to access to modification page for normal poll with good pollId & bad tokenId (should be redirected)</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test @@ -236,7 +236,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin page for normal poll with good pollId & good tokenId</li> * <li>Try to access to admin page for normal poll with good pollId & bad tokenId (should be redirected)</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test @@ -281,7 +281,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin page for normal poll with good pollId & good tokenId</li> * <li>Try to access to admin page for normal poll with good pollId & bad tokenId (should be redirected)</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test diff --git a/pollen-ui-struts2/src/license/THIRD-PARTY.properties b/pollen-ui-struts2/src/license/THIRD-PARTY.properties index a75067b..8312a07 100644 --- a/pollen-ui-struts2/src/license/THIRD-PARTY.properties +++ b/pollen-ui-struts2/src/license/THIRD-PARTY.properties @@ -1,23 +1,28 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License +# - AL 2.0 +# - ASL, version 2 # - Apache License 2.0 +# - Apache License Version 2.0 +# - Apache License, version 2.0 # - Apache Software License - Version 2.0 # - BSD License -# - BSD-style license -# - Bouncy Castle License -# - CDDL +# - CDDL + GPLv2 with classpath exception +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - Version 1.0 +# - Eclipse Public License 1.0 +# - Eclipse Public License v1.0 +# - Eclipse Public License, Version 1.0 # - GNU Affero General Public License version 3 # - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence -# - GNU Lesser General Public License, version 2.1 +# - GNU Lesser General Public License, Version 2.1 # - GNU Library or Lesser General Public License -# - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL, version 2.1 # - Lesser General Public License (LGPL) v 3.0 @@ -25,24 +30,25 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 -# - Mozilla Public License # - Mozilla Public License version 2.0 # - New BSD License +# - Public Domain # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The PostgreSQL License +# - The SAX License +# - The W3C License # - The W3C Software License -# - license.txt -# - provided without support or warranty #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Apr 29 11:02:35 CEST 2013 +#Mon Nov 16 14:44:06 CET 2015 cglib--cglib-nodep--2.1_3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javassist--javassist--3.11.0.GA=Apache License, version 2.0 jdom--jdom--1.0=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 rome--rome--1.0=The Apache Software License, Version 2.0 diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java index fef2060..9a3aafc 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java @@ -65,13 +65,13 @@ import java.util.Map; /** * To listen start or end of the application. - * <p/> + * * On start we will load the configuration and check connection to internal * database, creates schema and create an admin user in none found in database. - * <p/> + * * On stop, just release the application configuration. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenApplicationListener implements ServletContextListener { @@ -185,7 +185,7 @@ public class PollenApplicationListener implements ServletContextListener { /** * Prepare the configuration to be used. - * <p/> + * * <strong>Note:</strong> This method is here mainly to be able to * override configuration for tests environnements. * diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java index 80f351f..a088482 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java @@ -40,7 +40,7 @@ import java.util.Set; /** * User session to put in servlet session. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenSession implements Serializable { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java index fc328f1..74abc8c 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java @@ -23,7 +23,6 @@ package org.chorem.pollen.ui; * #L% */ - import com.google.common.base.Charsets; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; @@ -37,14 +36,13 @@ 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@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.5.1 */ public class PollenStaticContentLoader extends DefaultStaticContentLoader { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java index da38da2..55f82a5 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java @@ -25,6 +25,7 @@ package org.chorem.pollen.ui; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenApplicationContext; +import org.chorem.pollen.TopiaTransactionFilter; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; @@ -37,7 +38,7 @@ import javax.servlet.ServletRequest; /** * Pollen implementation of the {@link TopiaTransactionFilter}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenTopiaTransactionFilter extends TopiaTransactionFilter { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java index a5736ba..c58084f 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.l_; /** * Useful ui methods. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenUIUtils { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java index 2ddc62d..812c065 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java @@ -28,14 +28,14 @@ import java.io.File; /** * Contract to place on actions which needs some upload. - * <p/> + * * This is linked with the {@link PollenFileUploadInterceptor} interceptor * which logic is not the same than the bacis struts2 upload interceptor. - * <p/> + * * Created: 30/03/12 * - * @author fdesbois <desbois@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author fdesbois <desbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public interface FileUploadAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java index c7c9faa..6e82887 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions; /** * Created: 13/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * @since 1.3 */ public enum PageSkin { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriAware.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriAware.java index 3414521..489fd20 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriAware.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriAware.java @@ -27,7 +27,7 @@ import org.chorem.pollen.bean.PollUri; /** * For any action that contains a {@link PollUri} context. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java index ad32068..ea89800 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java @@ -36,6 +36,7 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenUserSecurityContext; +import org.chorem.pollen.TopiaTransactionFilter; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.Polls; @@ -56,7 +57,6 @@ import org.chorem.pollen.services.impl.SecurityService; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.services.impl.VoteService; import org.chorem.pollen.ui.PollenSession; -import org.chorem.pollen.ui.TopiaTransactionFilter; import org.chorem.pollen.ui.interceptors.PollenSecurityInterceptor; import org.chorem.pollen.ui.security.AbstractPollenAuthorization; import org.chorem.pollen.votecounting.VoteCounting; @@ -72,13 +72,13 @@ import com.opensymphony.xwork2.inject.Inject; /** * Pollen action support. - * <p/> + * * <b>Note :</b> All actions must implement this class to have a better i18n * support, when a i18n key is not translated it has a empty translation and * we do NOT want this behaviour in gui, prefer to return the marked * untranslated key. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenActionSupport extends BaseAction implements ServletRequestAware { @@ -100,7 +100,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Provides a way to get a service. - * <p/> + * * Actions may <strong>not</strong> call it directly by use * {@link #getService(Class)} instead. */ @@ -123,7 +123,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * All the parameters send by request used to build back choices of the * poll. - * <p/> + * * This will be setted by the {@link ParameterAware#setParameters(Map)} as soon * as your action implements {@link ParameterAware}. * @@ -133,12 +133,12 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * The user security context for this request. - * <p/> + * * This security contains the {@code poll}, {@code userAccount} and {@code userRoles}. - * <p/> + * * It will be injected by the {@link PollenSecurityInterceptor} for all * action which implements {@link PollenUserSecurityAware}. - * <p/> + * * <strong>Import Note:</strong> Security context is load by shiro filter * via method {@link AbstractPollenAuthorization#createSecurityContext(ServletRequest)}. * @@ -214,7 +214,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Keep in this action the incoming request parameters. - * <p/> + * * <strong>Note:</strong> This method will be invoked only if your action * implements the {@link ParameterAware} contract. * @@ -229,7 +229,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Keep in this action the incoming security context. - * <p/> + * * <strong>Note:</strong> This method will be invoked only if your action * implements the {@link PollenUserSecurityAware} contract. * @@ -244,7 +244,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Gets the {@link PollUri} from the incoming request. - * <p/> + * * If the action is {@link PollenUserSecurityAware}, then will take it * from {@link PollenUserSecurityContext#getPollUri()}, otherwise will * return {@code null} (this means you must override this method in your action. @@ -418,7 +418,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Tests if the incoming http request is a get method. - * <p/> + * * <strong>Note:</strong> {@link #request} must not be null. * * @return {@code true} if incoming request uses {@code GET} method. @@ -431,7 +431,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Obtain the injected security context. - * <p/> + * * <strong>Note:</strong> {@link #securityContext} must not be null * (concrete action should implements {@link PollenUserSecurityAware}). * @@ -447,7 +447,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Obtain the injected request parameters. - * <p/> + * * <strong>Note:</strong> {@link #parameters} must not be null * (concrete action should implements {@link ParameterAware}). * diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java index 3d3f191..819de24 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions; /** * Base action support with predefined edition skin. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see PageSkin#EDITION * @since 1.4.5 */ diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java index 5db41ff..f469513 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions; /** * Base action support with predefined vote skin. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see PageSkin#VOTE * @since 1.4.5 */ diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenUserSecurityAware.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenUserSecurityAware.java index a73a111..ceb2b24 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenUserSecurityAware.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenUserSecurityAware.java @@ -27,7 +27,7 @@ import org.chorem.pollen.PollenUserSecurityContext; /** * Contract of action which use {@link PollenUserSecurityContext}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface PollenUserSecurityAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java index b9855e6..56110c5 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Action for confirmation * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Confirm extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java index f67cdf8..27e5cad 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Delete a selected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteUser extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java index 9aeec0d..c7e2da9 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions.admin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ManagePolls extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java index 25e4f21..325209b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java @@ -32,7 +32,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; import org.nuiton.util.StringUtil; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ManageUsers extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/package-info.java index 62928a7..84f8667 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/package-info.java @@ -3,7 +3,7 @@ * * All actions coming from the admin menu should be placed here. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.admin; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java index 55726f3..e846378 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java @@ -44,7 +44,7 @@ import java.util.List; /** * Action to generate a chart given the values (and optional subtitles). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GenerateChart extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java index 23d3e77..8e75fa0 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java @@ -36,7 +36,7 @@ import java.net.URLDecoder; /** * Obtain the image choice of a given choice of an image-like poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetPollImageChoice extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/package-info.java index 5def77f..30a010d 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all io actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.io; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java index df02e22..a47130f 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java @@ -33,7 +33,7 @@ import java.util.Map; /** * Abstract JSON action with pagination support. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public abstract class AbstractJSONPaginedAction extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java index beef7d0..97a3273 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Abstract JSON action for a simple result (one row). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.5 */ public abstract class AbstractJSONSimpleAction extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java index 5a0c87c..d07b9cb 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java @@ -37,7 +37,7 @@ import java.util.Set; /** * Obtain created polls to put in grid for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetCreatedPolls extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java index 49c38d4..c614085 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Get given favorite list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetFavoriteList extends AbstractJSONSimpleAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java index 40d1dea..86a31b4 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Get pagined list of poll accounts of a given favorite list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetFavoriteListPollAccount extends AbstractJSONSimpleAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java index a472193..fa06357 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Get pagined list of poll accounts of a given favorite list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetFavoriteListPollAccounts extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java index cb7bf19..b3a748b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Get pagined list of favorite lists of the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetFavoriteLists extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java index 41d967a..4cf895d 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java @@ -40,7 +40,7 @@ import java.util.Set; /** * Obtain invited polls to put in grid for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetInvitedPolls extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java index a439b59..ce39157 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java @@ -40,7 +40,7 @@ import java.util.Set; /** * Obtain participated polls to put in grid for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetParticipatedPolls extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java index b24c4f1..4f32309 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Obtain paginated users. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetPolls extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java index cbc5090..43916c4 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Get user datas. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetUser extends AbstractJSONSimpleAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java index 2a6955f..d601a3b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java @@ -34,7 +34,7 @@ import java.util.Set; /** * Obtain paginated users. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetUsers extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/package-info.java index c839233..4fde757 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all json actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.json; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/package-info.java index aea2a41..d6d4de9 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for all actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java index 48a7bee..251eec7 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java @@ -32,7 +32,7 @@ import java.io.InputStream; /** * Obtain the feed of a given poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetPollFeed extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java index 2164739..61afc03 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java @@ -59,7 +59,7 @@ import java.util.Set; /** * Display results of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ResultForPoll extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ClosePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ClosePoll.java index cb08e64..55490e6 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ClosePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ClosePoll.java @@ -33,7 +33,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * Closes an existing poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ClosePoll extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ConfirmPollAction.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ConfirmPollAction.java index ead5bcd..e8c0515 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ConfirmPollAction.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ConfirmPollAction.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To confirm a poll action (such as delete or close). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ConfirmPollAction extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/DeletePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/DeletePoll.java index 67f4083..ddd8bb1 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/DeletePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/DeletePoll.java @@ -33,7 +33,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * Deletes an existing poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeletePoll extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java index ac7eeab..a8ba0aa 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java @@ -31,7 +31,7 @@ import java.io.InputStream; /** * Exports an existing poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ExportPoll extends PollenActionSupport implements PollenUserSecurityAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java index 09feb26..a8e2d90 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * Action to display summary of a poll for his creator (or an admin). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class SummaryPoll extends PollenActionSupport implements PollenUserSecurityAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/package-info.java index 2974b5b..1a4351a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all poll admin actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.poll.admin; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java index 0511edb..43fb47e 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java @@ -32,7 +32,7 @@ import java.util.Map; /** * To generate the display for a text choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public abstract class AbstractDisplayChoice extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java index 2902900..453ec71 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java @@ -86,7 +86,7 @@ import java.util.regex.Pattern; /** * Created: 04/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * $Id$ */ public abstract class AbstractPollForm extends PollenActionSupportForEdition implements Preparable, ParameterAware, FileUploadAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java index 0ddd820..4a770bf 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java @@ -29,7 +29,7 @@ import java.util.Date; /** * Clones a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class ClonePoll extends AbstractPollForm { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java index 1ed1993..c1040b2 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java @@ -29,7 +29,7 @@ import java.util.Date; /** * Creates a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class CreatePoll extends AbstractPollForm { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayDateChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayDateChoice.java index adbec7f..9506e0a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayDateChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayDateChoice.java @@ -27,7 +27,7 @@ import org.chorem.pollen.bean.PollDateChoice; /** * To generate the display for a date choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayDateChoice extends AbstractDisplayChoice { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayImageChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayImageChoice.java index abafaad..24eef21 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayImageChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayImageChoice.java @@ -28,7 +28,7 @@ import org.chorem.pollen.business.persistence.Choice; /** * To generate the display for a image choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayImageChoice extends AbstractDisplayChoice { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayPersonToList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayPersonToList.java index 55b7f52..6bcb888 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayPersonToList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayPersonToList.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * To display a personToList (use at a poll creation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayPersonToList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayTextChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayTextChoice.java index 10592fe..239e632 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayTextChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayTextChoice.java @@ -28,7 +28,7 @@ import org.chorem.pollen.business.persistence.ChoiceImpl; /** * To generate the display for a text choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayTextChoice extends AbstractDisplayChoice { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayVotingList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayVotingList.java index 9bbd359..fea8272 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayVotingList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayVotingList.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * To display a voting list of a poll (use at a poll creation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayVotingList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java index 476db85..4c1769b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java @@ -31,7 +31,7 @@ import java.util.Date; * Edit a poll (load it via {@link #input()}), and save it * via {@link #execute()}). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class EditPoll extends AbstractPollForm { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ImportPersonListToVotingList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ImportPersonListToVotingList.java index aaa67e1..f12feeb 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ImportPersonListToVotingList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ImportPersonListToVotingList.java @@ -34,7 +34,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Load in session a personToList to import into a votingList. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ImportPersonListToVotingList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/SelectPersonListToVotingList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/SelectPersonListToVotingList.java index 5dcdbfa..ce99bb1 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/SelectPersonListToVotingList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/SelectPersonListToVotingList.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Select a person list to add into an existing voting list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class SelectPersonListToVotingList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/package-info.java index c2db1bb..6c08081 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all poll form actions (create, clone and edit poll). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.poll.form; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/package-info.java index 5109c18..33e1567 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all poll actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.poll; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java index 817601d..7fc7fdc 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java @@ -59,8 +59,8 @@ import java.util.List; /** * Abstract action for actions on the vote poll page. * - * @author tchemit <chemit@codelutin.com> - * @author fdesbois <fdesbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @since 1.3 */ public abstract class AbstractVoteAction extends PollenActionSupport implements ParameterAware, PollUriAware, PollenUserSecurityAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddChoice.java index a2b13fd..553b8eb 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddChoice.java @@ -39,7 +39,7 @@ import java.io.File; /** * To add a poll comment. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class AddChoice extends AbstractVoteAction implements Preparable, FileUploadAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java index ada825d..1389714 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java @@ -30,7 +30,7 @@ import org.chorem.pollen.business.persistence.Comment; /** * To add a poll comment. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class AddComment extends AbstractVoteAction implements Preparable { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteChoice.java index 807772e..3e73628 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteChoice.java @@ -32,7 +32,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To confirm delete of a poll choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ConfirmDeleteChoice extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteComment.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteComment.java index 85c4392..72ab77a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteComment.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteComment.java @@ -32,7 +32,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To confirm a comment delete. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ConfirmDeleteComment extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteVote.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteVote.java index ab20492..0348285 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteVote.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteVote.java @@ -32,7 +32,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To confirm delete of a poll vote * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ConfirmDeleteVote extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteChoice.java index 2b69f0b..acb6520 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteChoice.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To delete a poll choice * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteChoice extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteComment.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteComment.java index 4d6de48..a917a2a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteComment.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteComment.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To delete a poll comment. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteComment extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java index bd3af5e..54cd927 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To delete a poll vote. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteVote extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ModeratePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ModeratePoll.java index d4d7507..5b2e734 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ModeratePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ModeratePoll.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions.poll.vote; /** * To moderate votes and comment of a given poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class ModeratePoll extends AbstractVoteAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java index 866358e..ddc2914 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java @@ -40,8 +40,8 @@ import static org.nuiton.i18n.I18n.n; /** * Votes to a poll. * - * @author tchemit <chemit@codelutin.com> - * @author fdesbois <fdesbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @since 1.3 */ public class VoteForPoll extends AbstractVoteAction implements Preparable { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/package-info.java index a1c181e..27e17f1 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/package-info.java @@ -2,7 +2,7 @@ * Base Package for the all poll vote actions (means all actions specific to * the vote page). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.poll.vote; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java index 0bf78f2..50b24fc 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java @@ -34,7 +34,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * To attach a anonymous poll to a connected user account. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class AttachPoll extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java index 8bd671f..0ef8e4a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java @@ -27,7 +27,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * To change lang and redirect to current page. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class ChangeLang extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java index 6a937f3..5e5f3fc 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Action for confirmation * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Confirm extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteList.java index 703750c..cd0da90 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteList.java @@ -40,7 +40,7 @@ import java.util.List; /** * To create a new favorite list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreateFavoriteList extends PollenActionSupportForEdition implements FileUploadAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteListVoter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteListVoter.java index edc5285..2de00fe 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteListVoter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteListVoter.java @@ -37,7 +37,7 @@ import org.nuiton.util.StringUtil; /** * Creates a new {@link PollAccount} inside a selected {@link PersonList}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreateFavoriteListVoter extends PollenActionSupportForEdition implements Preparable, ParameterAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java index e1acef2..1c97e2b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Delete a selected favorite list for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteFavoriteList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteListVoter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteListVoter.java index d6a6a5f..5ed4e7a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteListVoter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteListVoter.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Delete a selected favorite list for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteFavoriteListVoter extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java index 3fa31f1..1a6fab9 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java @@ -33,7 +33,7 @@ import org.nuiton.util.StringUtil; /** * Update a user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Edit extends PollenActionSupportForEdition { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteList.java index 5934262..f12a8ef 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteList.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupportForEdition; /** * Edit a given {@link PersonList}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EditFavoriteList extends PollenActionSupportForEdition { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteListVoter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteListVoter.java index e7c3e37..2f673d5 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteListVoter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteListVoter.java @@ -37,7 +37,7 @@ import org.nuiton.util.StringUtil; /** * Edits a {@link PollAccount} inside a selected {@link PersonList}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EditFavoriteListVoter extends PollenActionSupportForEdition implements Preparable, ParameterAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java index fd960a0..1a039e0 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Login user to pollen. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Login extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java index 947bb1f..e7f0674 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java @@ -27,7 +27,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Logout from pollen. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Logout extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java index a9dc2f9..58269a7 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java @@ -30,7 +30,7 @@ import org.nuiton.util.StringUtil; /** * Created: 13/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * @since 1.3 */ public class LostPassword extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java index 8256f1e..381cf3f 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java @@ -33,7 +33,7 @@ import org.nuiton.util.StringUtil; /** * Register a new user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Register extends PollenActionSupportForEdition { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/package-info.java index ad10bac..814daaa 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all user actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.user; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java index 8be4681..ae5e15a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Created: 26/03/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class BooleanIntegerConverter extends StrutsTypeConverter { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java index 4958284..3e4b030 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java @@ -39,7 +39,7 @@ import static org.nuiton.i18n.I18n.l_; /** * Created: 18/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * @since 1.3 */ public class DateConverter extends StrutsTypeConverter { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java index 0f1bac7..01ff677 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Created: 27/03/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class PollUriConverter extends StrutsTypeConverter { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/package-info.java index 1219fd5..adffa5a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the converters used in ui module. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see StrutsTypeConverter */ package org.chorem.pollen.ui.converters; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java index ba8f8d4..6e5270e 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java @@ -42,14 +42,14 @@ import java.util.regex.Pattern; /** * Overrides the default file upload interceptor to be able to match uploaded * files in specific fields. - * <p/> + * * We want to put upload files in a list (field is file for example) and then * fileName in another list but the default interceptor does not accept this * since it suffix the filename field with FileName... - * <p/> + * * TODO tchemit 2012-03-05 submit a patch to struts guys to avoid this fork. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenFileUploadInterceptor extends FileUploadInterceptor { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenSecurityInterceptor.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenSecurityInterceptor.java index 2c95b40..1b5d680 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenSecurityInterceptor.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenSecurityInterceptor.java @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest; * Interceptor to inject the {@link PollenUserSecurityContext} for * {@link PollenUserSecurityAware}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see PollenUserSecurityAware * @see PollenUserSecurityContext * @since 1.4.5 diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/package-info.java index 85c9022..aecacb0 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the interceptors used in ui module. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see Interceptor */ package org.chorem.pollen.ui.interceptors; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/package-info.java index 9c874ed..f94c71e 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the ui module. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java index 4bfa50f..d03fea8 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the results used in ui module. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see StrutsResultSupport */ package org.chorem.pollen.ui.results; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java index 736d98d..35d0a2e 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java @@ -43,6 +43,7 @@ import org.apache.shiro.web.filter.authz.AuthorizationFilter; import org.apache.shiro.web.util.WebUtils; import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.PollenUserSecurityContext; +import org.chorem.pollen.TopiaTransactionFilter; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.UserAccount; @@ -53,7 +54,6 @@ import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.services.impl.SecurityService; import org.chorem.pollen.ui.PollenSession; import org.chorem.pollen.ui.PollenUIUtils; -import org.chorem.pollen.ui.TopiaTransactionFilter; import org.nuiton.topia.TopiaContext; import com.google.common.base.Preconditions; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java index 3890250..cf94184 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n_; /** * Check that a user can show results of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollCreatorAccessRequired extends AbstractPollenAuthorization { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java index 1df874d..6e0aec4 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.n_; /** * Check that a user can show results of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollResultAccessRequired extends AbstractPollenAuthorization { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java index c2ed4f3..b2fd002 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.n_; /** * Check that a user can vote. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollVoteAccessRequired extends AbstractPollenAuthorization { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/package-info.java index 057573f..6d7f67b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/package-info.java @@ -3,7 +3,7 @@ * * Security is done using shiro {@link AccessControlFilter}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see AccessControlFilter */ package org.chorem.pollen.ui.security; diff --git a/pollen-ui-struts2/src/main/resources/log4j2.xml b/pollen-ui-struts2/src/main/resources/log4j2.xml index 5240491..e4f898f 100644 --- a/pollen-ui-struts2/src/main/resources/log4j2.xml +++ b/pollen-ui-struts2/src/main/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: UI (struts2) + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Properties> <Property name="pollen.log.dir">/tmp</Property> diff --git a/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties b/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties index db3f7aa..6518208 100644 --- a/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties +++ b/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties @@ -1 +1,21 @@ +### +# #%L +# Pollen :: UI (struts2) +# %% +# Copyright (C) 2009 - 2015 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% +### parent = css_xhtml \ No newline at end of file diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java index 0662611..aa1d46e 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link BooleanIntegerConverter}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class BooleanIntegerConverterTest { diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java index c637c7a..7cd695f 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java @@ -29,7 +29,7 @@ import org.openqa.selenium.WebDriver; /** * Base class test for a it on a specific poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AbstractPollIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java index 4cd5d75..3aac3ef 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java @@ -45,7 +45,7 @@ import java.util.List; /** * Base it test. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(value = Parameterized.class) @@ -182,7 +182,7 @@ public abstract class AbstractPollenIT { /** * Set a value for a WebElement. - * <p/> + * * This operations does 3 steps : * <ul> * <li>Get the WebElement thanks to its id (given in parameter)</li> @@ -198,7 +198,7 @@ public abstract class AbstractPollenIT { /** * Set a value for a WebElement. - * <p/> + * * This operations does 3 steps : * <ul> * <li>Get the WebElement thanks to its name (given in parameter)</li> @@ -215,7 +215,7 @@ public abstract class AbstractPollenIT { /** * Set a value for a WebElement. - * <p/> + * * This operations does 3 steps : * <ul> * <li>Get the WebElement thanks to a {@link By} locator</li> diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java index 8b8a074..2135b96 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java @@ -29,7 +29,7 @@ import org.junit.Test; /** * A dummy test to close any used drivers while its. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CleanDrivers { diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/PollenUrlFixtures.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/PollenUrlFixtures.java index 660d027..63a04be 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/PollenUrlFixtures.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/PollenUrlFixtures.java @@ -31,7 +31,7 @@ import org.chorem.pollen.bean.PollUri; /** * All urls useables by a test. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollenUrlFixtures { @@ -42,7 +42,7 @@ public class PollenUrlFixtures { /** * Define all urls useables in tests (and in application). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ private static enum POLLEN_URL { @@ -109,12 +109,12 @@ public class PollenUrlFixtures { /** * The base url of the application. - * <p/> + * * This url contains also the web context. This url is obtain from * the configuration. - * <p/> + * * Example: - * <p/> + * * <pre>http://localhost:8765/pollen</pre> * * @see PollenConfiguration#getApplicationUrl() diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java index ef8affa..db64466 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java @@ -40,7 +40,7 @@ import java.util.Map; /** * Web driver resource. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class WebDriverResources extends TestWatcher { diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingFactoryTest.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingFactoryTest.java index e62f266..30ff97c 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingFactoryTest.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingFactoryTest.java @@ -38,7 +38,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-ui-struts2/src/test/resources/log4j2.xml b/pollen-ui-struts2/src/test/resources/log4j2.xml index cc4556f..3f6e9de 100644 --- a/pollen-ui-struts2/src/test/resources/log4j2.xml +++ b/pollen-ui-struts2/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: UI (struts2) + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java index 4ced60d..dc54006 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java @@ -30,7 +30,7 @@ import static org.nuiton.i18n.I18n.l; /** * Base abstract implementation of a {@link VoteCounting}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public abstract class AbstractVoteCounting<S extends VoteCountingStrategy> implements VoteCounting<S> { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java index 81906ad..9e22d69 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java @@ -47,7 +47,7 @@ import java.util.Set; /** * Base abstract implementation of a {@link VoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public abstract class AbstractVoteCountingStrategy implements VoteCountingStrategy { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java index 97b2423..6ee7e7b 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java @@ -30,7 +30,7 @@ import java.util.Locale; /** * Contract of a vote counting. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public interface VoteCounting<S extends VoteCountingStrategy> { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java index a361341..0b5ffcc 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java @@ -35,7 +35,7 @@ import java.util.ServiceLoader; /** * Factory of {@link VoteCounting}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class VoteCountingFactory implements Iterable<VoteCounting> { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingNotFound.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingNotFound.java index 5ac7607..f713119 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingNotFound.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingNotFound.java @@ -25,7 +25,7 @@ package org.chorem.pollen.votecounting; /** * Exception when a vote counting could not be found. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingNotFound extends RuntimeException { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java index 306b372..6a4598c 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java @@ -32,7 +32,7 @@ import java.util.Set; /** * Strategy of a vote counting. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface VoteCountingStrategy { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java index 2879cd1..12bf155 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java @@ -28,7 +28,7 @@ import com.google.common.base.Function; * To mark any object that identify a choice via the {@link #getChoiceId()} * method. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface ChoiceIdAble { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java index ed9b5c9..dca615a 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java @@ -29,11 +29,11 @@ import java.math.BigDecimal; /** * Score for a given choice. - * <p/> + * * Rank is given by the field {@link #scoreOrder} and this class is * comparable of this data. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class ChoiceScore implements ChoiceIdAble, Comparable<ChoiceScore>, Serializable { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java index a6f2e2e..d635e97 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java @@ -25,14 +25,14 @@ package org.chorem.pollen.votecounting.model; /** * To define how to render a vote. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public enum ChoiceToVoteRenderType { /** * To render as a check box. - * <p/> + * * If check box is checked, then result should be value 1, otherwise * result will be null. */ diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java index c6d8225..cdc5acd 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java @@ -31,7 +31,7 @@ import java.util.Set; /** * Group of voters. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class GroupOfVoter implements Voter, Iterable<Voter> { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoterBuilder.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoterBuilder.java index 17dfe9c..db6d430 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoterBuilder.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoterBuilder.java @@ -31,7 +31,7 @@ import java.util.Set; /** * {@link GroupOfVoter} builder. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.6 */ public class GroupOfVoterBuilder implements VoterBuilder { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java index a0e2071..9addecb 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java @@ -33,7 +33,7 @@ import java.util.Set; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class GroupVoteCountingResult implements Serializable { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java index e01416e..8beb327 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java @@ -29,7 +29,7 @@ import java.util.Set; /** * Physical voter. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class SimpleVoter implements Voter { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoterBuilder.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoterBuilder.java index 7d58741..8ade619 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoterBuilder.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoterBuilder.java @@ -31,7 +31,7 @@ import java.util.Set; /** * {@link SimpleVoter} builder. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.6 */ public class SimpleVoterBuilder implements VoterBuilder { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java index 8104028..1bb9394 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java @@ -32,7 +32,7 @@ import java.util.List; /** * Contains results for a vote. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingResult implements Serializable { @@ -41,7 +41,7 @@ public class VoteCountingResult implements Serializable { /** * Results for each choice. - * <p/> + * * <strong>Note:</strong> Natural order is used to describe choice scores * (first is winner,...). */ diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java index 7db1d7d..fcdbf0d 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java @@ -27,7 +27,7 @@ import java.io.Serializable; /** * A vote for a choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteForChoice implements ChoiceIdAble, Serializable { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java index e616f52..5617075 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java @@ -28,7 +28,7 @@ import java.util.Set; /** * A voter (can be a physical voter or a group of voters). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface Voter extends Serializable { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java index 76432e6..c29794f 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java @@ -27,7 +27,7 @@ import java.util.Set; /** * To build some {@link Voter}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface VoterBuilder { diff --git a/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index b3870df..7b20d25 100644 --- a/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-api/src/test/resources/log4j2.xml b/pollen-votecounting-api/src/test/resources/log4j2.xml index cc4556f..c432c30 100644 --- a/pollen-votecounting-api/src/test/resources/log4j2.xml +++ b/pollen-votecounting-api/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting (Api) + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java index 1838e2e..fa8cf39 100644 --- a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java +++ b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Borda vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class BordaVoteCounting extends AbstractVoteCounting<BordaVoteCountingStrategy> { diff --git a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java index 776b5b6..3af164d 100644 --- a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java +++ b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java @@ -35,7 +35,7 @@ import java.util.Set; /** * Condorcet. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class BordaVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java index 6a0de2c..e319904 100644 --- a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java +++ b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Tests the {@link BordaVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class BordaVoteCountingStrategyTest { diff --git a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 1c4949a..3817eb3 100644 --- a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-borda/src/test/resources/log4j2.xml b/pollen-votecounting-borda/src/test/resources/log4j2.xml index cc4556f..37ee670 100644 --- a/pollen-votecounting-borda/src/test/resources/log4j2.xml +++ b/pollen-votecounting-borda/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Borda + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java index e2ad38b..88832ba 100644 --- a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java +++ b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class CondorcetVoteCounting extends AbstractVoteCounting<CondorcetVoteCountingStrategy> { diff --git a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java index b6ba31c..6aa8e50 100644 --- a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java +++ b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java @@ -35,7 +35,7 @@ import java.util.Set; /** * Condorcet. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CondorcetVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java index a538fe4..3a0974d 100644 --- a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java +++ b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Tests the {@link CondorcetVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CondorcetVoteCountingStrategyTest { diff --git a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 6bd8049..e167560 100644 --- a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-condorcet/src/test/resources/log4j2.xml b/pollen-votecounting-condorcet/src/test/resources/log4j2.xml index cc4556f..35eb876 100644 --- a/pollen-votecounting-condorcet/src/test/resources/log4j2.xml +++ b/pollen-votecounting-condorcet/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Condorcet + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java index e8f78d2..bf931e7 100644 --- a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java +++ b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class CoombsVoteCounting extends AbstractVoteCounting<CoombsVoteCountingStrategy> { diff --git a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java index 241329d..d39bbae 100644 --- a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java +++ b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java @@ -40,7 +40,7 @@ import java.util.Set; /** * Coombs vote counting strategy. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CoombsVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java index 8a8a2cf..9fcf74d 100644 --- a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java +++ b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java @@ -43,7 +43,7 @@ import java.util.Set; /** * Tests the {@link CoombsVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @Ignore diff --git a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 4079031..a0aa055 100644 --- a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-coombs/src/test/resources/log4j2.xml b/pollen-votecounting-coombs/src/test/resources/log4j2.xml index cc4556f..4c8dc89 100644 --- a/pollen-votecounting-coombs/src/test/resources/log4j2.xml +++ b/pollen-votecounting-coombs/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Coombs + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java index a18dc21..eef62bb 100644 --- a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java +++ b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class InstantRunoffVoteCounting extends AbstractVoteCounting<InstantRunoffVoteCountingStrategy> { diff --git a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java index d57d4f5..e1b4c84 100644 --- a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java +++ b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java @@ -39,7 +39,7 @@ import java.util.Set; /** * InstantRunoff. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class InstantRunoffVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java index 49c1271..7d7f126 100644 --- a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java +++ b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java @@ -43,7 +43,7 @@ import java.util.Set; /** * Tests the {@link InstantRunoffVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @Ignore diff --git a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index c5ab990..f17735e 100644 --- a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml b/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml index cc4556f..6c99cb0 100644 --- a/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml +++ b/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Instant Runoff + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java index 9ace647..36a028a 100644 --- a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java +++ b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java @@ -32,7 +32,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class NormalVoteCounting extends AbstractVoteCounting<NormalVoteCountingStrategy> { diff --git a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java index 0c28617..0304f14 100644 --- a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java +++ b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java @@ -32,10 +32,10 @@ import java.util.Set; /** * Vote counting strategy for {@link NormalVoteCounting}. - * <p/> + * * This is a very basic vote counting: * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class NormalVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java index 5e806bb..78768a4 100644 --- a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java +++ b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java @@ -46,7 +46,7 @@ import java.util.Set; /** * Tests the {@link NormalVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class NormalVoteCountingStrategyTest { diff --git a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index f653294..e5cde68 100644 --- a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-normal/src/test/resources/log4j2.xml b/pollen-votecounting-normal/src/test/resources/log4j2.xml index cc4556f..0c1cdbb 100644 --- a/pollen-votecounting-normal/src/test/resources/log4j2.xml +++ b/pollen-votecounting-normal/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Normal + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java index 5b055e0..d7d1ad9 100644 --- a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java +++ b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java @@ -32,7 +32,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class NumberVoteCounting extends AbstractVoteCounting<NumberVoteCountingStrategy> { diff --git a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java index b85c860..8c3472b 100644 --- a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java +++ b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java @@ -33,7 +33,7 @@ import java.util.Set; /** * Number strategy. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class NumberVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java index 76a44e1..4b7f426 100644 --- a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java +++ b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Tests the {@link NumberVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class NumberVoteCountingStrategyTest { diff --git a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index d99194a..60358d2 100644 --- a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-number/src/test/resources/log4j2.xml b/pollen-votecounting-number/src/test/resources/log4j2.xml index cc4556f..7f6fbd6 100644 --- a/pollen-votecounting-number/src/test/resources/log4j2.xml +++ b/pollen-votecounting-number/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Number + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java index 97bb695..98b8180 100644 --- a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java +++ b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class PercentageVoteCounting extends AbstractVoteCounting<PercentageVoteCountingStrategy> { diff --git a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java index bdbe513..a589780 100644 --- a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java +++ b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java @@ -33,7 +33,7 @@ import java.util.Set; /** * Percentage strategy. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PercentageVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java b/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java index 8c72574..88f14ab 100644 --- a/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java +++ b/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Tests the {@link PercentageVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PercentageVoteCountingStrategyTest { diff --git a/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 6743903..fa5a8bc 100644 --- a/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-percentage/src/test/resources/log4j2.xml b/pollen-votecounting-percentage/src/test/resources/log4j2.xml index cc4556f..66c50b1 100644 --- a/pollen-votecounting-percentage/src/test/resources/log4j2.xml +++ b/pollen-votecounting-percentage/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Percentage + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 7df1dd333b4494771bc43e4f15516771ff03652d Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:22:40 2015 +0100 Fix deprecated method --- .../src/main/java/org/chorem/pollen/ui/PollenUIUtils.java | 10 +++++----- .../java/org/chorem/pollen/ui/converters/DateConverter.java | 8 ++++---- .../pollen/ui/security/AbstractPollenAuthorization.java | 12 ++++++------ .../chorem/pollen/ui/security/PollCreatorAccessRequired.java | 8 ++++---- .../chorem/pollen/ui/security/PollResultAccessRequired.java | 6 +++--- .../chorem/pollen/ui/security/PollVoteAccessRequired.java | 6 +++--- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java index c58084f..88cea41 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2015 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 @@ -29,7 +29,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletRequest; import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Useful ui methods. @@ -68,11 +68,11 @@ public class PollenUIUtils { int i = poll.sizeVote(); String result; if (i == 0) { - result = l_(locale, "pollen.common.voteNoVote"); + result = l(locale, "pollen.common.voteNoVote"); } else if (i == 1) { - result = l_(locale, "pollen.common.voteOneVote"); + result = l(locale, "pollen.common.voteOneVote"); } else { - result = l_(locale, "pollen.common.voteNbVotes", i); + result = l(locale, "pollen.common.voteNbVotes", i); } return result; } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java index 3e4b030..9377452 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2015 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 @@ -34,7 +34,7 @@ import java.util.Date; import java.util.Locale; import java.util.Map; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Created: 18/04/12 @@ -88,13 +88,13 @@ public class DateConverter extends StrutsTypeConverter { private static String getDateTimePattern() { Locale locale = ActionContext.getContext().getLocale(); - String result = l_(locale, "pollen.common.dateTimePattern"); + String result = l(locale, "pollen.common.dateTimePattern"); return result; } private static String getDatePattern() { Locale locale = ActionContext.getContext().getLocale(); - String result = l_(locale, "pollen.common.datePattern"); + String result = l(locale, "pollen.common.datePattern"); return result; } } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java index 35d0a2e..d00f310 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2015 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 @@ -22,7 +22,7 @@ */ package org.chorem.pollen.ui.security; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; import java.io.IOException; import java.util.Locale; @@ -123,14 +123,14 @@ public abstract class AbstractPollenAuthorization extends AuthorizationFilter { if (pollUri == null) { // no pollUri in url - errorMessage = n_("pollen.security.error.no.pollId"); + errorMessage = n("pollen.security.error.no.pollId"); } else { if (!pollUri.isPollIdNotBlank()) { // no pollId in uri - errorMessage = n_("pollen.security.error.no.pollId"); + errorMessage = n("pollen.security.error.no.pollId"); } else { // there is a pollId check that it exists @@ -143,7 +143,7 @@ public abstract class AbstractPollenAuthorization extends AuthorizationFilter { if (poll == null) { // poll not found - errorMessage = n_("pollen.security.error.poll.not.found"); + errorMessage = n("pollen.security.error.poll.not.found"); } if (log.isDebugEnabled()) { @@ -171,7 +171,7 @@ public abstract class AbstractPollenAuthorization extends AuthorizationFilter { if (!accountExist) { // bad accountId - errorMessage = n_("pollen.security.error.bad.accountId"); + errorMessage = n("pollen.security.error.bad.accountId"); registerError(request, errorMessage); } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java index cf94184..bf5d68d 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2015 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 @@ -28,7 +28,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Check that a user can show results of a poll. @@ -61,7 +61,7 @@ public class PollCreatorAccessRequired extends AbstractPollenAuthorization { // bad accountId isAccessAllowed = false; registerError( - request, n_("pollen.security.error.bad.accountId")); + request, n("pollen.security.error.bad.accountId")); } } } @@ -79,7 +79,7 @@ public class PollCreatorAccessRequired extends AbstractPollenAuthorization { isAccessAllowed = false; registerError( request, - n_("pollen.security.error.creatorId.or.admin.required")); + n("pollen.security.error.creatorId.or.admin.required")); } } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java index 6e0aec4..3c7f627 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2015 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 @@ -29,7 +29,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Check that a user can show results of a poll. @@ -63,7 +63,7 @@ public class PollResultAccessRequired extends AbstractPollenAuthorization { isAccessAllowed = false; registerError( request, - n_("pollen.security.error.bad.accountId")); + n("pollen.security.error.bad.accountId")); } } } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java index b2fd002..92e294b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2015 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 @@ -29,7 +29,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Check that a user can vote. @@ -61,7 +61,7 @@ public class PollVoteAccessRequired extends AbstractPollenAuthorization { // bad accountId isAccessAllowed = false; registerError(request, - n_("pollen.security.error.bad.accountId")); + n("pollen.security.error.bad.accountId")); } } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit d021e6c415b05deed15ac63eac44df647b87b5bc Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:26:24 2015 +0100 Replace invalid "image" tag --- .../src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp | 6 +++--- .../src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp index bf5e1d9..50658ef 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp @@ -62,7 +62,7 @@ <s:if test="!voteStarted"> <s:a href='#' onclick="return deleteChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> @@ -103,7 +103,7 @@ <s:if test="!voteStarted"> <s:a href='#' onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> @@ -178,7 +178,7 @@ <s:if test="!voteStarted"> <s:a href='#' onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp index c116ae6..db4b6ed 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp @@ -47,7 +47,7 @@ <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" key="%{#prefix}.description" value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp index 74a7820..8bb9d91 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp @@ -56,7 +56,7 @@ <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" key="%{#prefix}.description" value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp index 66c9076..27f7fa9 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp @@ -67,7 +67,7 @@ <s:if test="!voteStarted"> <div class="fright"> <s:a href='#' onclick="return deletePersonToList('%{#personPrefix}')"> - <image alt='<s:property value="%{#deletePersonTitle}"/>' + <img alt='<s:property value="%{#deletePersonTitle}"/>' title='<s:property value="%{#deletePersonTitle}"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp index 22274e0..a193a79 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp @@ -44,7 +44,7 @@ <s:textarea cols="30" id="%{#prefix}.description" label='' theme="simple" key="%{#prefix}.description" value="%{choice.description}"/> <s:a href='#' onclick="return deleteChoice('choicesTEXT_%{choiceNumber}')"> - <image alt='<s:property value="deleteTitle"/>' + <img alt='<s:property value="deleteTitle"/>' title='<s:property value="deleteTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp index 1a61050..92357fb 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp @@ -52,7 +52,7 @@ </div> <div id='<s:property value="%{#prefix}"/>_actions' class="fright"> <s:a href='#' onclick="return deleteVotingList('%{#prefix}')"> - <image alt='<s:property value="deleteVotingListTitle"/>' + <img alt='<s:property value="deleteVotingListTitle"/>' title='<s:property value="deleteVotingListTitle"/>' src="<s:url value='/img/delete.png'/>"></image> </s:a> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 89a001cfc881474f24191a0515c65553bb220f7f Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 22:22:19 2015 +0100 fixes #1301: [Comment] Add anti spam filter vote vote and comments --- .../main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java index 1389714..42464fe 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java @@ -89,7 +89,7 @@ public class AddComment extends AbstractVoteAction implements Preparable { // if a value is filled, this should a spam robot that try to fill all field // reject actin in this case if (StringUtils.isNotBlank(commentUrl)) { - addActionError(_("pollen.error.comment.spam")); + addActionError(t("pollen.error.comment.spam")); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 15685b9b8697a62629b5a1e02d5db32d21f03b3f Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Mon Dec 12 20:47:21 2016 +0100 refs #1308: Update nuiton-i18n --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2458ad6..7461b85 100644 --- a/pom.xml +++ b/pom.xml @@ -153,12 +153,12 @@ <projectId>pollen</projectId> <ciViewId>Pollen</ciViewId> - + <!-- customized versions --> <topiaVersion>2.11</topiaVersion> <eugenePluginVersion>3.0-alpha-1</eugenePluginVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> - <nuitonWebVersion>1.18-SNAPSHOT</nuitonWebVersion> + <nuitonWebVersion>1.18</nuitonWebVersion> <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <h2Version>1.3.176</h2Version> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 84de8a60066cccde7aca17decda5bed402fb61ed Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Mon Dec 12 20:50:34 2016 +0100 refs #1308: Update log4j --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e6e67c..2595a2a 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ <struts2Version>2.3.24.1</struts2Version> <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <shiroVersion>1.2.4</shiroVersion> - <log4j>2.4.1</log4j> + <log4j>2.7</log4j> <jettyVersion>9.3.6.v20151106</jettyVersion> <jettyPluginVersion>9.3.6.v20151106</jettyPluginVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 78a069e634fb1d88231216f81d066fce7114c09d Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Mon Dec 12 20:51:29 2016 +0100 refs #1308: Update commons-lang --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 093c392..30d0bf5 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.4</version> + <version>3.5</version> </dependency> <dependency> <groupId>commons-logging</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit f4d43fa433b2b78c5e19f41ae047828b082f9b1f Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Mon Dec 12 20:51:58 2016 +0100 refs #1308: Update guava --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e7afaa..2e99d90 100644 --- a/pom.xml +++ b/pom.xml @@ -256,7 +256,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> + <version>20.0</version> </dependency> <!-- ToPIA (and db) --> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 22ba5e6b9ba44c1521c0ebc79ff8ee5325dac032 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Mon Dec 12 20:52:49 2016 +0100 refs #1308: Update nuiton-validator --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 539e35c..129bdfe 100644 --- a/pom.xml +++ b/pom.xml @@ -320,7 +320,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0</version> + <version>3.0.1</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 23e00c399ea22d7df48d9b61fb6b55b39c7d8cda Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Mon Dec 12 20:54:04 2016 +0100 refs #1308: Update javamail --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2745f6e..93aa673 100644 --- a/pom.xml +++ b/pom.xml @@ -477,7 +477,7 @@ <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> - <version>1.5.4</version> + <version>1.5.6</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 342fdc37a8a911df362a823a51b220861980ce2c Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Mon Dec 12 22:39:58 2016 +0100 refs #1308: Replace deprecated apis --- .../java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java index 453ec71..05d0048 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java @@ -79,6 +79,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -1288,7 +1289,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp Choice oldChoice = poll.getChoiceByTopiaId(choiceId); - if (ObjectUtils.equals( + if (Objects.equals( imageChoice.getName(), oldChoice.getName())) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 5dc1930b026e4911a2b990a70abf1cb46fd2c503 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Tue Dec 13 22:01:13 2016 +0100 refs #1308: Update c3p0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03d537a..a5fb7fd 100644 --- a/pom.xml +++ b/pom.xml @@ -456,7 +456,7 @@ <dependency> <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> - <version>0.9.5.1</version> + <version>0.9.5.2</version> <scope>runtime</scope> </dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 46cc3e323495243861b91dd7bfa8e4ca308faf1c Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Tue Dec 13 22:48:12 2016 +0100 refs #1308: Update selenium --- pollen-ui-struts2/pom.xml | 2 +- pollen-ui-struts2/src/it/createPoll/{README.txt => README.md} | 0 .../src/it/pollCommentVisibility/{README.txt => README.md} | 0 .../src/it/pollVoteVisibility/{README.txt => README.md} | 0 pollen-ui-struts2/src/it/pollen-ui-it/{README.txt => README.md} | 0 pollen-ui-struts2/src/it/pollen-ui-it/pom.xml | 2 +- pollen-ui-struts2/src/it/security/{README.txt => README.md} | 0 pollen-ui-struts2/src/main/assembly/dist/pollen.properties | 2 +- pom.xml | 6 +++--- 9 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index 85893b2..f93f6eb 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -260,7 +260,7 @@ </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-htmlunit-driver</artifactId> + <artifactId>htmlunit-driver</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/pollen-ui-struts2/src/it/createPoll/README.txt b/pollen-ui-struts2/src/it/createPoll/README.md similarity index 100% rename from pollen-ui-struts2/src/it/createPoll/README.txt rename to pollen-ui-struts2/src/it/createPoll/README.md diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt b/pollen-ui-struts2/src/it/pollCommentVisibility/README.md similarity index 100% rename from pollen-ui-struts2/src/it/pollCommentVisibility/README.txt rename to pollen-ui-struts2/src/it/pollCommentVisibility/README.md diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/README.txt b/pollen-ui-struts2/src/it/pollVoteVisibility/README.md similarity index 100% rename from pollen-ui-struts2/src/it/pollVoteVisibility/README.txt rename to pollen-ui-struts2/src/it/pollVoteVisibility/README.md diff --git a/pollen-ui-struts2/src/it/pollen-ui-it/README.txt b/pollen-ui-struts2/src/it/pollen-ui-it/README.md similarity index 100% rename from pollen-ui-struts2/src/it/pollen-ui-it/README.txt rename to pollen-ui-struts2/src/it/pollen-ui-it/README.md diff --git a/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml b/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml index a6ace8a..da9249a 100644 --- a/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml +++ b/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml @@ -94,7 +94,7 @@ </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-htmlunit-driver</artifactId> + <artifactId>htmlunit-driver</artifactId> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> diff --git a/pollen-ui-struts2/src/it/security/README.txt b/pollen-ui-struts2/src/it/security/README.md similarity index 100% rename from pollen-ui-struts2/src/it/security/README.txt rename to pollen-ui-struts2/src/it/security/README.md diff --git a/pollen-ui-struts2/src/main/assembly/dist/pollen.properties b/pollen-ui-struts2/src/main/assembly/dist/pollen.properties index 2365dc3..0527d3b 100644 --- a/pollen-ui-struts2/src/main/assembly/dist/pollen.properties +++ b/pollen-ui-struts2/src/main/assembly/dist/pollen.properties @@ -23,7 +23,7 @@ # # Pollen - v ${project.version} Configuration # -# See README.txt for more informations about howto custmize Pollen. +# See README.md for more informations about howto custmize Pollen. # # all data are in stored in data diff --git a/pom.xml b/pom.xml index cb51743..868cdd7 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ <jettyVersion>9.3.6.v20151106</jettyVersion> <jettyPluginVersion>9.3.6.v20151106</jettyPluginVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> - <seleniumVersion>2.48.2</seleniumVersion> + <seleniumVersion>3.0.1</seleniumVersion> <mockitoVersion>1.10.19</mockitoVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle> @@ -534,8 +534,8 @@ </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-htmlunit-driver</artifactId> - <version>${seleniumVersion}</version> + <artifactId>htmlunit-driver</artifactId> + <version>2.23.2</version> <scope>test</scope> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 31e842662347a31429b80a2cf4d966863caeeeb6 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Tue Dec 13 23:13:06 2016 +0100 refs #1308: Update mockito --- .../test/java/org/chorem/pollen/business/persistence/PollTest.java | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java index f483ee3..5f60a8b 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java @@ -287,8 +287,8 @@ public class PollTest { Mockito.when(poll.isAddChoiceFinished(Mockito.any(Date.class))).thenCallRealMethod(); Mockito.doCallRealMethod().when(poll).setChoiceAddAllowed(Mockito.anyBoolean()); - Mockito.doCallRealMethod().when(poll).setBeginChoiceDate(Mockito.any(Date.class)); - Mockito.doCallRealMethod().when(poll).setEndChoiceDate(Mockito.any(Date.class)); + Mockito.doCallRealMethod().when(poll).setBeginChoiceDate((Date)Mockito.any()); + Mockito.doCallRealMethod().when(poll).setEndChoiceDate((Date)Mockito.any()); // -- choiceAddAllowed -- // // -- choiceAddAllowed -- // diff --git a/pom.xml b/pom.xml index f20abe5..e55e498 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ <jettyPluginVersion>9.3.6.v20151106</jettyPluginVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> <seleniumVersion>3.0.1</seleniumVersion> - <mockitoVersion>1.10.19</mockitoVersion> + <mockitoVersion>2.3.2</mockitoVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle> <!-- license to use --> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.