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

r2085 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 23 Feb '11

23 Feb '11

Author: bpoussin Date: 2011-02-23 13:00:57 +0100 (Wed, 23 Feb 2011) New Revision: 2085 Url: http://nuiton.org/repositories/revision/nuiton-utils/2085 Log: Evolution #1353: enhance TimeTrace to permit to use it like log Evolution #1354: enhance TimeTrace to permit to add message and chain add call Evolution #1355: Rename TimeTrace to TimeLog Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/TimeLog.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/TimeTrace.java Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/TimeLog.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/TimeLog.java (rev 0) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/TimeLog.java 2011-02-23 12:00:57 UTC (rev 2085) @@ -0,0 +1,241 @@ +/* + * #%L + * Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin, Benjamin POUSSIN + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.util; + +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Cette classe permet de facilement trace le temps d'execution entre deux points + * + * usage + * <pre> + * final static private Log log = LogFactory.getLog(MyClass.class); + * final static private TimeLog timeLog = new TimeLog(MyClass.class, 5000, 1000); + * + * + * long start = timeLog.getTime(); + * ... + * // do some work + * ... + * start = timeLog.log(start, "MyMethod step 1", "do some work"); + * ... + * // do some work + * ... + * timeLog.log(start, "MyMethod step 2", "do other work"); + * + * + * System.out.println ("time: " + timeLog.getCallCount()); + * </pre> + * + * You can configure log level in configuration file with: + * log4j.logger.org.codelutin.MyClass=DEBUG + * log4j.logger.org.codelutin.MyClass.TimeLog=INFO + * + * @see CallAnalyse + * @author poussin + * @version $Revision: 1985 $ + * @since 2.1 + * + * Last update: $Date: 2010-12-23 12:45:57 +0100 (jeu. 23 déc. 2010) $ + * by : $Author: sletellier $ + */ +public class TimeLog { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(TimeLog.class); + + static public class CallStat { + long callNumber = 0; + long callTime = 0; + + @Override + public String toString() { + String callTimeString = + StringUtil.convertTime(callTime); + String avgTimeString = + StringUtil.convertTime((callTime/ callNumber)); + return String.format("total call %s, total time %s, avg time %s", + callNumber, callTimeString, avgTimeString); + } + + } + + /** loggueur used to log time */ + protected Log timeLog; + /** time to trigger log time in info level (ns) (default: 1s) */ + protected long timeToLogInfo = 1000l * 1000000l; + /** time to trigger log time in warn level (ns) (default: 3s) */ + protected long timeToLogWarn = 3000l * 1000000l; + + /** for each method of all proxies, keep number of call */ + protected Map<String, CallStat> callCount = new HashMap<String, CallStat>(); + + /** + * + * @param logTime log used to log time message. + */ + protected TimeLog(Log logTime) { + this.timeLog = logTime; + } + + /** + * + * @param logName log category used to log time message. This category must + * be category used to log message in classe that use this TimeLog + * (normaly class name). TimeLog is added at the end. + */ + public TimeLog(String logName) { + this(LogFactory.getLog(logName + ".TimeLog")); + } + + /** + * @param logName log category used to log time message. This category must + * be category used to log message in classe that use this TimeLog + * (normaly class name) + * @since 2.1 + */ + public TimeLog(Class logName) { + this(logName.getName()); + } + + /** + * + * @param logName log category used to log time message. This category must + * be category used to log message in classe that use this TimeLog + * (normaly class name) + * @param timeToLogInfo time in milliseconde after that we log info + * @param timeToLogWarn time in milliseconde after that we log warn + */ + public TimeLog(String logName, long timeToLogInfo, long timeToLogWarn) { + this(logName); + setTimeToLogInfo(timeToLogInfo); + setTimeToLogWarn(timeToLogWarn); + } + + /** + * + * @param logName log category used to log time message. This category must + * be category used to log message in classe that use this TimeLog + * (normaly class name) + * @param timeToLogInfo time in milliseconde after that we log info + * @param timeToLogWarn time in milliseconde after that we log warn + */ + public TimeLog(Class logName, long timeToLogInfo, long timeToLogWarn) { + this(logName.getName(), timeToLogInfo, timeToLogWarn); + } + + /** + * + * @param timeToLogInfoMs time in milliseconde after that we log info + */ + public void setTimeToLogInfo(long timeToLogInfoMs) { + this.timeToLogInfo = timeToLogInfoMs * 1000000l; // convert ms -> ns + } + + /** + * + * @param timeToWarnInfoMs time in milliseconde after that we log warn + */ + public void setTimeToLogWarn(long timeToLogWarnMs) { + this.timeToLogWarn = timeToLogWarnMs * 1000000l; // convert ms -> ns + } + + public Map<String, CallStat> getCallCount() { + return callCount; + } + + /** + * return time in format acceptable for {@link #add(timeToLogInfo, timeToLogInfo, null)} + * @return + */ + static public long getTime() { + return System.nanoTime(); + } + + /** + * add new trace, stop time is automaticaly computed + * + * @param startNs time returned by {@link #getTime()} method + * @param methodName key name to store this time + */ + public void log(long startNs, String methodName) { + log(startNs, getTime(), methodName, ""); + } + + /** + * add new trace, stop time is automaticaly computed + * + * @param startNs time returned by {@link #getTime()} method + * @param methodName key name to store this time + * @param msg message to add to log + * @return time used as stop time, this permit to chain many add in same + * method to trace time. + */ + public long log(long startNs, String methodName, String msg) { + long result = log(startNs, getTime(), methodName, msg); + return result; + } + + /** + * add new trace + * + * @param startNs time returned by {@link #getTime()} method + * @param stopNs time returned by {@link #getTime()} method + * @param methodName key name to store this time + * @param msg message to add to log + * @return time used as stop time (stopNs) + */ + public long log(long startNs, long stopNs, String methodName, String msg) { + long time = stopNs - startNs; + + // incremente le nombre d'appel pour cette methode + CallStat calls = callCount.get(methodName); + if (calls == null) { + // is not thread safe, but if we lose one or two call, is not importante + calls = new CallStat(); + callCount.put(methodName, calls); + } + calls.callNumber++; + calls.callTime += time; + + // affiche le temps de l'appel si necessaire + String timeString = StringUtil.convertTime(time); + String message = String.format("[%s] for method '%s', %s (%s)", + timeString, methodName, msg, calls); + + if (time > timeToLogWarn && timeLog.isWarnEnabled()) { + timeLog.warn(message); + } else if (time > timeToLogInfo && timeLog.isInfoEnabled()) { + timeLog.info(message); + } else if (timeLog.isDebugEnabled()) { + timeLog.debug(message); + } + return stopNs; + } + +} Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/TimeTrace.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/TimeTrace.java 2011-02-21 11:11:50 UTC (rev 2084) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/TimeTrace.java 2011-02-23 12:00:57 UTC (rev 2085) @@ -50,10 +50,12 @@ * @see CallAnalyse * @author poussin * @version $Revision$ + * @deprecated since 2.1 use {@link org.nuiton.util.TimeLog} * * Last update: $Date$ * by : $Author$ */ +@Deprecated public class TimeTrace { /** to use log facility, just put in your code: log.info(\"...\"); */

1 0

r2084 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by bleny＠users.nuiton.org 21 Feb '11

21 Feb '11

Author: bleny Date: 2011-02-21 12:11:50 +0100 (Mon, 21 Feb 2011) New Revision: 2084 Url: http://nuiton.org/repositories/revision/nuiton-utils/2084 Log: add javadoc on StringUtil.isEmail Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.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-02-16 21:26:45 UTC (rev 2083) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2011-02-21 11:11:50 UTC (rev 2084) @@ -79,8 +79,14 @@ return temp.replaceAll("[^\\p{ASCII}]",""); } - public static boolean isEmail(String email) { - return email.matches("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9\\-]*[a-z0-9])?$"); + /** Know if a string is a valid e-mail. + * + * @param str a string + * @return true if <code>str</code> is syntactically a valid e-mail address + * @since 2.1 + */ + public static boolean isEmail(String str) { + return str.matches("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9\\-]*[a-z0-9])?$"); } /**

1 0

r2083 - trunk
by tchemit＠users.nuiton.org 16 Feb '11

16 Feb '11

Author: tchemit Date: 2011-02-16 22:26:45 +0100 (Wed, 16 Feb 2011) New Revision: 2083 Url: http://nuiton.org/repositories/revision/nuiton-utils/2083 Log: Update mavenpom4redmineAndCentral to 2.5.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-10 11:09:59 UTC (rev 2082) +++ trunk/pom.xml 2011-02-16 21:26:45 UTC (rev 2083) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5</version> + <version>2.5.1</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

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

10 Feb '11

Author: echatellier Date: 2011-02-10 12:09:59 +0100 (Thu, 10 Feb 2011) New Revision: 2082 Url: http://nuiton.org/repositories/revision/nuiton-utils/2082 Log: Replace code by link Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java 2011-02-10 10:18:05 UTC (rev 2081) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java 2011-02-10 11:09:59 UTC (rev 2082) @@ -284,7 +284,7 @@ * Retourner la liste des fichiers du classLoader. Ces fichiers doivent * correspondre au pattern donne. * - * @param classLoader classloader to use (if null, use {@code ClassLoader.getSystemClassLoader()} + * @param classLoader classloader to use (if null, use {@link ClassLoader#getSystemClassLoader()} * @param pattern le nom du fichier a extraire du fichier compressé ou * du repertoire doit correspondre au pattern (repertoire + nom * compris).

1 0

r2081 - trunk
by tchemit＠users.nuiton.org 10 Feb '11

10 Feb '11

Author: tchemit Date: 2011-02-10 11:18:05 +0100 (Thu, 10 Feb 2011) New Revision: 2081 Url: http://nuiton.org/repositories/revision/nuiton-utils/2081 Log: Evolution #1315: Updates to mavenpom 2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-10 10:05:45 UTC (rev 2080) +++ trunk/pom.xml 2011-02-10 10:18:05 UTC (rev 2081) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.4</version> + <version>2.5</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

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

10 Feb '11

Author: echatellier Date: 2011-02-10 11:05:45 +0100 (Thu, 10 Feb 2011) New Revision: 2080 Url: http://nuiton.org/repositories/revision/nuiton-utils/2080 Log: Add javadoc Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java 2011-02-09 08:21:02 UTC (rev 2079) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java 2011-02-10 10:05:45 UTC (rev 2080) @@ -254,6 +254,8 @@ /** * Retourner la liste des fichiers du classLoader. Ces fichiers doivent * correspondre au pattern donne. + * + * Utile par defaut <b>ClassLoader.getSystemClassLoader()</b>. * * @param pattern le nom du fichier a extraire du fichier compressé ou * du repertoire doit correspondre au pattern (repertoire + nom @@ -282,7 +284,7 @@ * Retourner la liste des fichiers du classLoader. Ces fichiers doivent * correspondre au pattern donne. * - * @param classLoader le classLoader + * @param classLoader classloader to use (if null, use {@code ClassLoader.getSystemClassLoader()} * @param pattern le nom du fichier a extraire du fichier compressé ou * du repertoire doit correspondre au pattern (repertoire + nom * compris).

1 0

r2079 - trunk
by tchemit＠users.nuiton.org 09 Feb '11

09 Feb '11

Author: tchemit Date: 2011-02-09 09:21:02 +0100 (Wed, 09 Feb 2011) New Revision: 2079 Url: http://nuiton.org/repositories/revision/nuiton-utils/2079 Log: Update mavenpom4redmineAndCentral to 2.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 17:49:15 UTC (rev 2078) +++ trunk/pom.xml 2011-02-09 08:21:02 UTC (rev 2079) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.3</version> + <version>2.4.4</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

r2078 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by bleny＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: bleny Date: 2011-02-07 18:49:15 +0100 (Mon, 07 Feb 2011) New Revision: 2078 Url: http://nuiton.org/repositories/revision/nuiton-utils/2078 Log: remove bad import Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.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-02-07 17:43:53 UTC (rev 2077) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2011-02-07 17:49:15 UTC (rev 2078) @@ -36,8 +36,6 @@ * par : */ package org.nuiton.util; -import sun.misc.Regexp; - import java.awt.Color; import java.lang.reflect.Field; import java.security.MessageDigest;

1 0

r2077 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by bleny＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: bleny Date: 2011-02-07 18:43:53 +0100 (Mon, 07 Feb 2011) New Revision: 2077 Url: http://nuiton.org/repositories/revision/nuiton-utils/2077 Log: evol #1294: add a method to test if a given string is an email 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-02-04 13:26:22 UTC (rev 2076) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2011-02-07 17:43:53 UTC (rev 2077) @@ -36,6 +36,8 @@ * par : */ package org.nuiton.util; +import sun.misc.Regexp; + import java.awt.Color; import java.lang.reflect.Field; import java.security.MessageDigest; @@ -79,6 +81,10 @@ return temp.replaceAll("[^\\p{ASCII}]",""); } + public static boolean isEmail(String email) { + return email.matches("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9\\-]*[a-z0-9])?$"); + } + /** * Contract to use in {@link StringUtil#join(Iterable , ToString, String, boolean) } * method. This will provide a toString method to convert an object in a Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java 2011-02-04 13:26:22 UTC (rev 2076) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java 2011-02-07 17:43:53 UTC (rev 2077) @@ -215,5 +215,11 @@ assertEquals("53776c1a117089016498c1162db30265baaac558", StringUtil.encodeSHA1("Cela ressemblait aux gros ordinateurs que david avait pu voir dans des films de science fiction.")); } + + @Test + public void testIsEmail() { + assertFalse(StringUtil.isEmail("abc.def+ghimonte.st")); + assertTrue(StringUtil.isEmail("abc.def+ghi(a)monte.st")); + } } // StringUtilTest

1 0

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