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

[Lutinutil-commits] r1321 - lutinutil/trunk
by tchemit＠users.labs.libre-entreprise.org 04 Feb '09

04 Feb '09

Author: tchemit Date: 2009-02-04 17:32:59 +0000 (Wed, 04 Feb 2009) New Revision: 1321 Modified: lutinutil/trunk/pom.xml Log: prepare release lutinproject 3.4 Modified: lutinutil/trunk/pom.xml =================================================================== --- lutinutil/trunk/pom.xml 2009-02-03 20:30:43 UTC (rev 1320) +++ lutinutil/trunk/pom.xml 2009-02-04 17:32:59 UTC (rev 1321) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<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/maven-v4_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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -10,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <artifactId>lutinutil</artifactId> @@ -69,17 +70,29 @@ <labs.id>12</labs.id> <labs.project>lutinutil</labs.project> - + <lutinutil.version>${project.version}</lutinutil.version> </properties> <build> <plugins> -  +  <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> + <encoding>${maven.compile.encoding}</encoding> + <src>${maven.src.dir}/main/resources/i18n</src> + <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> + <keysModifier>false</keysModifier> + <keepBackup>false</keepBackup> + </configuration> <executions> <execution> <goals> @@ -90,7 +103,51 @@ </executions> </plugin> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <id>create-assembly</id> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> </build> @@ -116,23 +173,39 @@ </activation> <build> <plugins> + +  <plugin> <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assembly</id> + <phase>package</phase> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> <configuration> - <descriptors> - <descriptor>src/main/assembly/deps.xml</descriptor> - <descriptor>src/main/assembly/full.xml</descriptor> - </descriptors> + <licenseName>${license-switcher.licenseName}</licenseName> </configuration> <executions> <execution> + <id>attach-licenses</id> <goals> - <goal>single</goal> + <goal>license</goal> + <goal>third-party</goal> </goals> </execution> </executions> </plugin> + </plugins> + </build> </profile> </profiles>

1 0

[Lutinutil-commits] r1320 - commandline/trunk
by tchemit＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: tchemit Date: 2009-02-03 20:30:43 +0000 (Tue, 03 Feb 2009) New Revision: 1320 Modified: commandline/trunk/pom.xml Log: preparation release lutinproject 3.4 Modified: commandline/trunk/pom.xml =================================================================== --- commandline/trunk/pom.xml 2009-02-03 14:32:21 UTC (rev 1319) +++ commandline/trunk/pom.xml 2009-02-03 20:30:43 UTC (rev 1320) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.codelutin</groupId> @@ -34,70 +34,7 @@ </dependency> </dependencies> -  -  -  - <name>commandline</name> - <description>lutincommandline library main pom</description> - <inceptionYear>2008</inceptionYear> -  -  -  - - <packaging>pom</packaging> - - <build> - - <defaultGoal>install</defaultGoal> - - <pluginManagement> - <plugins> - - <plugin> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinwidget</artifactId> - <version>${lutinwidget.version}</version> - </dependency> - </dependencies> - </plugin> - - </plugins> - </pluginManagement> - - </build> - - - <properties> - -  - <jaxx.version>1.1-SNAPSHOT</jaxx.version> - -  - <lutinwidget.version>0.12</lutinwidget.version> - -  - <lutinutil.version>1.0.2</lutinutil.version> - -  - <labs.id>12</labs.id> - - <labs.project>lutinutil</labs.project> - - </properties> - <dependencyManagement> <dependencies> @@ -154,8 +91,115 @@ </dependencies> </dependencyManagement> +  +  +  + <name>commandline</name> + <description>lutincommandline library main pom</description> + <inceptionYear>2008</inceptionYear>  +  +  + + <packaging>pom</packaging> + + <properties> + + <labs.id>12</labs.id> + + <labs.project>lutinutil</labs.project> + +  + <jaxx.version>1.1-SNAPSHOT</jaxx.version> + <lutinwidget.version>0.12</lutinwidget.version> + + </properties> + + <build> + + <defaultGoal>install</defaultGoal> + + <pluginManagement> + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> + <encoding>${maven.compile.encoding}</encoding> + <src>${maven.src.dir}/main/resources/i18n</src> + <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> + <keysModifier>false</keysModifier> + <keepBackup>false</keepBackup> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinwidget</artifactId> + <version>${lutinwidget.version}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </pluginManagement> + + <plugins> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> + +    <scm> @@ -164,4 +208,39 @@ <url>${maven.scm.url}</url> </scm> + <profiles> +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project>

1 0

[Lutinutil-commits] r1319 - lutinutil/trunk/src/test/java/org/codelutin/util
by tchemit＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: tchemit Date: 2009-02-03 14:32:21 +0000 (Tue, 03 Feb 2009) New Revision: 1319 Modified: lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java Log: pass StringUtilTest in junit4 Modified: lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-02-03 14:19:49 UTC (rev 1318) +++ lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-02-03 14:32:21 UTC (rev 1319) @@ -29,8 +29,6 @@ package org.codelutin.util; -import junit.framework.TestCase; - import java.awt.Color; import java.util.Arrays; import java.util.Locale;

1 0

[Lutinutil-commits] r1318 - lutinutil/trunk/src/test/java/org/codelutin/util
by tchemit＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: tchemit Date: 2009-02-03 14:19:49 +0000 (Tue, 03 Feb 2009) New Revision: 1318 Modified: lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java Log: pass StringUtilTest in junit4 Modified: lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-02-03 14:12:35 UTC (rev 1317) +++ lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-02-03 14:19:49 UTC (rev 1318) @@ -65,6 +65,7 @@ assertEquals("", r); } + @Test public void testToColor() throws Exception { Color c; @@ -91,6 +92,7 @@ assertNull(c); } } + @Test public void testSplit() { assertTrue(Arrays.equals(StringUtil.split("toto,titi,tutu"), new String[]{"toto", "titi", "tutu"}));

1 0

[Lutinutil-commits] r1317 - in lutinutil/trunk: . src/main/java/org/codelutin/util src/test/java/org/codelutin/util
by tchemit＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: tchemit Date: 2009-02-03 14:12:35 +0000 (Tue, 03 Feb 2009) New Revision: 1317 Modified: lutinutil/trunk/changelog.txt lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java Log: fix StringUtil failed tests since to locale Modified: lutinutil/trunk/changelog.txt =================================================================== --- lutinutil/trunk/changelog.txt 2009-02-03 13:35:05 UTC (rev 1316) +++ lutinutil/trunk/changelog.txt 2009-02-03 14:12:35 UTC (rev 1317) @@ -1,4 +1,5 @@ ver 1.0.3 ??? 200901?? + * 20090203 [chemit] fix StringUtil failed tests since to locale. * 20090126 [chemit] i18n Resource class * 20090121 [chemit] fix bug on Resource when a jar manifest classpath contains some XXX:// jar path Modified: lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java 2009-02-03 13:35:05 UTC (rev 1316) +++ lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java 2009-02-03 14:12:35 UTC (rev 1317) @@ -430,23 +430,19 @@ "d"}; /** - * * @param value * @return - * - * @deprecated method is default locale dependent + * @see #convert(long, double[], String[]) */ static public String convertTime(long value) { return convert(value, timeFactors, timeUnites); } /** - * * @param value * @param value2 * @return - * - * @deprecated method is default locale dependent + * @see #convert(long, double[], String[]) */ static public String convertTime(long value, long value2) { return convertTime(value2 - value); @@ -458,24 +454,22 @@ "To"}; /** - * * @param value * @return - * - * @deprecated method is default locale dependent + * @see #convert(long, double[], String[]) */ static public String convertMemory(long value) { return convert(value, memoryFactors, memoryUnites); } /** - * + * Note: this method use the current locale (the {@link java.util.Locale#getDefault()}) in + * the method {@link MessageFormat#MessageFormat(String)}. + * * @param value * @param factors * @param unites * @return - * - * @deprecated method is default locale dependent */ static public String convert(long value, double[] factors, String[] unites) { long sign = value == 0 ? 1 : value / Math.abs(value); Modified: lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-02-03 13:35:05 UTC (rev 1316) +++ lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-02-03 14:12:35 UTC (rev 1317) @@ -33,9 +33,17 @@ import java.awt.Color; import java.util.Arrays; +import java.util.Locale; -public class StringUtilTest extends TestCase { // StringUtilTest +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +public class StringUtilTest { // StringUtilTest + + @Test public void testSubstring() throws Exception { String s = "Bonjour le monde"; String r = StringUtil.substring(s, -5); @@ -57,7 +65,7 @@ assertEquals("", r); } - + @Test public void testToColor() throws Exception { Color c; @@ -83,7 +91,7 @@ assertNull(c); } } - + @Test public void testSplit() { assertTrue(Arrays.equals(StringUtil.split("toto,titi,tutu"), new String[]{"toto", "titi", "tutu"})); assertTrue(Arrays.equals(StringUtil.split("toto"), new String[]{"toto"})); @@ -108,19 +116,13 @@ } - /** - * Test de la method {@link org.codelutin.util.StringUtil#convertTime(long)} - * - * @deprecated since org.codelutin.util.StringUtil#convertTime(long) is defaut locale dependent - * @throws Exception - */ + @Test public void testConvert() throws Exception { assertEquals("365d", StringUtil.convertTime(31536000000000000L)); assertEquals("2d", StringUtil.convertTime(172800000000000L)); assertEquals("2h", StringUtil.convertTime(7200000000000L)); assertEquals("2m", StringUtil.convertTime(120000000000L)); - // following test in EN locale - //assertEquals("2,02s", StringUtil.convertTime(2020000002L)); + assertEquals("2s", StringUtil.convertTime(2000000002L)); assertEquals("2s", StringUtil.convertTime(2000000000L)); assertEquals("2ms", StringUtil.convertTime(2000000L)); @@ -132,23 +134,38 @@ assertEquals("2Ko", StringUtil.convertMemory(2048L)); assertEquals("2Mo", StringUtil.convertMemory(2097152L)); assertEquals("2Mo", StringUtil.convertMemory(2097154L)); - // following test in EN locale - //assertEquals("2,094Mo", StringUtil.convertMemory(2196152L)); + assertEquals("2Go", StringUtil.convertMemory(2147483648L)); assertEquals("2To", StringUtil.convertMemory(2199023255552L)); assertEquals("2000To", StringUtil.convertMemory(2199023255552000L)); assertEquals("-2Mo", StringUtil.convertMemory(-2097152L)); assertEquals("-2Mo", StringUtil.convertMemory(-2097154L)); - // following test in EN locale - //assertEquals("-2,094Mo", StringUtil.convertMemory(-2196152L)); + + Locale oldLocale = Locale.getDefault(); + // test in french locale + Locale.setDefault(Locale.FRENCH); + assertEquals("2,02s", StringUtil.convertTime(2020000002L)); + assertEquals("2,094Mo", StringUtil.convertMemory(2196152L)); + assertEquals("-2,094Mo", StringUtil.convertMemory(-2196152L)); + + // test in english locale + Locale.setDefault(Locale.ENGLISH); + assertEquals("2.02s", StringUtil.convertTime(2020000002L)); + assertEquals("2.094Mo", StringUtil.convertMemory(2196152L)); + assertEquals("-2.094Mo", StringUtil.convertMemory(-2196152L)); + + // push back previous locale + Locale.setDefault(oldLocale); } + @Test public void testUnaccent() throws Exception { assertEquals("-aaaeeeeiioouuuc0123456789AAAEEEEIIOOUUUC._", StringUtil.unaccent("-àâäéèêëîïôöùûüç 0123456789 ÀÂÄÉÈÊËÎÏÔÖÙÛÜÇ._")); } + @Test public void testConvertToConstantName() throws Exception { assertEquals("YES", StringUtil.convertToConstantName("yes")); assertEquals("YES", StringUtil.convertToConstantName("*$$?YEs"));

1 0

[Lutinutil-commits] r1316 - in lutinutil/trunk: . src/main/java/org/codelutin/util src/test/java/org/codelutin/util
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 13:35:05 +0000 (Tue, 03 Feb 2009) New Revision: 1316 Modified: lutinutil/trunk/pom.xml lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java Log: Deprecate method and fix tests Modified: lutinutil/trunk/pom.xml =================================================================== --- lutinutil/trunk/pom.xml 2009-01-28 21:23:08 UTC (rev 1315) +++ lutinutil/trunk/pom.xml 2009-02-03 13:35:05 UTC (rev 1316) @@ -70,8 +70,6 @@ <labs.project>lutinutil</labs.project> -  - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> </properties> <build> Modified: lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java 2009-01-28 21:23:08 UTC (rev 1315) +++ lutinutil/trunk/src/main/java/org/codelutin/util/StringUtil.java 2009-02-03 13:35:05 UTC (rev 1316) @@ -429,10 +429,25 @@ static final protected String[] timeUnites = {"ns", "ms", "s", "m", "h", "d"}; + /** + * + * @param value + * @return + * + * @deprecated method is default locale dependent + */ static public String convertTime(long value) { return convert(value, timeFactors, timeUnites); } + /** + * + * @param value + * @param value2 + * @return + * + * @deprecated method is default locale dependent + */ static public String convertTime(long value, long value2) { return convertTime(value2 - value); } @@ -442,10 +457,26 @@ static final protected String[] memoryUnites = {"o", "Ko", "Mo", "Go", "To"}; + /** + * + * @param value + * @return + * + * @deprecated method is default locale dependent + */ static public String convertMemory(long value) { return convert(value, memoryFactors, memoryUnites); } + /** + * + * @param value + * @param factors + * @param unites + * @return + * + * @deprecated method is default locale dependent + */ static public String convert(long value, double[] factors, String[] unites) { long sign = value == 0 ? 1 : value / Math.abs(value); int i = 0; Modified: lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-01-28 21:23:08 UTC (rev 1315) +++ lutinutil/trunk/src/test/java/org/codelutin/util/StringUtilTest.java 2009-02-03 13:35:05 UTC (rev 1316) @@ -108,12 +108,19 @@ } + /** + * Test de la method {@link org.codelutin.util.StringUtil#convertTime(long)} + * + * @deprecated since org.codelutin.util.StringUtil#convertTime(long) is defaut locale dependent + * @throws Exception + */ public void testConvert() throws Exception { assertEquals("365d", StringUtil.convertTime(31536000000000000L)); assertEquals("2d", StringUtil.convertTime(172800000000000L)); assertEquals("2h", StringUtil.convertTime(7200000000000L)); assertEquals("2m", StringUtil.convertTime(120000000000L)); - assertEquals("2,02s", StringUtil.convertTime(2020000002L)); + // following test in EN locale + //assertEquals("2,02s", StringUtil.convertTime(2020000002L)); assertEquals("2s", StringUtil.convertTime(2000000002L)); assertEquals("2s", StringUtil.convertTime(2000000000L)); assertEquals("2ms", StringUtil.convertTime(2000000L)); @@ -125,14 +132,16 @@ assertEquals("2Ko", StringUtil.convertMemory(2048L)); assertEquals("2Mo", StringUtil.convertMemory(2097152L)); assertEquals("2Mo", StringUtil.convertMemory(2097154L)); - assertEquals("2,094Mo", StringUtil.convertMemory(2196152L)); + // following test in EN locale + //assertEquals("2,094Mo", StringUtil.convertMemory(2196152L)); assertEquals("2Go", StringUtil.convertMemory(2147483648L)); assertEquals("2To", StringUtil.convertMemory(2199023255552L)); assertEquals("2000To", StringUtil.convertMemory(2199023255552000L)); assertEquals("-2Mo", StringUtil.convertMemory(-2097152L)); assertEquals("-2Mo", StringUtil.convertMemory(-2097154L)); - assertEquals("-2,094Mo", StringUtil.convertMemory(-2196152L)); + // following test in EN locale + //assertEquals("-2,094Mo", StringUtil.convertMemory(-2196152L)); } public void testUnaccent() throws Exception {

1 0