branch develop updated (e47aef9 -> fc77513)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git from e47aef9 fixes #122: Update to struts 2.5.12 new 7d47b76 fixes #122: Fix tests new fc77513 fixes #123: Update libs The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fc77513d08b3026a74d2a0774fc363e46c894f26 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Aug 30 17:22:03 2017 +0200 fixes #123: Update libs commit 7d47b763e04e8a2b7061947d90bf451887ab9ace Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Aug 30 17:21:02 2017 +0200 fixes #122: Fix tests Summary of changes: .../web/struts2/I18nTextProviderFactory.java | 22 ++++++ .../nuiton/web/struts2/I18nTextProviderTest.java | 17 +++- pom.xml | 92 ++++++---------------- 3 files changed, 62 insertions(+), 69 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git commit 7d47b763e04e8a2b7061947d90bf451887ab9ace Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Aug 30 17:21:02 2017 +0200 fixes #122: Fix tests --- .../web/struts2/I18nTextProviderFactory.java | 22 ++++++++++++++++++++++ .../nuiton/web/struts2/I18nTextProviderTest.java | 17 ++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProviderFactory.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProviderFactory.java index 3ab3a3e..84587c5 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProviderFactory.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProviderFactory.java @@ -1,5 +1,27 @@ package org.nuiton.web.struts2; +/*- + * #%L + * Nuiton Web :: Nuiton Struts 2 + * %% + * Copyright (C) 2010 - 2017 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% + */ + import com.opensymphony.xwork2.StrutsTextProviderFactory; import com.opensymphony.xwork2.TextProvider; diff --git a/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java b/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java index e0447cd..d7cc509 100644 --- a/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java +++ b/nuiton-struts2/src/test/java/org/nuiton/web/struts2/I18nTextProviderTest.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.Locale; import com.opensymphony.xwork2.DefaultLocaleProvider; +import com.opensymphony.xwork2.LocaleProvider; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -47,13 +48,23 @@ public class I18nTextProviderTest { initializer.setMissingKeyReturnNull(true); I18n.init(initializer, Locale.FRENCH); - provider = new I18nTextProvider(); - provider.setLocaleProvider(new DefaultLocaleProvider() { + LocaleProvider localeProvider = new LocaleProvider() { @Override public Locale getLocale() { return Locale.FRENCH; } - }); + + @Override + public boolean isValidLocaleString(String localeStr) { + return false; + } + + @Override + public boolean isValidLocale(Locale locale) { + return false; + } + }; + provider = new I18nTextProvider((Class)null, localeProvider, null); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git commit fc77513d08b3026a74d2a0774fc363e46c894f26 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Aug 30 17:22:03 2017 +0200 fixes #123: Update libs --- pom.xml | 92 +++++++++++++++++++---------------------------------------------- 1 file changed, 26 insertions(+), 66 deletions(-) diff --git a/pom.xml b/pom.xml index a0103a5..6ae8558 100644 --- a/pom.xml +++ b/pom.xml @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L -Nuiton Web -%% -Copyright (C) 2008 - 2016 CodeLutin, Tony Chemit -%% -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% + Nuiton Web + %% + Copyright (C) 2008 - 2017 CodeLutin, Tony Chemit + %% + 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% --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -116,28 +116,21 @@ License along with this program. If not, see <eugeneVersion>3.0-alpha-9</eugeneVersion> - <nuitonConfigVersion>3.1</nuitonConfigVersion> - <nuitonI18nVersion>3.6.2</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> + <nuitonConfigVersion>3.2</nuitonConfigVersion> + <nuitonI18nVersion>3.6.3</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.1.3.2</topiaVersion> + <topiaVersion>3.2.1</topiaVersion> - <!-- Tapestry --> - <tapestryVersion>5.2.4</tapestryVersion> - <!-- Do not upgrade to 5.3.x because on some incompatibilities --> - <slf4jVersion>1.7.21</slf4jVersion> - - <!-- GWT --> - <gwtVersion>2.2.0</gwtVersion> - <gwtPluginVersion>2.2.0</gwtPluginVersion> + <slf4jVersion>1.7.25</slf4jVersion> <!-- Strust 2 --> <struts2Version>2.5.12</struts2Version> - <shiroVersion>1.3.2</shiroVersion> + <shiroVersion>1.4.0</shiroVersion> <servletApiVersion>3.0.1</servletApiVersion> - <jettyVersion>9.4.0.v20161208</jettyVersion> + <jettyVersion>9.2.22.v20170606</jettyVersion> <!--Multilanguage maven-site --> <locales>fr</locales> @@ -156,7 +149,7 @@ License along with this program. If not, see <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> + <version>3.6</version> </dependency> <dependency> @@ -196,31 +189,6 @@ License along with this program. If not, see <version>${jettyVersion}</version> </dependency> - <!-- Tapestry --> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>${tapestryVersion}</version> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-ioc</artifactId> - <version>${tapestryVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry5-annotations</artifactId> - <version>${tapestryVersion}</version> - </dependency> - <!-- sl4j dependencies --> <dependency> <groupId>org.slf4j</groupId> @@ -317,14 +285,6 @@ License along with this program. If not, see <scope>provided</scope> </dependency> - <!-- GWT dependencies (from central repo) --> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwtVersion}</version> - <scope>provided</scope> - </dependency> - <!-- Struts 2 --> <dependency> <groupId>org.apache.struts</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm