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

r2213 - in trunk: nuiton-profiling nuiton-profiling/src/main/java/org/nuiton/profiling nuiton-profiling/src/test/java/org/nuiton/profiling nuiton-utils nuiton-utils/src/main/java/org/nuiton/util nuiton-utils/src/main/java/org/nuiton/util/beans nuiton-validator nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field nuiton-validator/src/test/java/org/nuiton/validator/model
by bleny＠users.nuiton.org 30 Sep '11

30 Sep '11

Author: bleny Date: 2011-09-30 12:00:52 +0200 (Fri, 30 Sep 2011) New Revision: 2213 Url: http://nuiton.org/repositories/revision/nuiton-utils/2213 Log: #1762 update to commons-lang 3 Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java trunk/nuiton-profiling/src/test/java/org/nuiton/profiling/NuitonTraceTest.java trunk/nuiton-utils/pom.xml trunk/nuiton-utils/src/main/java/org/nuiton/util/MatrixMap.java trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java trunk/nuiton-validator/pom.xml trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/CollectionFieldExpressionValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/CollectionUniqueKeyValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/EmailFieldValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidator.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Person.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Pet.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Race.java Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-profiling/pom.xml 2011-09-30 10:00:52 UTC (rev 2213) @@ -46,8 +46,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency>  Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java =================================================================== --- trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -22,7 +22,7 @@ package org.nuiton.profiling; import java.util.Map.Entry; -import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; import java.io.PrintStream; import java.lang.reflect.Method; Modified: trunk/nuiton-profiling/src/test/java/org/nuiton/profiling/NuitonTraceTest.java =================================================================== --- trunk/nuiton-profiling/src/test/java/org/nuiton/profiling/NuitonTraceTest.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-profiling/src/test/java/org/nuiton/profiling/NuitonTraceTest.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -24,7 +24,7 @@ */ package org.nuiton.profiling; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-utils/pom.xml 2011-09-30 10:00:52 UTC (rev 2213) @@ -41,8 +41,8 @@ <dependencies> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/MatrixMap.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/MatrixMap.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/MatrixMap.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -37,8 +37,8 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.RandomAccess; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -25,7 +25,7 @@ package org.nuiton.util.beans; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ObjectUtil; Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-validator/pom.xml 2011-09-30 10:00:52 UTC (rev 2213) @@ -52,8 +52,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/CollectionFieldExpressionValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/CollectionFieldExpressionValidator.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/CollectionFieldExpressionValidator.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -27,7 +27,7 @@ import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.Collection; import java.util.Collections; Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/CollectionUniqueKeyValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/CollectionUniqueKeyValidator.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/CollectionUniqueKeyValidator.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import java.util.ArrayList; import java.util.Collection; Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/EmailFieldValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/EmailFieldValidator.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/EmailFieldValidator.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -25,7 +25,7 @@ package org.nuiton.validator.xwork2.field; import com.opensymphony.xwork2.validator.ValidationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.StringUtil; /** Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -30,7 +30,7 @@ import java.util.Collection; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Validator for French SIRET numbers Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidator.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/VATIdentificationNumberFieldValidator.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -28,7 +28,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Validator for EU VAT number. Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Person.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Person.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Person.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -24,7 +24,7 @@ */ package org.nuiton.validator.model; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.ArrayList; import java.util.Collection; Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Pet.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Pet.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Pet.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -24,7 +24,7 @@ */ package org.nuiton.validator.model; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * TODO Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Race.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Race.java 2011-09-22 20:23:59 UTC (rev 2212) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/Race.java 2011-09-30 10:00:52 UTC (rev 2213) @@ -24,7 +24,7 @@ */ package org.nuiton.validator.model; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * TODO

1 0

r2212 - in trunk: . nuiton-profiling/src/main/java/org/nuiton/profiling nuiton-profiling/src/site/apt
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 22:23:59 +0200 (Thu, 22 Sep 2011) New Revision: 2212 Url: http://nuiton.org/repositories/revision/nuiton-utils/2212 Log: fix nuiton-profiling documentation + make it dynamic Added: trunk/nuiton-profiling/src/site/apt/index.apt.vm Removed: trunk/nuiton-profiling/src/site/apt/index.apt Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java trunk/pom.xml Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java =================================================================== --- trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-09-22 17:27:23 UTC (rev 2211) +++ trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-09-22 20:23:59 UTC (rev 2212) @@ -333,17 +333,17 @@ protected static class Statistic { Method method; /** nombre d'appel */ - long call = 0; + long call; /** nombre d'appel vers une autre method depuis cette methode */ - long callNestMethod = 0; + long callNestMethod; /** temps mini d'execution de cette methode (sans le temps des autres methodes) */ - long timeMin = 0; + long timeMin; /** temps max d'execution de cette methode (sans le temps des autres methodes) */ - long timeMax = 0; + long timeMax; /** temps total d'execution de cette methode (sans le temps des autres methodes) */ - long timeTotal = 0; + long timeTotal; /** temps total d'execution de cette methode (avec le temps des autres methodes) */ - long timeTotalNestMethod = 0; + long timeTotalNestMethod; public Statistic(Method method) { this.method = method; Deleted: trunk/nuiton-profiling/src/site/apt/index.apt =================================================================== --- trunk/nuiton-profiling/src/site/apt/index.apt 2011-09-22 17:27:23 UTC (rev 2211) +++ trunk/nuiton-profiling/src/site/apt/index.apt 2011-09-22 20:23:59 UTC (rev 2212) @@ -1,106 +0,0 @@ -~~~ -~~ #%L -~~ Nuiton Utils :: Nuiton Profiling -~~ -~~ $Id$ -~~ $HeadURL$ -~~ %% -~~ Copyright (C) 2004 - 2010 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% -~~~ - ---- - Nuiton utils Extra - ---- - ---- - 2009-08-23 - ---- - -Présentation - - nuiton-profiling contient un ensemble de librairies pour aider à tester les - performance d'une application et voir ou le temps est perdu. - -NuitonTrace - - Permet de tracer le temps passé dans les méthodes au cours de l'éxecution. - Cette classe utilise l'AOP pour cela. Pour l'utiliser voir sa javadoc. - -NuitonTrace pour une application Web lancée avec Maven - - Il faut créer le fichier src/main/webapp/WEB-INF/classes/META-INF/aop.xml - pour indiquer les methodes que vous souhaitez surveiller, il contient par - exemple:: - - <!DOCTYPE aspectj PUBLIC - "-//AspectJ//DTD//EN" - "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"> - - <aspectj> - <aspects> - <concrete-aspect name="org.nuiton.profiling.NuitonTraceTestAspect" - extends="org.nuiton.profiling.NuitonTrace"> - <pointcut name="executeMethod" - expression=" - execution(* org.nuiton..*(..)) - || execution(* org.chorem..*(..)) - || execution(* org.apache.struts2..*(..)) - || execution(* com.opensymphony..*(..)) - || execution(* org.apache.velocity..*(..)) - || execution(* freemarker..*(..)) - || execution(* ognl..*(..))"/> - </concrete-aspect> - </aspects> - <weaver options="-verbose"> - </weaver> - </aspectj> - - - Il faut ajouter la dépendance dans votre projet:: - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-profiling</artifactId> - <version>2.3-SNAPSHOT</version> - </dependency> - - Il faut ajouter des options Maven:: - - export MAVEN_OPTS="$MAVEN_OPTS -javaagent:${maven_repo}/org/aspectj/aspectjweaver/1.6.11/aspectjweaver-1.6.11.jar" - - ensuite lancer:: - - mvn jetty:run - - Le plus simple pour sortir les statistiques lorsque vous en avez besoin est de - créer un lien sur votre page web vers une jsp qui contient:: - - <%@page import="org.nuiton.profiling.NuitonTrace"%> - <%@page contentType="text/csv" pageEncoding="UTF-8"%> - <%=NuitonTrace.getStatisticsCSVAndClear()%> - -Il ne vous reste plus qu'a analyser votre application - -NuitonTrace pour une application Web lancée dans un Tomcat - - Procéder de la même façon que pour maven, le seul changement est le nom - de la variable d'environnement qui est - - export JAVA_OPTS="$JAVA_OPTS -javaagent:${maven_repo}/org/aspectj/aspectjweaver/1.6.11/aspectjweaver-1.6.11.jar" - - Si vous avez des problèmes, reconstruire le war avec un clean avant et supprimer - le répertoire pour votre application qui a peut être créé par tomcat dans le - répertoire webapps. Copied: trunk/nuiton-profiling/src/site/apt/index.apt.vm (from rev 2211, trunk/nuiton-profiling/src/site/apt/index.apt) =================================================================== --- trunk/nuiton-profiling/src/site/apt/index.apt.vm (rev 0) +++ trunk/nuiton-profiling/src/site/apt/index.apt.vm 2011-09-22 20:23:59 UTC (rev 2212) @@ -0,0 +1,115 @@ +~~~ +~~ #%L +~~ Nuiton Utils :: Nuiton Profiling +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2004 - 2010 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% +~~~ + ---- + Nuiton utils Extra + ---- + ---- + 2009-08-23 + ---- + +Présentation + + nuiton-profiling contient un ensemble de librairies pour aider à tester les + performance d'une application et voir ou le temps est perdu. + +NuitonTrace + + Permet de tracer le temps passé dans les méthodes au cours de l'éxecution. + Cette classe utilise l'AOP pour cela. Pour l'utiliser voir sa javadoc. + +NuitonTrace pour une application Web lancée avec Maven + + Il faut créer le fichier src/main/webapp/WEB-INF/classes/META-INF/aop.xml + pour indiquer les methodes que vous souhaitez surveiller, il contient par + exemple + +-------------------------------------------------------------------------------- +<!DOCTYPE aspectj PUBLIC + "-//AspectJ//DTD//EN" + "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"> +<aspectj> + <weaver options="-verbose"/> + <aspects> + <concrete-aspect name="org.nuiton.profiling.NuitonTraceTestAspect" + extends="org.nuiton.profiling.NuitonTrace"> + <pointcut name="executeMethod" + expression=" + execution(* org.nuiton..*(..)) + || execution(* org.chorem..*(..)) + || execution(* org.apache.struts2..*(..)) + || execution(* com.opensymphony..*(..)) + || execution(* org.apache.velocity..*(..)) + || execution(* freemarker..*(..)) + || execution(* ognl..*(..))"/> + </concrete-aspect> + </aspects> +</aspectj> +-------------------------------------------------------------------------------- + + Il faut ajouter la dépendance dans votre projet + +-------------------------------------------------------------------------------- + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-profiling</artifactId> + <version>${project.version}</version> + </dependency> +-------------------------------------------------------------------------------- + + Il faut ajouter des options Maven + +-------------------------------------------------------------------------------- + export MAVEN_OPTS="$MAVEN_OPTS -javaagent:\${maven_repo}/org/aspectj/aspectjweaver/${aspectjVersion}/aspectjweaver-${aspectjVersion}.jar" +-------------------------------------------------------------------------------- + + ensuite lancer + +-------------------------------------------------------------------------------- + mvn jetty:run +-------------------------------------------------------------------------------- + + Le plus simple pour sortir les statistiques lorsque vous en avez besoin est de + créer un lien sur votre page web vers une jsp qui contient + +-------------------------------------------------------------------------------- + <%@page import="org.nuiton.profiling.NuitonTrace"%> + <%@page contentType="text/csv" pageEncoding="UTF-8"%> + <%=NuitonTrace.getStatisticsCSVAndClear()%> +-------------------------------------------------------------------------------- + +Il ne vous reste plus qu'a analyser votre application + +NuitonTrace pour une application Web lancée dans un Tomcat + + Procéder de la même façon que pour maven, le seul changement est le nom + de la variable d'environnement qui est + +-------------------------------------------------------------------------------- + export JAVA_OPTS="$JAVA_OPTS -javaagent:${maven_repo}/org/aspectj/aspectjweaver/${aspectjVersion}/aspectjweaver-${aspectjVersion}.jar" +-------------------------------------------------------------------------------- + + Si vous avez des problèmes, reconstruire le war avec un clean avant et supprimer + le répertoire pour votre application qui a peut être créé par tomcat dans le + répertoire webapps. Property changes on: trunk/nuiton-profiling/src/site/apt/index.apt.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 17:27:23 UTC (rev 2211) +++ trunk/pom.xml 2011-09-22 20:23:59 UTC (rev 2212) @@ -74,13 +74,13 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjrt</artifactId> - <version>${aspectj.version}</version> + <version>${aspectjVersion}</version> </dependency> <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>${aspectj.version}</version> + <version>${aspectjVersion}</version> <scope>runtime</scope> </dependency> @@ -177,7 +177,7 @@ <projectId>nuiton-utils</projectId> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <aspectj.version>1.6.11</aspectj.version> + <aspectjVersion>1.6.11</aspectjVersion> <xworkVersion>2.2.3.1</xworkVersion>

1 0

r2211 - trunk
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 19:27:23 +0200 (Thu, 22 Sep 2011) New Revision: 2211 Url: http://nuiton.org/repositories/revision/nuiton-utils/2211 Log: Update mavenpom4redmineAndCentral to 3.0.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 17:15:17 UTC (rev 2210) +++ trunk/pom.xml 2011-09-22 17:27:23 UTC (rev 2211) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

r2210 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: maven-release Date: 2011-09-09 19:15:17 +0200 (Fri, 09 Sep 2011) New Revision: 2210 Url: http://nuiton.org/repositories/revision/nuiton-utils/2210 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-09-09 17:15:16 UTC (rev 2209) +++ trunk/nuiton-profiling/pom.xml 2011-09-09 17:15:17 UTC (rev 2210) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-09-09 17:15:16 UTC (rev 2209) +++ trunk/nuiton-utils/pom.xml 2011-09-09 17:15:17 UTC (rev 2210) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-09-09 17:15:16 UTC (rev 2209) +++ trunk/nuiton-validator/pom.xml 2011-09-09 17:15:17 UTC (rev 2210) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 17:15:16 UTC (rev 2209) +++ trunk/pom.xml 2011-09-09 17:15:17 UTC (rev 2210) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -206,12 +206,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.3 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.3 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.3</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <distributionManagement>

1 0

r2209 - in tags: . nuiton-utils-2.3
by maven-release＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: maven-release Date: 2011-09-09 19:15:16 +0200 (Fri, 09 Sep 2011) New Revision: 2209 Url: http://nuiton.org/repositories/revision/nuiton-utils/2209 Log: [maven-release-plugin] copy for tag nuiton-utils-2.3 Added: tags/nuiton-utils-2.3/ Property changes on: tags/nuiton-utils-2.3 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2208 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: maven-release Date: 2011-09-09 19:15:15 +0200 (Fri, 09 Sep 2011) New Revision: 2208 Url: http://nuiton.org/repositories/revision/nuiton-utils/2208 Log: [maven-release-plugin] prepare release nuiton-utils-2.3 Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-09-09 16:50:53 UTC (rev 2207) +++ trunk/nuiton-profiling/pom.xml 2011-09-09 17:15:15 UTC (rev 2208) @@ -22,9 +22,7 @@ <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"> +<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> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-09-09 16:50:53 UTC (rev 2207) +++ trunk/nuiton-utils/pom.xml 2011-09-09 17:15:15 UTC (rev 2208) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-09-09 16:50:53 UTC (rev 2207) +++ trunk/nuiton-validator/pom.xml 2011-09-09 17:15:15 UTC (rev 2208) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:50:53 UTC (rev 2207) +++ trunk/pom.xml 2011-09-09 17:15:15 UTC (rev 2208) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <modules> <module>nuiton-utils</module> @@ -206,12 +206,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.3 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.3 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.3</url> </scm> <distributionManagement>

1 0

r2207 - in trunk: . nuiton-profiling/src/license nuiton-utils/src/license nuiton-validator/src/license nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 18:50:53 +0200 (Fri, 09 Sep 2011) New Revision: 2207 Url: http://nuiton.org/repositories/revision/nuiton-utils/2207 Log: T?\195?\162che #1594: Update xwork to 2.2.3.1 prepare release (svn properties, optimize dependencies, add license headers) Removed: trunk/nuiton-profiling/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-utils/src/license/THIRD-PARTY.properties trunk/nuiton-validator/src/license/THIRD-PARTY.properties trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredFieldValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredStringFieldValidator.java trunk/pom.xml Deleted: trunk/nuiton-profiling/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-profiling/src/license/THIRD-PARTY.properties 2011-09-09 16:05:22 UTC (rev 2206) +++ trunk/nuiton-profiling/src/license/THIRD-PARTY.properties 2011-09-09 16:50:53 UTC (rev 2207) @@ -1,33 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License -# - Apache Software License, Version 2.0 -# - BSD License -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Jaxen license -# - Lesser General Public License (LGPL) -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 -# - MIT License -# - SAXPath License -# - The Apache Software License, Version 2.0 -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Mon Aug 22 19:29:18 CEST 2011 -aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License -aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License -aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License -dom4j--dom4j--1.4=BSD License -isorelax--isorelax--20020414=MIT License -jaxen--jaxen--1.0-FCS=Jaxen license -jrexx--jrexx--1.1.1=Apache Software License -msv--msv--20020414=BSD License -qdox--qdox--1.4=Apache Software License, Version 2.0 -relaxngDatatype--relaxngDatatype--20020414=BSD License -saxpath--saxpath--1.0-FCS=SAXPath License -trove--trove--1.0.2=Lesser General Public License (LGPL) Modified: trunk/nuiton-utils/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-utils/src/license/THIRD-PARTY.properties 2011-09-09 16:05:22 UTC (rev 2206) +++ trunk/nuiton-utils/src/license/THIRD-PARTY.properties 2011-09-09 16:50:53 UTC (rev 2207) @@ -14,5 +14,5 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 07:41:51 CEST 2011 +#Fri Sep 09 18:42:56 CEST 2011 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/nuiton-validator/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-validator/src/license/THIRD-PARTY.properties 2011-09-09 16:05:22 UTC (rev 2206) +++ trunk/nuiton-validator/src/license/THIRD-PARTY.properties 2011-09-09 16:50:53 UTC (rev 2207) @@ -16,7 +16,7 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 07:42:15 CEST 2011 +#Fri Sep 09 18:43:17 CEST 2011 asm--asm--3.1=http\://asm.ow2.org/license.html asm--asm-commons--3.1=http\://asm.ow2.org/license.html asm--asm-tree--3.1=http\://asm.ow2.org/license.html Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredFieldValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredFieldValidator.java 2011-09-09 16:05:22 UTC (rev 2206) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredFieldValidator.java 2011-09-09 16:50:53 UTC (rev 2207) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Validator + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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% + */ package org.nuiton.validator.xwork2.field; import com.opensymphony.xwork2.validator.ValidationException; Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredStringFieldValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredStringFieldValidator.java 2011-09-09 16:05:22 UTC (rev 2206) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredStringFieldValidator.java 2011-09-09 16:50:53 UTC (rev 2207) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Validator + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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% + */ package org.nuiton.validator.xwork2.field; import com.opensymphony.xwork2.validator.ValidationException; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:05:22 UTC (rev 2206) +++ trunk/pom.xml 2011-09-09 16:50:53 UTC (rev 2207) @@ -178,7 +178,7 @@ <projectId>nuiton-utils</projectId> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <aspectj.version>1.6.11</aspectj.version> - <xworkVersion>2.2.3</xworkVersion> + <xworkVersion>2.2.3.1</xworkVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>

1 0

r2206 - trunk
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 18:05:22 +0200 (Fri, 09 Sep 2011) New Revision: 2206 Url: http://nuiton.org/repositories/revision/nuiton-utils/2206 Log: use new site deployment configuration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:50:50 UTC (rev 2205) +++ trunk/pom.xml 2011-09-09 16:05:22 UTC (rev 2206) @@ -185,13 +185,6 @@ </properties> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - <build> <pluginManagement> <plugins> @@ -221,4 +214,11 @@ <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + </project>

1 0

r2205 - trunk
by maven-release＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: maven-release Date: 2011-09-09 17:50:50 +0200 (Fri, 09 Sep 2011) New Revision: 2205 Url: http://nuiton.org/repositories/revision/nuiton-utils/2205 Log: Update mavenpom4redmineAndCentral to 3.0.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 10:38:17 UTC (rev 2204) +++ trunk/pom.xml 2011-09-09 15:50:50 UTC (rev 2205) @@ -22,9 +22,7 @@ <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"> +<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> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.2</version> + <version>3.0.3</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

r2204 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by athimel＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: athimel Date: 2011-09-09 12:38:17 +0200 (Fri, 09 Sep 2011) New Revision: 2204 Url: http://nuiton.org/repositories/revision/nuiton-utils/2204 Log: #1734 Add getOptionAsLong on ApplicationConfig Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.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-09-09 05:09:07 UTC (rev 2203) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-09-09 10:38:17 UTC (rev 2204) @@ -1258,6 +1258,21 @@ return result; } + /** + * Get option value as {@code long}. + * + * @param key the option's key + * @return value as {@code long} + */ + public long getOptionAsLong(String key) { + Long result = getOption(Long.class, key); + if (result == null) { + // primitive value can not be null + result = 0L; + } + return result; + } + /** * Get option value as {@code float}. * Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2011-09-09 05:09:07 UTC (rev 2203) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2011-09-09 10:38:17 UTC (rev 2204) @@ -426,6 +426,7 @@ Assert.assertNotNull(instance.getOptionAsBoolean("dfsdfgqsgqfg")); Assert.assertNotNull(instance.getOptionAsDouble("dfsdfgqsgqfg")); Assert.assertNotNull(instance.getOptionAsInt("dfsdfgqsgqfg")); + Assert.assertNotNull(instance.getOptionAsLong("dfsdfgqsgqfg")); // list option can not be null Assert.assertNotNull(instance.getOptionAsList("dfsdfgqsgqfg")); @@ -508,4 +509,21 @@ Assert.assertEquals(expected, actual); } + + @Test + public void testGetOptionAsLong() { + ApplicationConfig instance = new ApplicationConfig(); + + // test long is not null + long actual = instance.getOptionAsLong("toto"); + Assert.assertNotNull(actual); + Assert.assertEquals(0l, actual); + + // not null version + long expected = System.currentTimeMillis(); + instance.setOption("toto", "" + expected); + actual = instance.getOptionAsLong("toto"); + Assert.assertEquals(expected, actual); + + } }

1 0