February 2011 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r2076 - trunk/nuiton-utils/src/site/apt
by echatellier＠users.nuiton.org 04 Feb '11

04 Feb '11

Author: echatellier Date: 2011-02-04 14:26:22 +0100 (Fri, 04 Feb 2011) New Revision: 2076 Url: http://nuiton.org/repositories/revision/nuiton-utils/2076 Log: Update doc about app.name option Modified: trunk/nuiton-utils/src/site/apt/ApplicationConfig.apt Modified: trunk/nuiton-utils/src/site/apt/ApplicationConfig.apt =================================================================== --- trunk/nuiton-utils/src/site/apt/ApplicationConfig.apt 2011-02-04 13:22:43 UTC (rev 2075) +++ trunk/nuiton-utils/src/site/apt/ApplicationConfig.apt 2011-02-04 13:26:22 UTC (rev 2076) @@ -12,7 +12,7 @@ ~~ $Id$ ~~ $HeadURL$ ~~ %% -~~ Copyright (C) 2004 - 2010 CodeLutin +~~ Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric ~~ %% ~~ This program is free software: you can redistribute it and/or modify ~~ it under the terms of the GNU Lesser General Public License as @@ -50,9 +50,9 @@ * Lecture des fichiers de configuration La lecture des fichiers de configuration est effectuées lors de l'appel - à la methode <<<parse(String[])>>> en utilisant la valeur de + à la methode <<<parse(String...)>>> en utilisant la valeur de <<<getConfigFileName()>>> pour trouver les fichiers à lire. - + * La sauvegarde La sauvegarde des options se fait via une des trois methodes disponibles : @@ -69,6 +69,18 @@ <<<setOption()>>> seront sauvegardée. Les variable d'envirronement, les arguments de la ligne de commandes(etc...) ne seront pas sauvegardées. +* Configuration multi instance + + Il est possible d'associé un nom de contexte a une configuration via la + methode <<<setAppName("azerty")>>>. Ainsi, les fichiers seront cherchés + dans le dossier définit par l'option <<<azerty.config.path>>> si elle existe + (sinon, dans le dossier par defaut) et le nom du fichier cherché defini + par l'option <<<azerty.config.file>>>. + + Cett option est utilise par exemple pour installer plusieurs instance + d'application dans un serveur web et que chaque instance aille + chercher ses fichiers de configuration à son propre endroit. + Fonctionnalités * Les options de configuration

1 0

r2075 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 04 Feb '11

04 Feb '11

Author: echatellier Date: 2011-02-04 14:22:43 +0100 (Fri, 04 Feb 2011) New Revision: 2075 Url: http://nuiton.org/repositories/revision/nuiton-utils/2075 Log: Javadoc Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-02-04 13:17:49 UTC (rev 2074) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-02-04 13:22:43 UTC (rev 2075) @@ -279,7 +279,7 @@ /** Configuration file key option. */ static final public String CONFIG_FILE_NAME = "config.file"; - /** Permet d'associer un nom de contexte pour prefixer les options {@link #CONFIG_PATH} et {@link #CONFIG_FILE_NAME}. */ + /**Permet d'associer un nom de contexte pour prefixer les options {@link #CONFIG_PATH} et {@link #CONFIG_FILE_NAME}. */ static final public String APP_NAME = "app.name"; /** @@ -1001,8 +1001,10 @@ /** * Use appName to add a context in config.file and config.path options. - * Ex for an application named 'pollen' : config.file option becomes - * pollen.config.file + * + * Ex for an application named 'pollen' : {@code config.file} option becomes + * {@code pollen.config.file} and {@code config.path} becomes + * {@code pollen.config.path} * * @param appName to use as application context * @since 1.2.1

1 0

r2074 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 04 Feb '11

04 Feb '11

Author: echatellier Date: 2011-02-04 14:17:49 +0100 (Fri, 04 Feb 2011) New Revision: 2074 Url: http://nuiton.org/repositories/revision/nuiton-utils/2074 Log: Fix todo Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-02-04 13:11:46 UTC (rev 2073) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-02-04 13:17:49 UTC (rev 2074) @@ -271,7 +271,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(ApplicationConfig.class); - + /** Used to know what is separator between class and method on command line. */ static final private String CLASS_METHOD_SEPARATOR = "#"; static final public String LIST_SEPARATOR = ","; @@ -279,7 +279,7 @@ /** Configuration file key option. */ static final public String CONFIG_FILE_NAME = "config.file"; - /** TODO */ + /** Permet d'associer un nom de contexte pour prefixer les options {@link #CONFIG_PATH} et {@link #CONFIG_FILE_NAME}. */ static final public String APP_NAME = "app.name"; /**

1 0

r2073 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 04 Feb '11

04 Feb '11

Author: echatellier Date: 2011-02-04 14:11:46 +0100 (Fri, 04 Feb 2011) New Revision: 2073 Url: http://nuiton.org/repositories/revision/nuiton-utils/2073 Log: Improve log debug message Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-02-03 14:10:58 UTC (rev 2072) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-02-04 13:11:46 UTC (rev 2073) @@ -1035,7 +1035,7 @@ result = getSystemConfigurationPath(); } if (log.isDebugEnabled()) { - log.debug(result); + log.debug("Configuration path used : " + result); } return result; }

1 0

r2072 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by echatellier＠users.nuiton.org 03 Feb '11

03 Feb '11

Author: echatellier Date: 2011-02-03 15:10:58 +0100 (Thu, 03 Feb 2011) New Revision: 2072 Url: http://nuiton.org/repositories/revision/nuiton-utils/2072 Log: Unaccent method remove whitespaces Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2011-01-31 13:32:19 UTC (rev 2071) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2011-02-03 14:10:58 UTC (rev 2072) @@ -42,6 +42,7 @@ import java.security.NoSuchAlgorithmException; import java.text.DateFormat; import java.text.MessageFormat; +import java.text.Normalizer; import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; @@ -73,42 +74,9 @@ * @return la chaine sans accent */ static public String unaccent(String s) { - String result = ""; - for (char c : s.toCharArray()) { - if ("éèêë".indexOf(c) != -1) { - result += "e"; - } else if ("àäâ".indexOf(c) != -1) { - result += "a"; - } else if ("ç".indexOf(c) != -1) { - result += "c"; - } else if ("îï".indexOf(c) != -1) { - result += "i"; - } else if ("ôö".indexOf(c) != -1) { - result += "o"; - } else if ("ùûü".indexOf(c) != -1) { - result += "u"; - } else if ("ÉÈÊË".indexOf(c) != -1) { - result += "E"; - } else if ("ÀÂÄ".indexOf(c) != -1) { - result += "A"; - } else if ("Ç".indexOf(c) != -1) { - result += "C"; - } else if ("ÎÏ".indexOf(c) != -1) { - result += "I"; - } else if ("ÔÖ".indexOf(c) != -1) { - result += "O"; - } else if ("ÙÛÜ".indexOf(c) != -1) { - result += "U"; - } else if ('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' - || '0' <= c && c <= '9' || '.' == c || '-' == c - || '_' == c) { - result += c; - } else { - // on ne l'ajoute pas a result donc on supprime le caractere - // result += encodeUTF(c); - } - } - return result; + // this is java 1.6 code + String temp = Normalizer.normalize(s, Normalizer.Form.NFD); + return temp.replaceAll("[^\\p{ASCII}]",""); } /** Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java 2011-01-31 13:32:19 UTC (rev 2071) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java 2011-02-03 14:10:58 UTC (rev 2072) @@ -172,14 +172,17 @@ } /** - * FIXME EC20100928 : this test and method is buggy (should not remove spaces). + * Since 2.1, this method doesn't not remove whitespaces. * * @throws Exception */ @Test public void testUnaccent() throws Exception { - assertEquals("-aaaeeeeiioouuuc0123456789AAAEEEEIIOOUUUC._", + assertEquals("-aaaeeeeiioouuuc 0123456789 AAAEEEEIIOOUUUC._", StringUtil.unaccent("-àâäéèêëîïôöùûüç 0123456789 ÀÂÄÉÈÊËÎÏÔÖÙÛÜÇ._")); + + assertEquals("test en ete", + StringUtil.unaccent("test en été")); } @Test

1 0