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 http://git.chorem.org/pollen_1.x.git commit 7ff845dfa4c0c477a2e4788cb60b09361d119f03 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 23:36:00 2015 +0100 fixes #1307: Drop tomcat 6 support Update nuiton-web, nuiton-utils, nuiton-i18n (nightmare :( ) --- pollen-persistence/pom.xml | 4 ++ .../pollen/PollenApplicationConfigProvider.java | 17 ++--- .../org/chorem/pollen/PollenConfiguration.java | 29 +++++---- .../chorem/pollen/PollenConfigurationOption.java | 76 +++++++++++----------- pollen-services/pom.xml | 2 +- pollen-ui-struts2/pom.xml | 23 ++----- pollen-ui-struts2/src/it/createPoll/pom.xml | 2 +- .../src/it/createPoll/src/jetty/jetty-context.xml | 4 +- .../src/jetty/jetty-context.xml | 4 +- .../pollVoteVisibility/src/jetty/jetty-context.xml | 4 +- pollen-ui-struts2/src/it/pollen-ui-it/pom.xml | 11 ++-- .../src/it/security/src/jetty/jetty-context.xml | 4 +- pollen-ui-struts2/src/jetty/jetty-context.xml | 4 +- .../pollen/ui/PollenTopiaTransactionFilter.java | 1 - .../pollen/ui/actions/PollenActionSupport.java | 27 ++++---- .../chorem/pollen/ui/actions/admin/DeleteUser.java | 6 +- .../pollen/ui/actions/admin/ManageUsers.java | 26 ++++---- .../pollen/ui/actions/poll/ResultForPoll.java | 18 ++--- .../pollen/ui/actions/poll/admin/ClosePoll.java | 4 +- .../pollen/ui/actions/poll/admin/DeletePoll.java | 4 +- .../ui/actions/poll/form/AbstractPollForm.java | 66 +++++++++---------- .../pollen/ui/actions/poll/form/ClonePoll.java | 8 +-- .../pollen/ui/actions/poll/form/CreatePoll.java | 10 +-- .../pollen/ui/actions/poll/form/EditPoll.java | 8 +-- .../ui/actions/poll/vote/AbstractVoteAction.java | 14 ++-- .../pollen/ui/actions/poll/vote/AddChoice.java | 6 +- .../pollen/ui/actions/poll/vote/AddComment.java | 8 +-- .../pollen/ui/actions/poll/vote/DeleteChoice.java | 4 +- .../pollen/ui/actions/poll/vote/DeleteComment.java | 4 +- .../pollen/ui/actions/poll/vote/DeleteVote.java | 4 +- .../pollen/ui/actions/poll/vote/ModeratePoll.java | 4 +- .../pollen/ui/actions/poll/vote/VoteForPoll.java | 30 ++++----- .../chorem/pollen/ui/actions/user/AttachPoll.java | 10 +-- .../pollen/ui/actions/user/CreateFavoriteList.java | 12 ++-- .../ui/actions/user/CreateFavoriteListVoter.java | 16 ++--- .../pollen/ui/actions/user/DeleteFavoriteList.java | 6 +- .../ui/actions/user/DeleteFavoriteListVoter.java | 4 +- .../org/chorem/pollen/ui/actions/user/Edit.java | 18 ++--- .../pollen/ui/actions/user/EditFavoriteList.java | 6 +- .../ui/actions/user/EditFavoriteListVoter.java | 16 ++--- .../org/chorem/pollen/ui/actions/user/Login.java | 10 +-- .../pollen/ui/actions/user/LostPassword.java | 8 +-- .../chorem/pollen/ui/actions/user/Register.java | 20 +++--- .../ui/security/AbstractPollenAuthorization.java | 32 ++++----- pom.xml | 26 ++++---- 45 files changed, 310 insertions(+), 310 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index e473e34..b30d03d 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -52,6 +52,10 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> 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 a8722f2..d2b7ad8 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.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,12 +22,13 @@ */ package org.chorem.pollen; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ApplicationConfigProvider; +import static org.nuiton.i18n.I18n.l; import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import org.nuiton.config.ApplicationConfigProvider; +import org.nuiton.config.ConfigActionDef; +import org.nuiton.config.ConfigOptionDef; /** * Application config provider (for site generation). @@ -44,16 +45,16 @@ public class PollenApplicationConfigProvider implements ApplicationConfigProvide @Override public String getDescription(Locale locale) { - return l_(locale, "pollen.application.config"); + return l(locale, "pollen.application.config"); } @Override - public ApplicationConfig.OptionDef[] getOptions() { + public ConfigOptionDef[] getOptions() { return PollenConfigurationOption.values(); } @Override - public ApplicationConfig.ActionDef[] getActions() { - return new ApplicationConfig.ActionDef[0]; + public ConfigActionDef[] getActions() { + return new ConfigActionDef[0]; } } 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 8bde13d..ef099ef 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.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,8 +22,15 @@ */ package org.chorem.pollen; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Collections; +import java.util.Comparator; +import java.util.Enumeration; +import java.util.List; +import java.util.Properties; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; @@ -32,19 +39,13 @@ import org.chorem.pollen.business.persistence.ChoiceType; import org.chorem.pollen.business.persistence.PollCommentVisibility; import org.chorem.pollen.business.persistence.PollType; import org.chorem.pollen.business.persistence.PollVoteVisibility; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.Collections; -import java.util.Comparator; -import java.util.Enumeration; -import java.util.List; -import java.util.Properties; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; /** * Pollen configuration. 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 b113174..f665c56 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java @@ -22,17 +22,17 @@ */ package org.chorem.pollen; -import org.chorem.pollen.business.persistence.PollCommentVisibility; -import org.chorem.pollen.business.persistence.PollVoteVisibility; -import org.chorem.pollen.business.persistence.ChoiceType; -import org.chorem.pollen.business.persistence.PollType; -import org.hibernate.dialect.H2Dialect; -import org.nuiton.util.ApplicationConfig; +import static org.nuiton.i18n.I18n.n; import java.io.File; import java.net.URL; -import static org.nuiton.i18n.I18n.n_; +import org.chorem.pollen.business.persistence.ChoiceType; +import org.chorem.pollen.business.persistence.PollCommentVisibility; +import org.chorem.pollen.business.persistence.PollType; +import org.chorem.pollen.business.persistence.PollVoteVisibility; +import org.hibernate.dialect.H2Dialect; +import org.nuiton.config.ConfigOptionDef; /** * All Pollen configuration options. @@ -40,109 +40,109 @@ import static org.nuiton.i18n.I18n.n_; * @author tchemit <chemit@codelutin.com> * @since 1.3 */ -public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { +public enum PollenConfigurationOption implements ConfigOptionDef { /** login for default admin. */ - APPLICATION_URL("siteUrl", n_("pollen.configuration.siteUrl"), "", URL.class), + APPLICATION_URL("siteUrl", n("pollen.configuration.siteUrl"), "", URL.class), /** login for default admin. */ - DATA_DIR("pollen.dataDirectory", n_("pollen.configuration.dataDirectory"), "/var/local/pollen/data", File.class), + DATA_DIR("pollen.dataDirectory", n("pollen.configuration.dataDirectory"), "/var/local/pollen/data", File.class), /** login for default admin. */ - ADMIN_LOGIN("adminLogin", n_("pollen.configuration.db.login"), "admin", String.class), + ADMIN_LOGIN("adminLogin", ("pollen.configuration.db.login"), "admin", String.class), /** password for default admin. */ - ADMIN_PASSWORD("adminPassword", n_("pollen.configuration.db.password"), "pollen", String.class), + ADMIN_PASSWORD("adminPassword", n("pollen.configuration.db.password"), "pollen", String.class), /** email for default admin. */ - ADMIN_EMAIL("adminEmail", n_("pollen.configuration.adminEmail"), "admin@domain.com", String.class), + ADMIN_EMAIL("adminEmail", n("pollen.configuration.adminEmail"), "admin@domain.com", String.class), /** email for contact link. */ - CONTACT_EMAIL("contactEmail", n_("pollen.configuration.contactEmail"), "", String.class), + CONTACT_EMAIL("contactEmail", n("pollen.configuration.contactEmail"), "", String.class), /** host for email sending configuration. */ - EMAIL_HOST("email_host", n_("pollen.configuration.emailHost"), "smtp", String.class), + EMAIL_HOST("email_host", n("pollen.configuration.emailHost"), "smtp", String.class), /** port for email sending configuration. */ - EMAIL_PORT("email_port", n_("pollen.configuration.emailPort"), "25", String.class), + EMAIL_PORT("email_port", n("pollen.configuration.emailPort"), "25", String.class), /** flag to use ssl for email sending configuration. */ - EMAIL_SSL("email_ssl", n_("pollen.configuration.emailSsl"), "false", boolean.class), + EMAIL_SSL("email_ssl", n("pollen.configuration.emailSsl"), "false", boolean.class), /** flag to use auth for email sending configuration. */ - EMAIL_AUTH("email_auth", n_("pollen.configuration.emailAuth"), "false", boolean.class), + EMAIL_AUTH("email_auth", n("pollen.configuration.emailAuth"), "false", boolean.class), /** login to use if auth at email sending. */ - EMAIL_AUTH_LOGIN("email_auth_login", n_("pollen.configuration.emailAuthLogin"), "", String.class), + EMAIL_AUTH_LOGIN("email_auth_login", n("pollen.configuration.emailAuthLogin"), "", String.class), /** password to use if auth at email sending. */ - EMAIL_AUTH_PASSWORD("email_auth_password", n_("pollen.configuration.emailAuthPassword"), "", String.class), + EMAIL_AUTH_PASSWORD("email_auth_password", n("pollen.configuration.emailAuthPassword"), "", String.class), /** from for email sending configuration. */ - EMAIL_FROM("email_from", n_("pollen.configuration.emailFrom"), "bot@pollen.org", String.class), + EMAIL_FROM("email_from", n("pollen.configuration.emailFrom"), "bot@pollen.org", String.class), /** directory to store emails before sending them. */ - EMAIL_DIR("pollen.emails.directory", n_("pollen.configuration.emaiDirectory"), "${pollen.dataDirectory}/emails", File.class), + EMAIL_DIR("pollen.emails.directory", n("pollen.configuration.emaiDirectory"), "${pollen.dataDirectory}/emails", File.class), /** path for feed directory. */ - FEED_DIR("feedDir", n_("pollen.configuration.feedDirectory"), "${pollen.dataDirectory}/feeds", File.class), + FEED_DIR("feedDir", n("pollen.configuration.feedDirectory"), "${pollen.dataDirectory}/feeds", File.class), /** path for uploaded images directory. */ - IMG_DIR("upImgDir", n_("pollen.configuration.imageDirectory"), "${pollen.dataDirectory}/uploadedImages", File.class), + IMG_DIR("upImgDir", n("pollen.configuration.imageDirectory"), "${pollen.dataDirectory}/uploadedImages", File.class), /** path for temporary directory. */ - TMP_DIR("tmpDir", n_("pollen.configuration.tmpDirectory"), "${pollen.dataDirectory}/tmp", File.class), + TMP_DIR("tmpDir", n("pollen.configuration.tmpDirectory"), "${pollen.dataDirectory}/tmp", File.class), /** nb votes to display per page. */ - NB_VOTES_PER_PAGE("pollen.ui.nbVotesPerPage", n_("pollen.configuration.nbVoteByPage"), "25", int.class), + NB_VOTES_PER_PAGE("pollen.ui.nbVotesPerPage", n("pollen.configuration.nbVoteByPage"), "25", int.class), /** Charset of Pollen. */ - CHARSET("pollen.charset", n_("pollen.configuration.charset"), "UTF-8", String.class), + CHARSET("pollen.charset", n("pollen.configuration.charset"), "UTF-8", String.class), /** Default poll type to use at a new poll creation. */ - DEFAULT_POLL_TYPE("pollen.default.pollType", n_("pollen.configuration.defaultPollType"), PollType.FREE.name(), PollType.class), + DEFAULT_POLL_TYPE("pollen.default.pollType", n("pollen.configuration.defaultPollType"), PollType.FREE.name(), PollType.class), /** Default vote counting type to use at a new poll creation. */ - DEFAULT_VOTE_COUNTING_TYPE("pollen.default.voteCountingType", n_("pollen.configuration.defaultVoteCountingType"), "0", Integer.class), + DEFAULT_VOTE_COUNTING_TYPE("pollen.default.voteCountingType", n("pollen.configuration.defaultVoteCountingType"), "0", Integer.class), /** Default choice type to use at a new poll creation. */ - DEFAULT_CHOICE_TYPE("pollen.default.choiceType", n_("pollen.configuration.defaultChoiceType"), ChoiceType.TEXT.name(), ChoiceType.class), + DEFAULT_CHOICE_TYPE("pollen.default.choiceType", n("pollen.configuration.defaultChoiceType"), ChoiceType.TEXT.name(), ChoiceType.class), /** * Default poll vote visibility to use at a new poll creation. * * @since 1.4.5 */ - DEFAULT_POLL_VOTE_VISIBILITY("pollen.default.pollVoteVisibility", n_("pollen.configuration.defaultPollVoteVisibility"), PollVoteVisibility.EVERYBODY.name(), PollVoteVisibility.class), + DEFAULT_POLL_VOTE_VISIBILITY("pollen.default.pollVoteVisibility", n("pollen.configuration.defaultPollVoteVisibility"), PollVoteVisibility.EVERYBODY.name(), PollVoteVisibility.class), /** * Default poll comment visibility to use at a new poll creation. * * @since 1.4.5 */ - DEFAULT_POLL_COMMENT_VISIBILITY("pollen.default.pollCommentVisibility", n_("pollen.configuration.defaultPollCommentVisibility"), PollCommentVisibility.EVERYBODY.name(), PollCommentVisibility.class), + DEFAULT_POLL_COMMENT_VISIBILITY("pollen.default.pollCommentVisibility", ("pollen.configuration.defaultPollCommentVisibility"), PollCommentVisibility.EVERYBODY.name(), PollCommentVisibility.class), /** * Default poll comment visibility to use at a new poll creation. * * @since 1.4.5 */ - DEFAULT_POLL_RESULT_PUBLIC("pollen.default.pollResultPublic", n_("pollen.configuration.defaultPollResultPublic"), "true", boolean.class), + DEFAULT_POLL_RESULT_PUBLIC("pollen.default.pollResultPublic", n("pollen.configuration.defaultPollResultPublic"), "true", boolean.class), /** db driver. */ - DB_DRIVER("hibernate.connection.driver_class", n_("pollen.configuration.dbDriver"), org.h2.Driver.class.getName(), Class.class), + DB_DRIVER("hibernate.connection.driver_class", n("pollen.configuration.dbDriver"), org.h2.Driver.class.getName(), Class.class), /** db dialect. */ - DB_DIALECT("hibernate.dialect", n_("pollen.configuration.dbDialect"), H2Dialect.class.getName(), Class.class), + DB_DIALECT("hibernate.dialect", n("pollen.configuration.dbDialect"), H2Dialect.class.getName(), Class.class), /** db url. */ - DB_URL("hibernate.connection.url", n_("pollen.configuration.dbUrl"), "jdbc:h2:file:${pollen.dataDirectory}/db/pollendb", String.class), + DB_URL("hibernate.connection.url", n("pollen.configuration.dbUrl"), "jdbc:h2:file:${pollen.dataDirectory}/db/pollendb", String.class), /** login to db. */ - DB_LOGIN("hibernate.connection.username", n_("pollen.configuration.dbLogin"), "sa", String.class), + DB_LOGIN("hibernate.connection.username", n("pollen.configuration.dbLogin"), "sa", String.class), /** passowrd to db. */ - DB_PASSWORD("hibernate.connection.password", n_("pollen.configuration.dbPassword"), "", String.class); + DB_PASSWORD("hibernate.connection.password", n("pollen.configuration.dbPassword"), "", String.class); /** Configuration key. */ protected final String key; diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index b7db58f..3e33bd5 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -34,7 +34,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index c2403c8..5f3bbbd 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -120,7 +120,7 @@ </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> </dependency> @@ -153,7 +153,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> @@ -347,7 +347,7 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> <stopKey>B</stopKey> @@ -381,19 +381,6 @@ <uriEncoding>UTF-8</uriEncoding> </configuration> </plugin> - - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat6-maven-plugin</artifactId> - <configuration> - <path>/${defaultWebContextPath}</path> - <systemProperties> - <siteUrl>${defaultSiteUrl}</siteUrl> - <pollen.log.dir>${defaultLogDir}</pollen.log.dir> - </systemProperties> - <uriEncoding>UTF-8</uriEncoding> - </configuration> - </plugin> </plugins> </pluginManagement> </build> @@ -460,7 +447,7 @@ <!-- Compile jsp for embedded war --> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jspc-maven-plugin</artifactId> <version>${jettyPluginVersion}</version> <executions> @@ -552,7 +539,7 @@ </includes> </overlay> <overlay> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> <type>jar</type> </overlay> diff --git a/pollen-ui-struts2/src/it/createPoll/pom.xml b/pollen-ui-struts2/src/it/createPoll/pom.xml index 21ddc4c..be52f6f 100644 --- a/pollen-ui-struts2/src/it/createPoll/pom.xml +++ b/pollen-ui-struts2/src/it/createPoll/pom.xml @@ -5,7 +5,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 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 index 6c1e8c3..0126ae4 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml +++ b/pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L Pollen :: UI (struts2) @@ -22,7 +22,7 @@ #L% --> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> +<!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"> 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 index 6c1e8c3..0126ae4 100644 --- a/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml +++ b/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L Pollen :: UI (struts2) @@ -22,7 +22,7 @@ #L% --> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> +<!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"> 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 index 6c1e8c3..0126ae4 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L Pollen :: UI (struts2) @@ -22,7 +22,7 @@ #L% --> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> +<!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"> 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 05104ce..35e616f 100644 --- a/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml +++ b/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml @@ -5,7 +5,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 @@ -63,7 +63,7 @@ </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> </dependency> @@ -247,8 +247,9 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> + <version>${jettyVersion}</version> <configuration> <stopKey>A</stopKey> <stopPort>1269</stopPort> @@ -324,7 +325,7 @@ <plugins> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <executions> <execution> @@ -411,7 +412,7 @@ <plugins> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <executions> <execution> 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 index 6c1e8c3..0126ae4 100644 --- a/pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml +++ b/pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L Pollen :: UI (struts2) @@ -22,7 +22,7 @@ #L% --> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> +<!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"> diff --git a/pollen-ui-struts2/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/jetty/jetty-context.xml index 6c1e8c3..0126ae4 100644 --- a/pollen-ui-struts2/src/jetty/jetty-context.xml +++ b/pollen-ui-struts2/src/jetty/jetty-context.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L Pollen :: UI (struts2) @@ -22,7 +22,7 @@ #L% --> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> +<!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"> 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 627e839..da38da2 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 @@ -28,7 +28,6 @@ import org.chorem.pollen.PollenApplicationContext; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.web.filter.TopiaTransactionFilter; import javax.servlet.FilterConfig; import javax.servlet.ServletContext; 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 81e20ce..ad32068 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 @@ -22,11 +22,14 @@ */ package org.chorem.pollen.ui.actions; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.inject.Inject; +import java.net.URL; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; + import org.apache.commons.collections4.CollectionUtils; import org.apache.struts2.interceptor.ParameterAware; import org.apache.struts2.interceptor.ServletRequestAware; @@ -53,21 +56,19 @@ 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; import org.chorem.pollen.votecounting.VoteCountingFactory; import org.nuiton.topia.TopiaContext; -import org.nuiton.web.filter.TopiaTransactionFilter; import org.nuiton.web.struts2.BaseAction; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import java.net.URL; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.inject.Inject; /** * Pollen action support. 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 d33aeb8..f67cdf8 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 @@ -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 @@ -68,12 +68,12 @@ public class DeleteUser extends PollenActionSupport { service.deleteUser(userId); addFlashMessage( - _("pollen.information.user.deleted", user.getDisplayName())); + t("pollen.information.user.deleted", user.getDisplayName())); result = SUCCESS; } catch (UserNotFoundException e) { addFieldError("deleteUser.login", - _("pollen.error.user.not.found")); + t("pollen.error.user.not.found")); } return result; } 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 2cf3b48..25e4f21 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 @@ -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 @@ -75,15 +75,15 @@ public class ManageUsers extends PollenActionSupport { if (StringUtils.isBlank(account.getLogin())) { addFieldError("createUser.login", - _("pollen.error.login.required")); + t("pollen.error.login.required")); } if (StringUtils.isBlank(account.getEmail())) { addFieldError("createUser.email", - _("pollen.error.email.required")); + t("pollen.error.email.required")); } else if (!StringUtil.isEmail(account.getEmail())) { addFieldError("createUser.email", - _("pollen.error.email.invalid")); + t("pollen.error.email.invalid")); } } else if ("edit".equals(action)) { @@ -91,15 +91,15 @@ public class ManageUsers extends PollenActionSupport { if (StringUtils.isBlank(account.getLogin())) { addFieldError("editUser.login", - _("pollen.error.pollAccount.votingId.required")); + t("pollen.error.pollAccount.votingId.required")); } if (StringUtils.isBlank(account.getEmail())) { addFieldError("editUser.email", - _("pollen.error.email.required")); + t("pollen.error.email.required")); } else if (!StringUtil.isEmail(account.getEmail())) { addFieldError("editUser.email", - _("pollen.error.email.invalid")); + t("pollen.error.email.invalid")); } } } @@ -113,7 +113,7 @@ public class ManageUsers extends PollenActionSupport { getUserService().createUser(user, true); addFlashMessage( - _("pollen.information.user.created", + t("pollen.information.user.created", user.getDisplayName())); // remove this user, otherwise it will be reused in the user lists user = null; @@ -121,11 +121,11 @@ public class ManageUsers extends PollenActionSupport { result = SUCCESS; } catch (UserLoginAlreadyUsedException e) { addFieldError("createUser.login", - _("pollen.error.user.login.already.used")); + t("pollen.error.user.login.already.used")); } catch (UserEmailAlreadyUsedException e) { addFieldError("createUser.email", - _("pollen.error.user.email.already.used")); + t("pollen.error.user.email.already.used")); } return result; @@ -140,7 +140,7 @@ public class ManageUsers extends PollenActionSupport { try { getUserService().updateUser(user, null, true); addFlashMessage( - _("pollen.information.user.updated", + t("pollen.information.user.updated", user.getDisplayName())); // remove this user, otherwise it will be reused in the user lists @@ -149,10 +149,10 @@ public class ManageUsers extends PollenActionSupport { result = SUCCESS; } catch (UserEmailAlreadyUsedException e) { addFieldError("editUser.email", - _("pollen.error.user.email.already.used")); + t("pollen.error.user.email.already.used")); } catch (UserInvalidPasswordException e) { addFieldError("editUser.password", - _("pollen.error.user.invalid.password")); + t("pollen.error.user.invalid.password")); } return result; } 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 6d73554..b948651 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 @@ -177,21 +177,21 @@ public class ResultForPoll extends PollenActionSupport implements PollenUserSecu result = creator.getEmail(); } if (StringUtils.isBlank(result)) { - result = _("pollen.common.undefined"); + result = t("pollen.common.undefined"); } return result; } public String getPollBeginDate() { Date date = poll.getBeginDate(); - String result = date == null ? _("pollen.common.undefined") : + String result = date == null ? t("pollen.common.undefined") : getPollService().decorateDate(date); return result; } public String getPollEndDate() { Date date = poll.getEndDate(); - String result = date == null ? _("pollen.common.undefined") : + String result = date == null ? t("pollen.common.undefined") : getPollService().decorateDate(date); return result; } @@ -227,9 +227,9 @@ public class ResultForPoll extends PollenActionSupport implements PollenUserSecu if (CollectionUtils.isEmpty(topRanking)) { victoryMessage = ""; } else if (topRanking.size() == 1) { - victoryMessage = _("pollen.common.victory"); + victoryMessage = t("pollen.common.victory"); } else { - victoryMessage = _("pollen.common.victories"); + victoryMessage = t("pollen.common.victories"); } return victoryMessage; } @@ -271,7 +271,7 @@ public class ResultForPoll extends PollenActionSupport implements PollenUserSecu } if (poll.isRunning(serviceContext.getCurrentTime())) { - addFlashWarning(_("pollen.information.pollRunning")); + addFlashWarning(t("pollen.information.pollRunning")); } if (log.isInfoEnabled()) { log.info("topRanking = " + pollResult.getTopRanking()); @@ -296,9 +296,9 @@ public class ResultForPoll extends PollenActionSupport implements PollenUserSecu if (poll.isPollGroup() && !getByGroup()) { // means poll votecount as anot group poll - title = _("pollen.common.pollResult.forPollAsNotGroupPoll"); + title = t("pollen.common.pollResult.forPollAsNotGroupPoll"); } else { - title = _("pollen.common.pollResult.forPoll"); + title = t("pollen.common.pollResult.forPoll"); } return getPollResultChartUrl(pollResult, title, width, height); @@ -307,7 +307,7 @@ public class ResultForPoll extends PollenActionSupport implements PollenUserSecu public String getGroupPollResultChartUrl(String groupId, int width, int height) { VoteCountingResult result = groupResult.getGroupResult(groupId); String groupName = getGroupName(groupId); - String title = _("pollen.common.pollResult.forGroup", groupName); + String title = t("pollen.common.pollResult.forGroup", groupName); return getPollResultChartUrl(result, title, width, height); } 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 e338324..cb08e64 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 @@ -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 @@ -74,7 +74,7 @@ public class ClosePoll extends PollenActionSupport implements PollenUserSecurity getPollService().closePoll(poll.getPollId()); - addFlashMessage(_("pollen.information.poll.closed", title)); + addFlashMessage(t("pollen.information.poll.closed", title)); return SUCCESS; } 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 c36908f..67f4083 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 @@ -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 @@ -68,7 +68,7 @@ public class DeletePoll extends PollenActionSupport implements PollenUserSecurit } getPollService().deletePoll(poll.getPollId()); - addFlashMessage(_("pollen.information.poll.deleted", title)); + addFlashMessage(t("pollen.information.poll.deleted", title)); return SUCCESS; } 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 a246260..2902900 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 @@ -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 @@ -298,7 +298,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp poll = service.getPollEditable(pollUid, userAccount, isClone()); if (poll.isClosed()) { - addFlashWarning(_("pollen.warning.poll.is.closed.so.read.only")); + addFlashWarning(t("pollen.warning.poll.is.closed.so.read.only")); } List<Choice> pollChoices = poll.getChoice(); @@ -368,7 +368,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp } if (isVoteStarted()) { - addFlashMessage(_("pollen.information.poll.form.voteStarted")); + addFlashMessage(t("pollen.information.poll.form.voteStarted")); } return INPUT; @@ -689,13 +689,13 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp } public String getActionLabel() { - return isEdit() ? _("pollen.action.editPoll") : - _("pollen.action.createPoll"); + return isEdit() ? t("pollen.action.editPoll") : + t("pollen.action.createPoll"); } public String getPageTitle() { return isEdit() ? getPoll().getTitle() : - _("pollen.title.createPoll"); + t("pollen.title.createPoll"); } public boolean isVoteStarted() { @@ -798,7 +798,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // -- Title : required -- // if (StringUtils.isBlank(poll.getTitle())) { addInformationsError("poll.title", - _("pollen.error.poll.required.title")); + t("pollen.error.poll.required.title")); } if (isVoteStarted()) { @@ -812,7 +812,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // poll must have at least one choice addInformationsError("poll.choices", - _("pollen.error.poll.required.one.choice")); + t("pollen.error.poll.required.one.choice")); } else { switch (poll.getChoiceType()) { @@ -845,14 +845,14 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // no name addInformationsError( choiceErrorField, - _("pollen.error.poll.choice.name.required")); + t("pollen.error.poll.choice.name.required")); continue; } if (choiceNames.contains(choiceName)) { // duplicated names addInformationsError( choiceErrorField, - _("pollen.error.poll.choice.already.used.name")); + t("pollen.error.poll.choice.already.used.name")); continue; } choiceNames.add(choiceName); @@ -873,7 +873,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // no name addInformationsError( choiceErrorField, - _("pollen.error.poll.dateChoice.required")); + t("pollen.error.poll.dateChoice.required")); continue; } if (choice.getDate() == null) { @@ -881,7 +881,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // format error addInformationsError( choiceErrorField, - _("pollen.error.poll.dateChoice.badDateFormat")); + t("pollen.error.poll.dateChoice.badDateFormat")); continue; } @@ -893,7 +893,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // duplicated names addInformationsError( choiceErrorField, - _("pollen.error.poll.dateChoice.already.used")); + t("pollen.error.poll.dateChoice.already.used")); continue; } choiceNames.add(choiceValue); @@ -915,14 +915,14 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // no name addInformationsError( choiceErrorField, - _("pollen.error.poll.imageChoice.upload.required")); + t("pollen.error.poll.imageChoice.upload.required")); continue; } if (choiceNames.contains(choiceName)) { // duplicated names addInformationsError( choiceErrorField, - _("pollen.error.poll.imageChoice.already.used")); + t("pollen.error.poll.imageChoice.already.used")); continue; } choiceNames.add(choiceName); @@ -932,7 +932,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // Bad content Type addInformationsError( choiceErrorField, - _("pollen.error.poll.imageChoice.upload.badContentType")); + t("pollen.error.poll.imageChoice.upload.badContentType")); //Remove the file and its thumb PollImageChoice imageChoice = (PollImageChoice) choice; File imageFile = new File(imageChoice.getLocation()); @@ -961,7 +961,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp if (validateEndDate(poll.getBeginDate(), poll.getEndDate())) { addOptionsError("poll.endDate", - _("pollen.error.poll.endDate.before.beginDate")); + t("pollen.error.poll.endDate.before.beginDate")); } // --- currentTime < endDate @@ -969,7 +969,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp addOptionsError( "poll.endDate", - _("pollen.error.poll.endDate.before.now")); + t("pollen.error.poll.endDate.before.now")); } } @@ -982,12 +982,12 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // reminderHourCountdown == null addOptionsError("reminderHourCountdown", - _("pollen.error.poll.reminderHourCountdown.required")); + t("pollen.error.poll.reminderHourCountdown.required")); } else if (getReminderHourCountdown() < 1) { // reminderHourCountdown <= 0 addOptionsError("reminderHourCountdown", - _("pollen.error.poll.reminderHourCountdown.greater.than.0")); + t("pollen.error.poll.reminderHourCountdown.greater.than.0")); } } } @@ -1000,11 +1000,11 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp if (getMaxChoices() == null) { // maxChoices == null addOptionsError("maxChoices", - _("pollen.error.poll.maxChoice.required")); + t("pollen.error.poll.maxChoice.required")); } else if (getMaxChoices() < 1) { // maxChoices <= 0 addOptionsError("maxChoices", - _("pollen.error.poll.maxChoice.greater.than.0")); + t("pollen.error.poll.maxChoice.greater.than.0")); } } } @@ -1015,7 +1015,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp !StringUtil.isEmail(creatorEmail)) { addOptionsError("poll.creator.email", - _("pollen.error.email.invalid")); + t("pollen.error.email.invalid")); } } @@ -1077,7 +1077,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp addOptionsError( fieldNamePrefix, - _("pollen.error.poll.required.votingList.name")); + t("pollen.error.poll.required.votingList.name")); } else { // check no votingList name doublon @@ -1087,7 +1087,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // name doublon addOptionsError( fieldNamePrefix, - _("pollen.error.poll.votingList.name.doublon")); + t("pollen.error.poll.votingList.name.doublon")); } } @@ -1098,7 +1098,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // no weight filled (can be a bad conversion) addOptionsError( fieldNamePrefix, - _("pollen.error.poll.votingList.weight.not.valid")); + t("pollen.error.poll.votingList.weight.not.valid")); } } @@ -1112,7 +1112,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // no personToList found for unique votingList 0 addOptionsError(fieldNamePrefix, - _("pollen.error.poll.required.one.personToList")); + t("pollen.error.poll.required.one.personToList")); } else { // check no doublon on voter names @@ -1148,7 +1148,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // voter name mandatory addOptionsError( fieldNamePrefix, - _("pollen.error.poll.personToList.votingId.required")); + t("pollen.error.poll.personToList.votingId.required")); } else { boolean add = voters.add(votingId); @@ -1157,7 +1157,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // voter name already used addOptionsError( fieldNamePrefix, - _("pollen.error.poll.personToList.votingId.doublon")); + t("pollen.error.poll.personToList.votingId.doublon")); } } @@ -1169,7 +1169,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // voter email mandatory addOptionsError(fieldNamePrefix, - _("pollen.error.email.required")); + t("pollen.error.email.required")); } else { boolean validEmail = StringUtil.isEmail(email); @@ -1177,7 +1177,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // not a valid email addOptionsError(fieldNamePrefix, - _("pollen.error.email.invalid")); + t("pollen.error.email.invalid")); } else { boolean add = emails.add(email); @@ -1186,7 +1186,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // email already used addOptionsError( fieldNamePrefix, - _("pollen.error.poll.personToList.email.doublon")); + t("pollen.error.poll.personToList.email.doublon")); } } } @@ -1198,7 +1198,7 @@ public abstract class AbstractPollForm extends PollenActionSupportForEdition imp // no weight filled (can be a bad conversion) addOptionsError( fieldNamePrefix, - _("pollen.error.poll.personToList.weight.not.valid")); + t("pollen.error.poll.personToList.weight.not.valid")); } } 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 321d40f..0ddd820 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 @@ -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 @@ -49,7 +49,7 @@ public class ClonePoll extends AbstractPollForm { @Override protected Poll savePoll(Poll poll) { poll = getPollService().createPoll(poll); - addFlashMessage(_("pollen.information.poll.created", poll.getTitle())); + addFlashMessage(t("pollen.information.poll.created", poll.getTitle())); return poll; } @@ -61,14 +61,14 @@ public class ClonePoll extends AbstractPollForm { addOptionsError( "poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); + t("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); } // --- endChoiceDate < endDate if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { addOptionsError("poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.after.endDate")); + t("pollen.error.poll.endChoiceDate.after.endDate")); } } } 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 4c4be4a..1ed1993 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 @@ -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 @@ -49,7 +49,7 @@ public class CreatePoll extends AbstractPollForm { @Override protected Poll savePoll(Poll poll) { poll = getPollService().createPoll(poll); - addFlashMessage(_("pollen.information.poll.created", poll.getTitle())); + addFlashMessage(t("pollen.information.poll.created", poll.getTitle())); return poll; } @@ -61,7 +61,7 @@ public class CreatePoll extends AbstractPollForm { addOptionsError( "poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); + t("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); } // --- currentTime < endChoiceDate @@ -69,14 +69,14 @@ public class CreatePoll extends AbstractPollForm { addOptionsError( "poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.before.now")); + t("pollen.error.poll.endChoiceDate.before.now")); } // --- endChoiceDate < endDate if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { addOptionsError("poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.after.endDate")); + t("pollen.error.poll.endChoiceDate.after.endDate")); } } } 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 ae9f511..476db85 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 @@ -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 @@ -53,7 +53,7 @@ public class EditPoll extends AbstractPollForm { @Override protected Poll savePoll(Poll poll) throws PollNotFoundException { poll = getPollService().updatePoll(poll); - addFlashMessage(_("pollen.information.poll.updated", poll.getTitle())); + addFlashMessage(t("pollen.information.poll.updated", poll.getTitle())); return poll; } @@ -65,14 +65,14 @@ public class EditPoll extends AbstractPollForm { addOptionsError( "poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); + t("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); } // --- endChoiceDate < endDate if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { addOptionsError("poll.endChoiceDate", - _("pollen.error.poll.endChoiceDate.after.endDate")); + t("pollen.error.poll.endChoiceDate.after.endDate")); } } 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 a7f5bb8..023b0d4 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 @@ -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 @@ -182,13 +182,13 @@ public abstract class AbstractVoteAction extends PollenActionSupport implements public String getPollVoteVisibilityName() { PollVoteVisibility strategy = getPoll().getPollVoteVisibility(); - String result = _(strategy.getI18nKey()); + String result = t(strategy.getI18nKey()); return result; } public String getPollVoteVisibilityHelp() { PollVoteVisibility strategy = getPoll().getPollVoteVisibility(); - String result = _(strategy.getI18nHelpKey()); + String result = t(strategy.getI18nHelpKey()); return result; } @@ -256,7 +256,7 @@ public abstract class AbstractVoteAction extends PollenActionSupport implements } public String getVoteMessages() { - return _("pollen.common.voteNbVotes", poll.sizeVote()); + return t("pollen.common.voteNbVotes", poll.sizeVote()); } public boolean isFeedFileExisting() { @@ -342,21 +342,21 @@ public abstract class AbstractVoteAction extends PollenActionSupport implements result = creator.getEmail(); } if (StringUtils.isBlank(result)) { - result = _("pollen.common.undefined"); + result = t("pollen.common.undefined"); } return result; } public String getPollBeginDate() { Date date = poll.getBeginDate(); - String result = date == null ? _("pollen.common.undefined") : + String result = date == null ? t("pollen.common.undefined") : getPollService().decorateDate(date); return result; } public String getPollEndDate() { Date date = poll.getEndDate(); - String result = date == null ? _("pollen.common.undefined") : + String result = date == null ? t("pollen.common.undefined") : getPollService().decorateDate(date); return result; } 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 c5f1a8f..1a84f28 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 @@ -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 @@ -107,7 +107,7 @@ public class AddChoice extends AbstractVoteAction implements Preparable, FileUpl if (StringUtils.isBlank(choiceName)) { String typeLabel = getText(choiceType.getI18nKey()); addFieldError("choice." + propName, - _("pollen.error.choice.empty", typeLabel)); + t("pollen.error.choice.empty", typeLabel)); } else { if (!poll.isChoiceEmpty()) { @@ -118,7 +118,7 @@ public class AddChoice extends AbstractVoteAction implements Preparable, FileUpl String pollChoiceName = pollChoice.getName(); if (pollChoiceName.equals(choiceName)) { addFieldError("choice." + propName, - _("pollen.error.poll.choice.already.used.name")); + t("pollen.error.poll.choice.already.used.name")); break; } } 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 c823a69..96f7dc7 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 @@ -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 @@ -68,11 +68,11 @@ public class AddComment extends AbstractVoteAction implements Preparable { public void validate() { if (StringUtils.isBlank(getCommentAuthor())) { - addFieldError("commentAuthor", _("pollen.error.comment.name.empty")); + addFieldError("commentAuthor", t("pollen.error.comment.name.empty")); } if (StringUtils.isBlank(getCommentText())) { - addFieldError("commentText", _("pollen.error.comment.text.empty")); + addFieldError("commentText", t("pollen.error.comment.text.empty")); } } @@ -87,7 +87,7 @@ public class AddComment extends AbstractVoteAction implements Preparable { // create the comment getPollCommentService().createComment(getPoll(), comment); - addFlashMessage(_("pollen.information.comment.added")); + addFlashMessage(t("pollen.information.comment.added")); return SUCCESS; } } 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 a68237b..2b69f0b 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 @@ -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 @@ -50,7 +50,7 @@ public class DeleteChoice extends PollenActionSupport implements PollenUserSecur getPollService().deleteChoice(getPollUri().getPollId(), choiceId); - addFlashMessage(_("pollen.information.choice.deleted")); + addFlashMessage(t("pollen.information.choice.deleted")); return SUCCESS; } 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 ad22b4e..4d6de48 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 @@ -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 @@ -69,7 +69,7 @@ public class DeleteComment extends PollenActionSupport implements PollenUserSecu getPollCommentService().deleteComment(poll, commentId, reason); - addFlashMessage(_("pollen.information.comment.deleted")); + addFlashMessage(t("pollen.information.comment.deleted")); return SUCCESS; } } 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 7ae3b2c..bd3af5e 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 @@ -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 @@ -69,7 +69,7 @@ public class DeleteVote extends PollenActionSupport implements PollenUserSecurit getVoteService().deleteVote(poll, voteId, reason); - addFlashMessage(_("pollen.information.vote.deleted")); + addFlashMessage(t("pollen.information.vote.deleted")); if (poll.isPollFree() && getUserSecurityContext().isWithAccountId()){ 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 97e5737..d4d7507 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 @@ -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 @@ -37,7 +37,7 @@ public class ModeratePoll extends AbstractVoteAction { prepareVotePage(); - addFlashWarning(_("pollen.information.moderate.page")); + addFlashWarning(t("pollen.information.moderate.page")); return INPUT; } 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 599cd49..866358e 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 @@ -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 @@ -35,7 +35,7 @@ import org.chorem.pollen.business.persistence.VoteToChoice; import org.chorem.pollen.services.impl.VoteService; import org.chorem.pollen.votecounting.VoteCounting; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Votes to a poll. @@ -64,18 +64,18 @@ public class VoteForPoll extends AbstractVoteAction implements Preparable { Poll poll = getPoll(); if (poll.isClosed()) { - addFlashWarning(_("pollen.information.pollClosed")); + addFlashWarning(t("pollen.information.pollClosed")); } else if (!isPollStarted()) { - addFlashWarning(_("pollen.information.pollNotStarted")); + addFlashWarning(t("pollen.information.pollNotStarted")); } else if (isPollFinished()) { - addFlashWarning(_("pollen.information.pollFinished")); + addFlashWarning(t("pollen.information.pollFinished")); } else if (!isVoteAllowed()) { - addFlashWarning(_("pollen.information.pollCanNotVote")); + addFlashWarning(t("pollen.information.pollCanNotVote")); } if (isPollChoiceRunning()) { - addFlashMessage(_("pollen.information.pollChoiceRunning")); + addFlashMessage(t("pollen.information.pollChoiceRunning")); } } @@ -95,13 +95,13 @@ public class VoteForPoll extends AbstractVoteAction implements Preparable { String name = pollAccount.getVotingId(); if (StringUtils.isBlank(name)) { addFieldError("pollAccount.votingId", - _("pollen.error.pollAccount.votingId.required")); + t("pollen.error.pollAccount.votingId.required")); } // check if the votingId is available if (!getVoteService().isVotingIdFree(poll, pollAccount.getTopiaId(), name)) { addFieldError("pollAccount.votingId", - _("pollen.error.user.alreadyVoted", name)); + t("pollen.error.user.alreadyVoted", name)); } } @@ -130,7 +130,7 @@ public class VoteForPoll extends AbstractVoteAction implements Preparable { // vote value changed String validMessage = - _("pollen.error.vote.invalidFormat", voteToChoice.getChoice().getName(), originalValue); + t("pollen.error.vote.invalidFormat", voteToChoice.getChoice().getName(), originalValue); addFieldError("vote.choices", validMessage); voteValid = false; break; @@ -174,7 +174,7 @@ public class VoteForPoll extends AbstractVoteAction implements Preparable { int maxChoice = getPoll().getMaxChoiceNb(); if (maxChoice != 0 && nbVotes > maxChoice) { addFieldError("vote.choices", - _("pollen.error.vote.maxChoiceNb", maxChoice)); + t("pollen.error.vote.maxChoiceNb", maxChoice)); } // check that total vote value is ok @@ -234,17 +234,17 @@ public class VoteForPoll extends AbstractVoteAction implements Preparable { boolean connected = getUserSecurityContext().isConnected(); if (connected) { - message = n_("pollen.information.vote.createdWithUpdateUrl.notConnected"); + message = n("pollen.information.vote.createdWithUpdateUrl.notConnected"); } else { - message = n_("pollen.information.vote.createdWithUpdateUrl"); + message = n("pollen.information.vote.createdWithUpdateUrl"); } - addFlashMessage(_(message, updateUrl)); + addFlashMessage(t(message, updateUrl)); } else { // there is a accountId in url, just inform vote is saved - addFlashMessage(_("pollen.information.vote.created")); + addFlashMessage(t("pollen.information.vote.created")); } return SUCCESS; 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 c01ae92..0bf78f2 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 @@ -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 @@ -79,7 +79,7 @@ public class AttachPoll extends PollenActionSupport { getPollService().attachPoll(id, userAccount); - addFlashMessage(_("pollen.information.poll.attached", poll.getTitle())); + addFlashMessage(t("pollen.information.poll.attached", poll.getTitle())); return SUCCESS; } @@ -90,7 +90,7 @@ public class AttachPoll extends PollenActionSupport { String id = getPollId(); if (StringUtils.isBlank(id)) { - addFieldError("pollId", _("pollen.error.pollId.empty")); + addFieldError("pollId", t("pollen.error.pollId.empty")); } else { try { @@ -103,11 +103,11 @@ public class AttachPoll extends PollenActionSupport { UserAccount userAccount = poll.getCreator().getUserAccount(); if (userAccount != null) { - addFieldError("pollId", _("pollen.error.pollAlreadyAttached")); + addFieldError("pollId", t("pollen.error.pollAlreadyAttached")); } } catch (PollNotFoundException e) { - addFieldError("pollId", _("pollen.error.pollNotFound")); + addFieldError("pollId", t("pollen.error.pollNotFound")); } } 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 d3e16fc..703750c 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 @@ -5,7 +5,7 @@ package org.chorem.pollen.ui.actions.user; * $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 @@ -96,7 +96,7 @@ public class CreateFavoriteList extends PollenActionSupportForEdition implements if (StringUtils.isBlank(getCreateFavoriteList().getName())) { addFieldError("createFavoriteList.name", - _("pollen.error.favoriteListName.required")); + t("pollen.error.favoriteListName.required")); } } @@ -125,7 +125,7 @@ public class CreateFavoriteList extends PollenActionSupportForEdition implements } catch (FavoriteListAlreadyExistException ex) { addFieldError("createFavoriteList.name", - _("pollen.error.favoriteList.already.used")); + t("pollen.error.favoriteList.already.used")); } String result; @@ -136,11 +136,11 @@ public class CreateFavoriteList extends PollenActionSupportForEdition implements getTransaction().commitTransaction(); if (nbImports > 0) { - addFlashMessage(_("pollen.information.favoriteList.imported", + addFlashMessage(t("pollen.information.favoriteList.imported", createFavoriteList.getName(), nbImports)); } else { - addFlashMessage(_("pollen.information.favoriteList.created", + addFlashMessage(t("pollen.information.favoriteList.created", createFavoriteList.getName())); } createFavoriteList = null; @@ -196,7 +196,7 @@ public class CreateFavoriteList extends PollenActionSupportForEdition implements } catch (ParticipantAlreadyFoundInListException ex) { // WARNING ? addFlashError( - _("pollen.error.favoriteList.import.participantExists" + t("pollen.error.favoriteList.import.participantExists" , importedAccount.getEmail()) ); } 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 fb6e545..edc5285 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 @@ -5,7 +5,7 @@ package org.chorem.pollen.ui.actions.user; * $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 @@ -76,9 +76,9 @@ public class CreateFavoriteListVoter extends PollenActionSupportForEdition imple favoriteList = getFavoriteService().getFavoriteList( getPollenUserAccount(), favoriteListId); } catch (FavoriteListNotFoundException e) { - addFlashError(_("pollen.error.favoriteList.not.found")); + addFlashError(t("pollen.error.favoriteList.not.found")); } catch (FavoriteListNotOwnedByUserException e) { - addFlashError(_("pollen.error.favoriteList.not.owned.by.user")); + addFlashError(t("pollen.error.favoriteList.not.owned.by.user")); } } @@ -89,15 +89,15 @@ public class CreateFavoriteListVoter extends PollenActionSupportForEdition imple if (StringUtils.isBlank(account.getVotingId())) { addFieldError("createPollAccount.votingId", - _("pollen.error.pollAccount.votingId.required")); + t("pollen.error.pollAccount.votingId.required")); } if (StringUtils.isBlank(account.getEmail())) { addFieldError("createPollAccount.email", - _("pollen.error.email.required")); + t("pollen.error.email.required")); } else if (!StringUtil.isEmail(account.getEmail())) { addFieldError("createPollAccount.email", - _("pollen.error.email.invalid")); + t("pollen.error.email.invalid")); } } @@ -116,14 +116,14 @@ public class CreateFavoriteListVoter extends PollenActionSupportForEdition imple favoriteList, pollAccount); addFlashMessage( - _("pollen.information.pollAccount.addedTofavoriteList", + t("pollen.information.pollAccount.addedTofavoriteList", pollAccount.getVotingId())); pollAccount = null; result = SUCCESS; } catch (ParticipantAlreadyFoundInListException e) { addFieldError("createPollAccount.email", - _("pollen.error.favoriteList.participant.already.found.in.list")); + t("pollen.error.favoriteList.participant.already.found.in.list")); } return result; } 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 7bb4a02..e1acef2 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 @@ -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 @@ -69,13 +69,13 @@ public class DeleteFavoriteList extends PollenActionSupport { PersonList deletedFavoritedList = service.deleteFavoriteList( getPollenUserAccount(), favoriteList); - addFlashMessage(_("pollen.information.favoriteList.deleted", + addFlashMessage(t("pollen.information.favoriteList.deleted", deletedFavoritedList.getName())); result = SUCCESS; } catch (UserNotFoundException e) { addFieldError("deleteUser.login", - _("pollen.error.user.not.found")); + t("pollen.error.user.not.found")); } return result; } 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 94b420a..d6a6a5f 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 @@ -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 @@ -75,7 +75,7 @@ public class DeleteFavoriteListVoter extends PollenActionSupport { service.removePollAccountToFavoriteList(favoriteList, pollAccount); addFlashMessage( - _("pollen.information.pollAccount.removedFromFavoriteList", + t("pollen.information.pollAccount.removedFromFavoriteList", pollAccount.getVotingId())); return SUCCESS; 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 6b78395..3fa31f1 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 @@ -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 @@ -84,18 +84,18 @@ public class Edit extends PollenActionSupportForEdition { if (StringUtils.isBlank(pollenUserAccount.getLogin())) { addFieldError("pollenUserAccount.login", - _("pollen.error.login.required")); + t("pollen.error.login.required")); } if (StringUtils.isBlank(pollenUserAccount.getPassword())) { addFieldError("pollenUserAccount.password", - _("pollen.error.password.required")); + t("pollen.error.password.required")); } if (StringUtils.isNotBlank(getNewPassword())) { if (ObjectUtils.notEqual(getNewPassword(), getNewPassword2())) { addFieldError("newPassword", - _("pollen.error.passwords.not.equals")); + t("pollen.error.passwords.not.equals")); } } @@ -103,10 +103,10 @@ public class Edit extends PollenActionSupportForEdition { if (!isExists()) { if (StringUtils.isBlank(pollenUserAccount.getEmail())) { addFieldError("pollenUserAccount.email", - _("pollen.error.email.required")); + t("pollen.error.email.required")); } else if (!StringUtil.isEmail(pollenUserAccount.getEmail())) { addFieldError("pollenUserAccount.email", - _("pollen.error.email.invalid")); + t("pollen.error.email.invalid")); } } } @@ -127,14 +127,14 @@ public class Edit extends PollenActionSupportForEdition { // push back user to session getPollenSession().setUserAccount(updatedUser); - addFlashMessage(_("pollen.information.pollAccount.updated")); + addFlashMessage(t("pollen.information.pollAccount.updated")); result = SUCCESS; } catch (UserEmailAlreadyUsedException e) { addFieldError("pollenUserAccount.email", - _("pollen.error.user.email.already.used")); + t("pollen.error.user.email.already.used")); } catch (UserInvalidPasswordException e) { addFieldError("pollenUserAccount.password", - _("pollen.error.user.invalid.password")); + t("pollen.error.user.invalid.password")); } // reset password 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 fcf287d..5934262 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 @@ -5,7 +5,7 @@ package org.chorem.pollen.ui.actions.user; * $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 @@ -60,9 +60,9 @@ public class EditFavoriteList extends PollenActionSupportForEdition { favoriteList = getFavoriteService().getFavoriteList( getPollenUserAccount(), favoriteListId); } catch (FavoriteListNotFoundException e) { - addFlashError(_("pollen.error.favoriteList.not.found")); + addFlashError(t("pollen.error.favoriteList.not.found")); } catch (FavoriteListNotOwnedByUserException e) { - addFlashError(_("pollen.error.favoriteList.not.owned.by.user")); + addFlashError(t("pollen.error.favoriteList.not.owned.by.user")); } return SUCCESS; } 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 ac59cf9..e7c3e37 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 @@ -5,7 +5,7 @@ package org.chorem.pollen.ui.actions.user; * $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 @@ -79,9 +79,9 @@ public class EditFavoriteListVoter extends PollenActionSupportForEdition impleme favoriteList = getFavoriteService().getFavoriteList( getPollenUserAccount(), favoriteListId); } catch (FavoriteListNotFoundException e) { - addFlashError(_("pollen.error.favoriteList.not.found")); + addFlashError(t("pollen.error.favoriteList.not.found")); } catch (FavoriteListNotOwnedByUserException e) { - addFlashError(_("pollen.error.favoriteList.not.owned.by.user")); + addFlashError(t("pollen.error.favoriteList.not.owned.by.user")); } } @@ -92,15 +92,15 @@ public class EditFavoriteListVoter extends PollenActionSupportForEdition impleme if (StringUtils.isBlank(account.getVotingId())) { addFieldError("editPollAccount.votingId", - _("pollen.error.pollAccount.votingId.required")); + t("pollen.error.pollAccount.votingId.required")); } if (StringUtils.isBlank(account.getEmail())) { addFieldError("editPollAccount.email", - _("pollen.error.email.required")); + t("pollen.error.email.required")); } else if (!StringUtil.isEmail(account.getEmail())) { addFieldError("editPollAccount.email", - _("pollen.error.email.invalid")); + t("pollen.error.email.invalid")); } } @@ -119,14 +119,14 @@ public class EditFavoriteListVoter extends PollenActionSupportForEdition impleme favoriteList, editPollAccount); addFlashMessage( - _("pollen.information.pollAccount.updatedTofavoriteList", + t("pollen.information.pollAccount.updatedTofavoriteList", editPollAccount.getVotingId())); editPollAccount = null; result = SUCCESS; } catch (ParticipantAlreadyFoundInListException e) { addFieldError("editPollAccount.email", - _("pollen.error.favoriteList.participant.already.found.in.list")); + t("pollen.error.favoriteList.participant.already.found.in.list")); } return result; } 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 76023e9..fd960a0 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 @@ -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 @@ -74,7 +74,7 @@ public class Login extends PollenActionSupport { public String execute() throws Exception { if (StringUtils.isBlank(login) || StringUtils.isBlank(password)) { - addFlashError(_("pollen.error.user.bad.login.or.password")); + addFlashError(t("pollen.error.user.bad.login.or.password")); } else { try { @@ -82,12 +82,12 @@ public class Login extends PollenActionSupport { getUserService().connect(login, password); getPollenSession().setUserAccount(userAccount); - addFlashMessage(_("pollen.information.your.are.loggued")); + addFlashMessage(t("pollen.information.your.are.loggued")); } catch (UserNotFoundException e) { - addFlashError(_("pollen.error.user.bad.login.or.password")); + addFlashError(t("pollen.error.user.bad.login.or.password")); } catch (UserInvalidPasswordException e) { - addFlashError(_("pollen.error.user.bad.login.or.password")); + addFlashError(t("pollen.error.user.bad.login.or.password")); } } 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 33dcf46..a9dc2f9 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 @@ -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 @@ -51,17 +51,17 @@ public class LostPassword extends PollenActionSupport { public String execute() throws Exception { if (StringUtils.isBlank(email) || !StringUtil.isEmail(email)) { - addFlashError(_("pollen.error.lostPassword.email")); + addFlashError(t("pollen.error.lostPassword.email")); } else { try { getUserService().lostPassword(email); - addFlashMessage(_("pollen.information.lostPassword.success")); + addFlashMessage(t("pollen.information.lostPassword.success")); } catch (UserNotFoundException e) { - addFlashError(_("pollen.error.lostPassword.user")); + addFlashError(t("pollen.error.lostPassword.user")); } } return SUCCESS; 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 9e1ac28..8256f1e 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 @@ -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 @@ -63,25 +63,25 @@ public class Register extends PollenActionSupportForEdition { public void validate() { if (StringUtils.isBlank(pollenUserAccount.getLogin())) { - addFieldError("pollenUserAccount.login", _("pollen.error.login.required")); + addFieldError("pollenUserAccount.login", t("pollen.error.login.required")); } if (StringUtils.isBlank(pollenUserAccount.getPassword())) { - addFieldError("pollenUserAccount.password", _("pollen.error.password.required")); + addFieldError("pollenUserAccount.password", t("pollen.error.password.required")); } if (StringUtils.isBlank(getPassword2())) { - addFieldError("password2", _("pollen.error.password2.required")); + addFieldError("password2", t("pollen.error.password2.required")); } if (ObjectUtils.notEqual(getPassword2(), pollenUserAccount.getPassword())) { - addFieldError("password2", _("pollen.error.passwords.not.equals")); + addFieldError("password2", t("pollen.error.passwords.not.equals")); } if (StringUtils.isBlank(pollenUserAccount.getEmail())) { - addFieldError("pollenUserAccount.email", _("pollen.error.email.required")); + addFieldError("pollenUserAccount.email", t("pollen.error.email.required")); } else if (!StringUtil.isEmail(pollenUserAccount.getEmail())) { - addFieldError("pollenUserAccount.email", _("pollen.error.email.invalid")); + addFieldError("pollenUserAccount.email", t("pollen.error.email.invalid")); } } @@ -93,12 +93,12 @@ public class Register extends PollenActionSupportForEdition { UserAccount createdUser = getUserService().createUser(pollenUserAccount, false); getPollenSession().setUserAccount(createdUser); - addFlashMessage(_("pollen.information.your.are.loggued")); + addFlashMessage(t("pollen.information.your.are.loggued")); result = SUCCESS; } catch (UserLoginAlreadyUsedException e) { - addFieldError("pollenUserAccount.login", _("pollen.error.user.login.already.used")); + addFieldError("pollenUserAccount.login", t("pollen.error.user.login.already.used")); } catch (UserEmailAlreadyUsedException e) { - addFieldError("pollenUserAccount.email", _("pollen.error.user.email.already.used")); + addFieldError("pollenUserAccount.email", t("pollen.error.user.email.already.used")); } // if error go back to input 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 5cf3eed..736d98d 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 @@ -22,8 +22,20 @@ */ package org.chorem.pollen.ui.security; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; +import static org.nuiton.i18n.I18n.n_; + +import java.io.IOException; +import java.util.Locale; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.servlet.ServletContext; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.util.StringUtils; @@ -41,21 +53,11 @@ 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 org.nuiton.web.filter.TopiaTransactionFilter; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Locale; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static org.nuiton.i18n.I18n.n_; +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; public abstract class AbstractPollenAuthorization extends AuthorizationFilter { diff --git a/pom.xml b/pom.xml index 8912381..bf6b042 100644 --- a/pom.xml +++ b/pom.xml @@ -162,24 +162,22 @@ <!-- customized versions --> <topiaVersion>2.8</topiaVersion> <eugenePluginVersion>2.6.3</eugenePluginVersion> - <nuitonI18nVersion>2.5.1</nuitonI18nVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> + <nuitonWebVersion>1.18-SNAPSHOT</nuitonWebVersion> + <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> - <nuitonWebVersion>1.13</nuitonWebVersion> - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.176</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.5.0</jqueryPluginVersion> <shiroVersion>1.2.4</shiroVersion> <slf4jVersion>1.7.13</slf4jVersion> - <jettyVersion>8.1.11.v20130520</jettyVersion> - <!--jettyVersion>${jettyPluginVersion}</jettyVersion--> + <jettyVersion>9.3.6.v20151106</jettyVersion> + <jettyPluginVersion>9.3.6.v20151106</jettyPluginVersion> <hibernateVersion>4.2.21.Final</hibernateVersion> <seleniumVersion>2.48.2</seleniumVersion> <mockitoVersion>1.10.19</mockitoVersion> - <httpCommonsHttpclientVersion>4.3</httpCommonsHttpclientVersion> - <pollenI18nBundle>pollen-i18n</pollenI18nBundle> <!-- license to use --> <license.licenseName>agpl_v3</license.licenseName> @@ -308,11 +306,17 @@ <artifactId>nuiton-utils</artifactId> <version>${nuitonUtilsVersion}</version> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>3.0-rc-2</version> + </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0</version> </dependency> <dependency> @@ -458,13 +462,13 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> <version>${jettyVersion}</version> <scope>provided</scope> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.