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

r2105 - in tags: . nuiton-utils-2.1.1
by hudson＠users.nuiton.org April 11, 2011

April 11, 2011

Author: hudson Date: 2011-04-11 11:40:40 +0200 (Mon, 11 Apr 2011) New Revision: 2105 Url: http://nuiton.org/repositories/revision/nuiton-utils/2105 Log: [maven-release-plugin] copy for tag nuiton-utils-2.1.1 Added: tags/nuiton-utils-2.1.1/ Property changes on: tags/nuiton-utils-2.1.1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2104 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by hudson＠users.nuiton.org April 11, 2011

April 11, 2011

Author: hudson Date: 2011-04-11 11:40:39 +0200 (Mon, 11 Apr 2011) New Revision: 2104 Url: http://nuiton.org/repositories/revision/nuiton-utils/2104 Log: [maven-release-plugin] prepare release nuiton-utils-2.1.1 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-04-11 08:56:52 UTC (rev 2103) +++ trunk/nuiton-profiling/pom.xml 2011-04-11 09:40:39 UTC (rev 2104) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-04-11 08:56:52 UTC (rev 2103) +++ trunk/nuiton-utils/pom.xml 2011-04-11 09:40:39 UTC (rev 2104) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-04-11 08:56:52 UTC (rev 2103) +++ trunk/nuiton-validator/pom.xml 2011-04-11 09:40:39 UTC (rev 2104) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 08:56:52 UTC (rev 2103) +++ trunk/pom.xml 2011-04-11 09:40:39 UTC (rev 2104) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> <modules> <module>nuiton-utils</module> @@ -217,12 +217,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.1.1 </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.1.1 </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.…</url> </scm> </project>

1 0

r2103 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by hudson＠users.nuiton.org April 11, 2011

April 11, 2011

Author: hudson Date: 2011-04-11 10:56:52 +0200 (Mon, 11 Apr 2011) New Revision: 2103 Url: http://nuiton.org/repositories/revision/nuiton-utils/2103 Log: change version to 2.1.1-SNAPSHOT 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-04-11 08:55:47 UTC (rev 2102) +++ trunk/nuiton-profiling/pom.xml 2011-04-11 08:56:52 UTC (rev 2103) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-04-11 08:55:47 UTC (rev 2102) +++ trunk/nuiton-utils/pom.xml 2011-04-11 08:56:52 UTC (rev 2103) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-04-11 08:55:47 UTC (rev 2102) +++ trunk/nuiton-validator/pom.xml 2011-04-11 08:56:52 UTC (rev 2103) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 08:55:47 UTC (rev 2102) +++ trunk/pom.xml 2011-04-11 08:56:52 UTC (rev 2103) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.1.1</version> + <version>2.1.1-SNAPSHOT</version> <modules> <module>nuiton-utils</module>

1 0

r2102 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by hudson＠users.nuiton.org April 11, 2011

April 11, 2011

Author: hudson Date: 2011-04-11 10:55:47 +0200 (Mon, 11 Apr 2011) New Revision: 2102 Url: http://nuiton.org/repositories/revision/nuiton-utils/2102 Log: change version to 2.1.1 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-04-11 08:46:23 UTC (rev 2101) +++ trunk/nuiton-profiling/pom.xml 2011-04-11 08:55:47 UTC (rev 2102) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.1</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-04-11 08:46:23 UTC (rev 2101) +++ trunk/nuiton-utils/pom.xml 2011-04-11 08:55:47 UTC (rev 2102) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.1</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-04-11 08:46:23 UTC (rev 2101) +++ trunk/nuiton-validator/pom.xml 2011-04-11 08:55:47 UTC (rev 2102) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.1</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 08:46:23 UTC (rev 2101) +++ trunk/pom.xml 2011-04-11 08:55:47 UTC (rev 2102) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.1.1</version> <modules> <module>nuiton-utils</module>

1 0

r2101 - trunk
by tchemit＠users.nuiton.org April 11, 2011

April 11, 2011

Author: tchemit Date: 2011-04-11 10:46:23 +0200 (Mon, 11 Apr 2011) New Revision: 2101 Url: http://nuiton.org/repositories/revision/nuiton-utils/2101 Log: Update mavenpom4redmineAndCentral to 2.5.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 07:52:47 UTC (rev 2100) +++ trunk/pom.xml 2011-04-11 08:46:23 UTC (rev 2101) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

r2100 - trunk/nuiton-utils/src/main/resources/META-INF/services
by echatellier＠users.nuiton.org April 11, 2011

April 11, 2011

Author: echatellier Date: 2011-04-11 09:52:47 +0200 (Mon, 11 Apr 2011) New Revision: 2100 Url: http://nuiton.org/repositories/revision/nuiton-utils/2100 Log: LutinLogFactory no longer exists Removed: trunk/nuiton-utils/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory Deleted: trunk/nuiton-utils/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory =================================================================== --- trunk/nuiton-utils/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory 2011-04-01 08:25:18 UTC (rev 2099) +++ trunk/nuiton-utils/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory 2011-04-11 07:52:47 UTC (rev 2100) @@ -1 +0,0 @@ -org.nuiton.util.LutinLogFactory \ No newline at end of file

1 0

r2099 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org April 1, 2011

April 1, 2011

Author: sletellier Date: 2011-04-01 10:25:18 +0200 (Fri, 01 Apr 2011) New Revision: 2099 Url: http://nuiton.org/repositories/revision/nuiton-utils/2099 Log: [#1435] Add getOptionAsProperties in ApplicationConfig 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-03-31 14:52:59 UTC (rev 2098) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-04-01 08:25:18 UTC (rev 2099) @@ -37,6 +37,7 @@ import java.beans.PropertyChangeSupport; import java.io.File; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -1367,6 +1368,20 @@ } /** + * Get option value as {@link Properties}. + * + * @param key the option's key + * @return value as properties + * @throws java.io.IOException if exception occured on read file + */ + public Properties getOptionAsProperties(String key) throws IOException { + File file = getOptionAsFile(key); + Properties prop = new RecursiveProperties(); + prop.load(new FileReader(file)); + return prop; + } + + /** * Get option value as {@link URL}. * * @param key the option's key

1 0

r2098 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org March 31, 2011

March 31, 2011

Author: echatellier Date: 2011-03-31 16:52:59 +0200 (Thu, 31 Mar 2011) New Revision: 2098 Url: http://nuiton.org/repositories/revision/nuiton-utils/2098 Log: #359 : essai en fermant le fichier input avant d'ecrire le fichier output. Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java 2011-03-30 16:45:03 UTC (rev 2097) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java 2011-03-31 14:52:59 UTC (rev 2098) @@ -51,8 +51,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.RandomAccessFile; -import java.nio.ByteBuffer; +import java.io.PrintStream; import java.nio.CharBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; @@ -1209,17 +1208,16 @@ Pattern pattern = Pattern.compile(searchRegex); - RandomAccessFile raf = null; - FileChannel fc = null; + FileInputStream fis = null; String outString = null; try { // Open the file and then get a channel from the stream - raf = new RandomAccessFile(file, "rw"); - fc = raf.getChannel(); + fis = new FileInputStream(file); + FileChannel fc = fis.getChannel(); // Get the file's size and then map it into memory int sz = (int)fc.size(); - MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_WRITE, 0, sz); + MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, sz); // Decode the file into a char buffer // Charset and decoder for encoding @@ -1229,20 +1227,25 @@ Matcher matcher = pattern.matcher(cb); outString = matcher.replaceAll(replace); - - // write content - // TODO is it a good way to write file ? - fc.position(0); - fc.write(ByteBuffer.wrap(outString.getBytes())); - fc.truncate(outString.getBytes().length); } finally { - if (fc != null) { - fc.close(); + if (fis != null) { + fis.close(); } - if (raf != null) { - raf.close(); + } + + if (outString != null) { + PrintStream ps = null; + try { + ps = new PrintStream(new FileOutputStream(file)); + ps.print(outString); + ps.close(); } + finally { + if (ps != null) { + ps.close(); + } + } } }

1 0

r2097 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org March 30, 2011

March 30, 2011

Author: sletellier Date: 2011-03-30 18:45:03 +0200 (Wed, 30 Mar 2011) New Revision: 2097 Url: http://nuiton.org/repositories/revision/nuiton-utils/2097 Log: - Use set to prevent double property loading 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-03-30 15:00:07 UTC (rev 2096) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-03-30 16:45:03 UTC (rev 2097) @@ -26,7 +26,11 @@ package org.nuiton.util; -import static org.nuiton.i18n.I18n._; +import org.apache.commons.beanutils.ConstructorUtils; +import org.apache.commons.collections.EnumerationUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.converter.ConverterUtil; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -53,18 +57,16 @@ import java.util.Arrays; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.Set; -import org.apache.commons.beanutils.ConstructorUtils; -import org.apache.commons.collections.EnumerationUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.converter.ConverterUtil; +import static org.nuiton.i18n.I18n._; /** * Application configuration. @@ -1787,8 +1789,8 @@ // classpath String filename = getConfigFileName(); Enumeration<URL> enumInClasspath = ClassLoader.getSystemClassLoader().getResources(filename); - List<URL> urlsInClasspath = EnumerationUtils.toList(enumInClasspath); - + Set<URL> urlsInClasspath = new HashSet<URL>(EnumerationUtils.toList(enumInClasspath)); + enumInClasspath = ApplicationConfig.class.getClassLoader().getResources(filename); urlsInClasspath.addAll(EnumerationUtils.toList(enumInClasspath));

1 0

r2096 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by sletellier＠users.nuiton.org March 30, 2011

March 30, 2011

Author: sletellier Date: 2011-03-30 17:00:07 +0200 (Wed, 30 Mar 2011) New Revision: 2096 Url: http://nuiton.org/repositories/revision/nuiton-utils/2096 Log: - Create method setLastDayOfYear and setFirstDayOfYear - Debug setLastDayOfMonth, dont set max of day Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-03-25 12:13:54 UTC (rev 2095) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-03-30 15:00:07 UTC (rev 2096) @@ -152,7 +152,6 @@ int maximum = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); calendar.set(Calendar.DAY_OF_MONTH, maximum); Date lastDay = calendar.getTime(); - lastDay = setMaxTimeOfDay(lastDay); return lastDay; } @@ -165,10 +164,38 @@ public static Date setFirstDayOfMonth(Date date) { Calendar calendar = getDefaultCalendar(date); calendar.set(Calendar.DAY_OF_MONTH, 1); - return calendar.getTime(); + Date firstDay = calendar.getTime(); + return firstDay; } /** + * Set the last day of year to the date in argument. + * + * @param date Date to modify + * @return the date with day of year modified + */ + public static Date setLastDayOfYear(Date date) { + Calendar calendar = getDefaultCalendar(date); + int maximum = calendar.getActualMaximum(Calendar.DAY_OF_YEAR); + calendar.set(Calendar.DAY_OF_YEAR, maximum); + Date lastDay = calendar.getTime(); + return lastDay; + } + + /** + * Set the first day of year to the date in argument. + * + * @param date Date to modify + * @return the date with day of year modified + */ + public static Date setFirstDayOfYear(Date date) { + Calendar calendar = getDefaultCalendar(date); + calendar.set(Calendar.DAY_OF_YEAR, 1); + Date firstDay = calendar.getTime(); + return firstDay; + } + + /** * Set the min time of the day : 00:00:00.000. * * @param date to modify @@ -201,7 +228,7 @@ } /** - * Check if the first date in argument is included between the two other + * Check if the first date in argument is included between the two other * dates. The argument myDate can be equals to beforeDate or afterDate to * validate the includes. * @@ -216,7 +243,7 @@ } boolean result = true; result &= myDate.after(beforeDate) || myDate.compareTo(beforeDate) == 0; - result &= afterDate == null || myDate.before(afterDate) || + result &= afterDate == null || myDate.before(afterDate) || myDate.compareTo(afterDate) == 0; return result; } @@ -226,7 +253,7 @@ * * @param beforeDate the first date of the period * @param afterDate the second date of the period - * @return true if the current date is included between the two dates, + * @return true if the current date is included between the two dates, * false otherwise * @see #between(Date, Date, Date) */ Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-03-25 12:13:54 UTC (rev 2095) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-03-30 15:00:07 UTC (rev 2096) @@ -96,9 +96,31 @@ } Assert.assertTrue(DateUtil.between(day1, firstDayOfFebruary, lastDayOfFebruary)); - Assert.assertTrue(DateUtil.between(day2, firstDayOfFebruary, lastDayOfFebruary)); + + // In this case, day2'hour is after lastDayOfMonth + Assert.assertFalse(DateUtil.between(day2, firstDayOfFebruary, lastDayOfFebruary)); } + /** + * Test of setLastDayOfMonth method, of class DateUtil. + */ + @Test + public void testSetFistLastDayOfYear() { + Date february = DateUtil.createDate(22, 2, 2011); + Date firstDayOf2011 = DateUtil.setFirstDayOfYear(february); + Date lastDayOf2011 = DateUtil.setLastDayOfYear(february); + Date day1 = DateUtil.createDate(0, 0, 2, 1, 2, 2011); + Date day2 = DateUtil.createDate(67, 45, 23, 28, 2, 2012); + + if (log.isDebugEnabled()) { + log.debug("first day of february = " + firstDayOf2011 + ", last day of february = " + + lastDayOf2011 + ", day1 = " + day1 + ", day 2 = " + day2); + } + + Assert.assertTrue(DateUtil.between(day1, firstDayOf2011, lastDayOf2011)); + Assert.assertFalse(DateUtil.between(day2, firstDayOf2011, lastDayOf2011)); + } + /** * Test of between method, of class DateUtil. */

1 0