- Nuiton-web-commits - mailman.cloud.codelutin.com

r306 - in trunk/nuiton-struts2/src: main/java/org/nuiton/web/struts2/converters test/java/org/nuiton/web/struts2/converters
by athimel＠users.nuiton.org Feb. 4, 2014

Feb. 4, 2014

Author: athimel Date: 2014-02-04 19:09:20 +0100 (Tue, 04 Feb 2014) New Revision: 306 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/306 Log: SVN properties and file headers Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java 2014-02-04 18:06:52 UTC (rev 305) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java 2014-02-04 18:09:20 UTC (rev 306) @@ -1,5 +1,29 @@ package org.nuiton.web.struts2.converters; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2014 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% + */ + /** * Same as of {@link LocalNumberConverter} but always use 2 decimals: it's * a suitable default for money, etc. Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-02-04 18:06:52 UTC (rev 305) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-02-04 18:09:20 UTC (rev 306) @@ -1,5 +1,29 @@ package org.nuiton.web.struts2.converters; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2014 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.conversion.TypeConversionException; import com.opensymphony.xwork2.conversion.impl.NumberConverter; import org.apache.commons.lang3.StringUtils; Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-04 18:06:52 UTC (rev 305) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-04 18:09:20 UTC (rev 306) @@ -1,5 +1,29 @@ package org.nuiton.web.struts2.converters; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2014 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 org.junit.Assert; import org.junit.Test; Property changes on: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

Build failed in Jenkins: nuiton-web » Nuiton Web :: Nuiton Security #3
by admin+ci-nuiton.org＠codelutin.com Feb. 4, 2014

Feb. 4, 2014

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-securi…> Changes: [athimel] fixes #3062 Updates nuiton-utils to 3.0-rc-2 fixes #3063 Updates Eugene to 2.7.4 fixes #3064 Updates nuiton-i18n to 3.0 fixes #3065 Updates nuiton-config to 3.0-alpha-2 fixes #3066 Updates topia to 3.0-alpha-10 fixes #3067 Updates mavenpom to 4.7 ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Security 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-security --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-securi…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-security --- [INFO] [INFO] --- eugene-maven-plugin:2.7.4:generate (eugene-generation) @ nuiton-security --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (5 KB at 109.3 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-templates/3.0-al… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (98 KB at 1170.4 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-templates/3.0-al… [WARNING] Failed to getClass for org.nuiton.eugene.plugin.GenerateMojo [JENKINS] Archiving disabled

1 0

r305 - in trunk: . nuiton-security/src/main/java/org/nuiton/web/security/actions nuiton-struts2/src/main/java/org/nuiton/web/struts2
by athimel＠users.nuiton.org Feb. 4, 2014

Feb. 4, 2014

Author: athimel Date: 2014-02-04 19:06:52 +0100 (Tue, 04 Feb 2014) New Revision: 305 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/305 Log: fixes #3062 Updates nuiton-utils to 3.0-rc-2 fixes #3063 Updates Eugene to 2.7.4 fixes #3064 Updates nuiton-i18n to 3.0 fixes #3065 Updates nuiton-config to 3.0-alpha-2 fixes #3066 Updates topia to 3.0-alpha-10 fixes #3067 Updates mavenpom to 4.7 Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java trunk/pom.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2014-02-04 18:06:52 UTC (rev 305) @@ -24,8 +24,6 @@ package org.nuiton.web.security.actions; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.SecurityUtils; @@ -37,6 +35,7 @@ import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; +import org.nuiton.i18n.I18n; import org.nuiton.web.security.SecurityShiroFilter; public class LoginAction extends AbstractAction { @@ -86,19 +85,19 @@ result = SUCCESS; } } catch (UnknownAccountException ex) { - addActionError(_("Identifiant ou mot de passe invalide !")); + addActionError(I18n.t("Identifiant ou mot de passe invalide !")); log.warn("Unknow user account", ex); result = input(); } catch (IncorrectCredentialsException ex) { - addActionError(_("Identifiant ou mot de passe invalide !")); + addActionError(I18n.t("Identifiant ou mot de passe invalide !")); log.warn("Invalid password", ex); result = input(); } catch (LockedAccountException ex) { - addActionError(_("Compte bloqué. Contacter un administrateur")); + addActionError(I18n.t("Compte bloqué. Contacter un administrateur")); log.error("Account locked error", ex); result = input(); } catch (ExcessiveAttemptsException ex) { - addActionError(_("Nombre de tentatives dépassé")); + addActionError(I18n.t("Nombre de tentatives dépassé")); log.error("Excessive attemps error", ex); result = input(); } catch (AuthenticationException ex) { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2014-02-04 18:06:52 UTC (rev 305) @@ -27,14 +27,13 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityTopiaPersistenceContext; import org.nuiton.web.security.SecurityUser; import org.nuiton.web.security.SecurityUserImpl; import org.nuiton.web.security.SecurityUserTopiaDao; -import static org.nuiton.i18n.I18n._; - public class UserAction extends AbstractAction { /** serialVersionUID. */ @@ -97,7 +96,7 @@ public void validate() { if (StringUtils.isNotBlank(password)) { if (!password.equals(confirm)) { - addActionError(_("Les mots de passes ne sont pas identiques !")); + addActionError(I18n.t("Les mots de passes ne sont pas identiques !")); } } } Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2014-02-04 18:06:52 UTC (rev 305) @@ -90,7 +90,7 @@ protected String getTextFromLocale(String key, String defaultValue) { Locale locale = localeProvider.getLocale(); - String result = I18n.l_(locale, key); + String result = I18n.l(locale, key); if (result == null) { result = defaultValue; } @@ -100,7 +100,7 @@ protected String getTextFromLocale(String key, String defaultValue, Object ... args) { Locale locale = localeProvider.getLocale(); - String result = I18n.l_(locale, key, args); + String result = I18n.l(locale, key, args); if (result == null) { result = defaultValue; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/pom.xml 2014-02-04 18:06:52 UTC (rev 305) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.5</version> + <version>4.7</version> </parent> <groupId>org.nuiton.web</groupId> @@ -89,14 +89,14 @@  <projectId>nuiton-web</projectId> - <eugeneVersion>2.7.3</eugeneVersion> + <eugeneVersion>2.7.4</eugeneVersion> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> + <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> + <nuitonI18nVersion>3.0</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-alpha-8</topiaVersion> + <topiaVersion>3.0-alpha-10</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r304 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by bleny＠users.nuiton.org Jan. 27, 2014

Jan. 27, 2014

Author: bleny Date: 2014-01-27 11:44:45 +0100 (Mon, 27 Jan 2014) New Revision: 304 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/304 Log: refs #3010 add a FIXME Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-24 17:14:05 UTC (rev 303) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-27 10:44:45 UTC (rev 304) @@ -84,6 +84,8 @@ if (value == null) { + // FIXME brendan 27/01/14 this is dead code, already lost 1 hour with it + string = formatNullValue(); } else if (value instanceof Integer) {

1 0

r303 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by bleny＠users.nuiton.org Jan. 24, 2014

Jan. 24, 2014

Author: bleny Date: 2014-01-24 18:14:05 +0100 (Fri, 24 Jan 2014) New Revision: 303 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/303 Log: refs #3010 add some variation points in LocalNumberConverter and some javadocs Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-24 13:53:42 UTC (rev 302) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-24 17:14:05 UTC (rev 303) @@ -25,29 +25,38 @@ * <bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" class="org.nuiton.web.struts2.converters.LocalNumberConverter" scope="singleton"/> * </pre> * + * You may tune this converter to your needs by overriding some methods like {@link #formatNullValue()}, + * {@link #getMinDecimals()} or {@link #getMaxDecimals} + * * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> * @since 1.15 */ public class LocalNumberConverter extends NumberConverter { - protected int getMinDecimals() { - return 0; - } - - protected int getMaxDecimals() { - return 3; - } - + /** {@link java.text.DecimalFormat} to use for parsing/formatting {@link int}s and {@link java.lang.Integer} instances */ protected DecimalFormat integerFormat; - protected DecimalFormat decimalFormat; + /** {@link java.text.DecimalFormat} to use for parsing/formatting {@link double}s and {@link java.lang.Double} instances */ + protected DecimalFormat doubleFormat; - public LocalNumberConverter() { - integerFormat = new DecimalFormat("###,##0"); - decimalFormat = new DecimalFormat("###,##0." + StringUtils.repeat("0", getMinDecimals()) + StringUtils.repeat("#", getMaxDecimals() - getMinDecimals())); + protected DecimalFormat getIntegerFormat() { + if (integerFormat == null) { + integerFormat = new DecimalFormat("###,##0"); + } + return integerFormat; } + protected DecimalFormat getDoubleFormat() { + if (doubleFormat == null) { + String pattern = "###,##0." + StringUtils.repeat("0", getMinDecimals()) + StringUtils.repeat("#", getMaxDecimals() - getMinDecimals()); + doubleFormat = new DecimalFormat(pattern); + } + return doubleFormat; + } + + @Override public Object convertValue(Map<String, Object> context, Object target, Member member, String propertyName, Object value, Class toType) { + Object result; if (toType == String.class && (value instanceof Double || value instanceof Integer)) { @@ -75,79 +84,94 @@ if (value == null) { - string = StringUtils.EMPTY; + string = formatNullValue(); } else if (value instanceof Integer) { - string = integerFormat.format(value); + string = getIntegerFormat().format(value); } else { - string = decimalFormat.format(value); + string = getDoubleFormat().format(value); } return string; + } protected Number convertToNumber(String string, Class toType) { Number parsedValue; - if (string == null || string.isEmpty()) { + if (isNullValue(string)) { if (toType.isPrimitive()) { - - if (toType == Double.class || toType == double.class) { - - parsedValue = new Double(0); - + if (toType == double.class) { + parsedValue = 0.; } else { - - parsedValue = new Integer(0); - + parsedValue = 0; } } else { - parsedValue = null; - } } else { - char groupingSeparator = integerFormat.getDecimalFormatSymbols().getGroupingSeparator(); + char groupingSeparator = getIntegerFormat().getDecimalFormatSymbols().getGroupingSeparator(); if (Character.isSpaceChar(groupingSeparator)) { - string = string.replaceAll(" ", groupingSeparator + ""); - } try { if (toType == Double.class || toType == double.class) { - string = string.replace('.', decimalFormat.getDecimalFormatSymbols().getDecimalSeparator()); + string = string.replace('.', getDoubleFormat().getDecimalFormatSymbols().getDecimalSeparator()); - parsedValue = decimalFormat.parse(string).doubleValue(); + parsedValue = getDoubleFormat().parse(string).doubleValue(); } else { - parsedValue = integerFormat.parse(string).intValue(); + parsedValue = getIntegerFormat().parse(string).intValue(); } - } catch (ParseException e ){ + } catch (ParseException e) { + throw new TypeConversionException("unable to parse " + string, e); + } catch (NumberFormatException e) { + throw new TypeConversionException("unable to parse " + string, e); + } - throw new TypeConversionException("strings=" + string, e); + } - } catch (NumberFormatException e ){ + return parsedValue; + } - throw new TypeConversionException("strings=" + string, e); + /** + * Result if formatted object is null. + * + * If you override this method, you probably must override + * {@link #isNullValue(String)} too + */ + protected String formatNullValue() { + return StringUtils.EMPTY; + } - } + /** + * Method to know if a given string should be interpreted as "no value". + */ + protected boolean isNullValue(String string) { + boolean isNullValue = StringUtils.isEmpty(string); + return isNullValue; + } - } + protected int getMinDecimals() { + return 0; + } - return parsedValue; + protected int getMaxDecimals() { + return 3; } + }

1 0

r302 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by bleny＠users.nuiton.org Jan. 24, 2014

Jan. 24, 2014

Author: bleny Date: 2014-01-24 14:53:42 +0100 (Fri, 24 Jan 2014) New Revision: 302 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/302 Log: refs #3010 add a HundredthLocalNumberConverter Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java 2014-01-24 13:53:42 UTC (rev 302) @@ -0,0 +1,21 @@ +package org.nuiton.web.struts2.converters; + +/** + * Same as of {@link LocalNumberConverter} but always use 2 decimals: it's + * a suitable default for money, etc. + * + * @since 1.15 + */ +public class HundredthLocalNumberConverter extends LocalNumberConverter { + + @Override + protected int getMinDecimals () { + return 2; + } + + @Override + protected int getMaxDecimals () { + return 2; + } + +}

1 0

r301 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by sbavencoff＠users.nuiton.org Jan. 22, 2014

Jan. 22, 2014

Author: sbavencoff Date: 2014-01-22 16:28:43 +0100 (Wed, 22 Jan 2014) New Revision: 301 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/301 Log: refs #3010 : add since Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-22 15:21:44 UTC (rev 300) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-22 15:28:43 UTC (rev 301) @@ -26,6 +26,7 @@ * </pre> * * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + * @since 1.15 */ public class LocalNumberConverter extends NumberConverter {

1 0

r300 - in trunk/nuiton-struts2/src: main/java/org/nuiton/web/struts2/converters test/java/org/nuiton/web/struts2 test/java/org/nuiton/web/struts2/converters
by sbavencoff＠users.nuiton.org Jan. 22, 2014

Jan. 22, 2014

Author: sbavencoff Date: 2014-01-22 16:21:44 +0100 (Wed, 22 Jan 2014) New Revision: 300 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/300 Log: refs #3010 : create a number converter with local parameters Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2014-01-06 18:07:49 UTC (rev 299) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2014-01-22 15:21:44 UTC (rev 300) @@ -24,13 +24,12 @@ * #L% */ -import java.util.Arrays; -import java.util.Map; - +import com.opensymphony.xwork2.conversion.TypeConversionException; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.util.StrutsTypeConverter; -import com.opensymphony.xwork2.conversion.TypeConversionException; +import java.util.Arrays; +import java.util.Map; /** * Let user input either "0.1" or "0,1" as a double value. To use this converter, add the following lines in your @@ -42,7 +41,10 @@ * </pre> * * @author Arnaud Thimel <thimel(a)codelutin.com> + * @Deprecated since 1.15 prefer use LocalNumberConverter */ + +@Deprecated public class DoubleConverter extends StrutsTypeConverter { @Override Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-01-22 15:21:44 UTC (rev 300) @@ -0,0 +1,152 @@ +package org.nuiton.web.struts2.converters; + +import com.opensymphony.xwork2.conversion.TypeConversionException; +import com.opensymphony.xwork2.conversion.impl.NumberConverter; +import org.apache.commons.lang3.StringUtils; + +import java.lang.reflect.Member; +import java.text.DecimalFormat; +import java.text.ParseException; +import java.util.Map; + +/** + * this class convert a double and integer with local format or standard format + * To use this converter, add the following lines in your + * <code>classpath:xwork-conversion.properties</code> file : + * + * <pre> + * java.lang.Double=org.nuiton.web.struts2.converters.LocalNumberConverter + * java.lang.Integer=org.nuiton.web.struts2.converters.LocalNumberConverter + * </pre> + * + * <code>classpath:struts.xml</code> file : + * + * <pre> + * <bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" class="org.nuiton.web.struts2.converters.LocalNumberConverter" scope="singleton"/> + * </pre> + * + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class LocalNumberConverter extends NumberConverter { + + protected int getMinDecimals() { + return 0; + } + + protected int getMaxDecimals() { + return 3; + } + + protected DecimalFormat integerFormat; + + protected DecimalFormat decimalFormat; + + public LocalNumberConverter() { + integerFormat = new DecimalFormat("###,##0"); + decimalFormat = new DecimalFormat("###,##0." + StringUtils.repeat("0", getMinDecimals()) + StringUtils.repeat("#", getMaxDecimals() - getMinDecimals())); + } + + public Object convertValue(Map<String, Object> context, Object target, Member member, String propertyName, Object value, Class toType) { + Object result; + + if (toType == String.class && (value instanceof Double || value instanceof Integer)) { + + result = convertToString(value); + + } else if (value instanceof String + && (toType == Double.class || toType == double.class || toType == Integer.class || toType == int.class)) { + + result = convertToNumber((String) value, toType); + + } else { + + result = super.convertValue(context, target, member, propertyName, value, toType); + + } + + return result; + + } + + protected String convertToString(Object value) { + + String string; + + if (value == null) { + + string = StringUtils.EMPTY; + + } else if (value instanceof Integer) { + + string = integerFormat.format(value); + + } else { + + string = decimalFormat.format(value); + + } + + return string; + } + + protected Number convertToNumber(String string, Class toType) { + Number parsedValue; + + if (string == null || string.isEmpty()) { + + if (toType.isPrimitive()) { + + if (toType == Double.class || toType == double.class) { + + parsedValue = new Double(0); + + } else { + + parsedValue = new Integer(0); + + } + } else { + + parsedValue = null; + + } + + } else { + + char groupingSeparator = integerFormat.getDecimalFormatSymbols().getGroupingSeparator(); + + if (Character.isSpaceChar(groupingSeparator)) { + + string = string.replaceAll(" ", groupingSeparator + ""); + + } + + try { + + if (toType == Double.class || toType == double.class) { + + string = string.replace('.', decimalFormat.getDecimalFormatSymbols().getDecimalSeparator()); + + parsedValue = decimalFormat.parse(string).doubleValue(); + + } else { + + parsedValue = integerFormat.parse(string).intValue(); + + } + + } catch (ParseException e ){ + + throw new TypeConversionException("strings=" + string, e); + + } catch (NumberFormatException e ){ + + throw new TypeConversionException("strings=" + string, e); + + } + + } + + return parsedValue; + } +} Added: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java (rev 0) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-01-22 15:21:44 UTC (rev 300) @@ -0,0 +1,327 @@ +package org.nuiton.web.struts2.converters; + +import org.junit.Assert; +import org.junit.Test; + +import java.text.DecimalFormatSymbols; +import java.util.Locale; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class LocalNumberConverterTest { + + protected LocalNumberConverter converter; + + protected Object convert(Object value, Class toType) { + return converter.convertValue(null, null, null, "", value, toType); + } + + @Test + public void testConvertValue() { + converter = new LocalNumberConverter(); + + DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.getDefault(Locale.Category.FORMAT)); + + symbols.getCurrency(); + char minusSign = symbols.getMinusSign(); + char groupingSeparator = symbols.getGroupingSeparator(); + char decimalSeparator = symbols.getDecimalSeparator(); + + + // Integer to String + Assert.assertEquals("0", + convert(0, String.class)); + + Assert.assertEquals("0", + convert(new Integer(0), String.class)); + + Assert.assertEquals("18", + convert(18, String.class)); + + Assert.assertEquals("18", + convert(new Integer(18), String.class), "18"); + + Assert.assertEquals(minusSign + "18", + convert(-18, String.class)); + + Assert.assertEquals(minusSign + "18", + convert(new Integer(-18), String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(1000008, String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(new Integer(1000008), String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(-1000008, String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(new Integer(-1000008), String.class)); + + // Double to String + Assert.assertEquals("0", + convert(0, String.class)); + + Assert.assertEquals("0", + convert(new Double(0), String.class)); + + Assert.assertEquals("18", + convert(18, String.class)); + + Assert.assertEquals("18", convert(new Double(18), String.class)); + + Assert.assertEquals(minusSign + "18", + convert(-18, String.class)); + + Assert.assertEquals(minusSign + "18", + convert(new Double(-18), String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(1000008, String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(new Double(1000008), String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(-1000008, String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", + convert(new Double(-1000008), String.class)); + + Assert.assertEquals("0" + decimalSeparator + "58", + convert(0.58, String.class)); + + Assert.assertEquals("0" + decimalSeparator + "58", + convert(new Double(0.58), String.class)); + + Assert.assertEquals("18" + decimalSeparator + "58", + convert(18.58, String.class)); + + Assert.assertEquals("18" + decimalSeparator + "58", + convert(new Double(18.58), String.class)); + + Assert.assertEquals(minusSign + "18" + decimalSeparator + "58", + convert(-18.58, String.class)); + + Assert.assertEquals(minusSign + "18" + decimalSeparator + "58", + convert(new Double(-18.58), String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", + convert(1000008.58, String.class)); + + Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", + convert(new Double(1000008.58), String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", + convert(-1000008.58, String.class)); + + Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", + convert(new Double(-1000008.58), String.class)); + + Assert.assertEquals("0" + decimalSeparator + "586", + convert(0.5864, String.class)); + + Assert.assertEquals("0" + decimalSeparator + "586", + convert(new Double(0.5864), String.class)); + + Assert.assertEquals("0" + decimalSeparator + "587", + convert(0.5867, String.class)); + + Assert.assertEquals("0" + decimalSeparator + "587", + convert(new Double(0.5867), String.class)); + + // String to Integer + Assert.assertEquals(0, + convert(null, int.class)); + + Assert.assertEquals(null, + convert(null, Integer.class)); + + Assert.assertEquals(0, + convert("", int.class)); + + Assert.assertEquals(null, + convert("", Integer.class)); + + Assert.assertEquals(0, + convert("0", int.class)); + + Assert.assertEquals(new Integer(0), + convert("0", Integer.class)); + + Assert.assertEquals(12, + convert("12", int.class)); + + Assert.assertEquals(new Integer(12), + convert("12", Integer.class)); + + Assert.assertEquals(-12, + convert(minusSign + "12", int.class)); + + Assert.assertEquals(new Integer(-12), + convert(minusSign + "12", Integer.class)); + + if (Character.isSpaceChar(groupingSeparator)) { + + Assert.assertEquals(1002, + convert("1 002", int.class)); + + Assert.assertEquals(new Integer(1002), + convert("1 002", Integer.class)); + + Assert.assertEquals(-1002, + convert(minusSign + "1 002", int.class)); + + Assert.assertEquals(new Integer(-1002), + convert(minusSign + "1 002", Integer.class)); + + } + + Assert.assertEquals(1002, + convert("1" + groupingSeparator + "002", int.class)); + Assert.assertEquals(new Integer(1002), + convert("1" + groupingSeparator + "002", Integer.class)); + + Assert.assertEquals(-1002, + convert(minusSign + "1" + groupingSeparator + "002", int.class)); + + Assert.assertEquals(new Integer(-1002), + convert(minusSign + "1" + groupingSeparator + "002", Integer.class)); + + // String to Double + Assert.assertEquals(0d, + convert(null, double.class)); + + Assert.assertEquals(null, + convert(null, Double.class)); + + Assert.assertEquals(0d, + convert("", double.class)); + + Assert.assertEquals(null, + convert("", Double.class)); + + Assert.assertEquals(0d, + convert("0", double.class)); + + Assert.assertEquals(new Double(0), + convert("0", Double.class)); + + Assert.assertEquals(12d, + convert("12", double.class)); + + Assert.assertEquals(new Double(12), + convert("12", Double.class)); + + Assert.assertEquals(-12d, + convert(minusSign + "12", double.class)); + + Assert.assertEquals(new Double(-12), + convert(minusSign + "12", Double.class)); + + + if (Character.isSpaceChar(groupingSeparator)) { + + Assert.assertEquals(1002d, + convert("1 002", double.class)); + + Assert.assertEquals(new Double(1002), + convert("1 002", Double.class)); + + Assert.assertEquals(-1002d, + convert(minusSign + "1 002", double.class)); + + Assert.assertEquals(new Double(-1002), + convert(minusSign + "1 002", Double.class)); + + } + + Assert.assertEquals(1002d, + convert("1" + groupingSeparator + "002", double.class)); + + Assert.assertEquals(new Double(1002), + convert("1" + groupingSeparator + "002", Double.class)); + + Assert.assertEquals(-1002d, + convert(minusSign + "1" + groupingSeparator + "002", double.class)); + + Assert.assertEquals(new Double(-1002), + convert(minusSign + "1" + groupingSeparator + "002", Double.class)); + + Assert.assertEquals(0.36, + convert("0" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(0.36), + convert("0" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(12.36, + convert("12" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(12.36), + convert("12" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(-12.36, + convert(minusSign + "12" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(-12.36), + convert(minusSign + "12" + decimalSeparator + "36", Double.class)); + + + if (Character.isSpaceChar(groupingSeparator)) { + + Assert.assertEquals(1002.36, + convert("1 002" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(1002.36), + convert("1 002" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(-1002.36, + convert(minusSign + "1 002" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(-1002.36), + convert(minusSign + "1 002" + decimalSeparator + "36", Double.class)); + + } + + Assert.assertEquals(1002.36, + convert("1" + groupingSeparator + "002" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(1002.36), + convert("1" + groupingSeparator + "002" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(-1002.36, + convert(minusSign + "1" + groupingSeparator + "002" + decimalSeparator + "36", double.class)); + + Assert.assertEquals(new Double(-1002.36), + convert(minusSign + "1" + groupingSeparator + "002" + decimalSeparator + "36", Double.class)); + + Assert.assertEquals(12.3669, + convert("12" + decimalSeparator + "3669", double.class)); + + Assert.assertEquals(new Double(12.3669), + convert("12" + decimalSeparator + "3669", Double.class)); + + Assert.assertEquals(12.36, + convert("12.36", double.class)); + + Assert.assertEquals(new Double(12.36), + convert("12.36", Double.class)); + + Assert.assertEquals(1002.36, + convert("1 002.36", double.class)); + + Assert.assertEquals(new Double(1002.36), + convert("1 002.36", Double.class)); + + Assert.assertEquals(1002.36, + convert("1002.36", double.class)); + + Assert.assertEquals(new Double(1002.36), + convert("1002.36", Double.class)); + + } + + +}

1 0

[ANN] - Nuiton Web 1.15-alpha-2 released
by nuiton.org Release Notification Jan. 6, 2014

Jan. 6, 2014

The Nuiton Web team is pleased to announce the nuiton-web-parent-1.15-alpha-2 release! Common ressources for web applications Documentation of the project can be found here: http://maven-site.nuiton.org/nuiton-web/ Changes ------- Changes in this version include: New features: o Use topia 3.0-alpha-8 Issue: 2979. Thanks to Tony Chemit. Resolved by tchemit. o Add a new filter to deal with typed persistence context Issue: 2975. Thanks to Tony Chemit. Resolved by tchemit. Changes: o updates mavenpom to 4.5 + tidy poms and site.xml Issue: 2987. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://nuiton.org/projects/nuiton-web/files * nuiton-rss-1.15-alpha-2-deps.zip - http://nuiton.org/attachments/download/986 * nuiton-rss-1.15-alpha-2-full.zip - http://nuiton.org/attachments/download/987 * nuiton-web-1.15-alpha-2-deps.zip - http://nuiton.org/attachments/download/988 * nuiton-web-1.15-alpha-2-full.zip - http://nuiton.org/attachments/download/989 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.web|nuiton-web-parent|1… Have fun! -Nuiton Web team

1 0

r299 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org Jan. 6, 2014

Jan. 6, 2014

Author: maven-release Date: 2014-01-06 19:07:49 +0100 (Mon, 06 Jan 2014) New Revision: 299 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/299 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-gwt/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-rss/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-security/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-struts2/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-tapestry/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/nuiton-web/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-06 18:07:47 UTC (rev 298) +++ trunk/pom.xml 2014-01-06 18:07:49 UTC (rev 299) @@ -10,7 +10,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-2</version> + <version>1.15-SNAPSHOT</version> <packaging>pom</packaging> <name>Nuiton Web</name> @@ -71,11 +71,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-2 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1.15-…</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0