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

r1755 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 26 Jan '10

26 Jan '10

Author: echatellier Date: 2010-01-26 11:43:47 +0100 (Tue, 26 Jan 2010) New Revision: 1755 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: Add a method to print config in a custom output stream Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-25 16:08:00 UTC (rev 1754) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-26 10:43:47 UTC (rev 1755) @@ -25,6 +25,7 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; +import java.io.PrintStream; import java.io.Writer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -1073,22 +1074,32 @@ } /** - * For debugging + * For debugging. */ public void printConfig() { System.out.println("-------------------Value-------------------------"); - System.out.println("defaults " + defaults); - System.out.println("classpath " + classpath); - System.out.println("etcfile " + etcfile); - System.out.println("homefile " + homefile); - System.out.println("curfile " + curfile); - System.out.println("env " + env); - System.out.println("jvm " + jvm); - System.out.println("line " + line); - System.out.println("options " + options); + printConfig(System.out); System.out.println("-------------------------------------------------"); } + /** + * Print out current configuration in specified output. + * + * @param output output to write config to + * @since 1.1.4 + */ + public void printConfig(PrintStream output) { + output.println("defaults " + defaults); + output.println("classpath " + classpath); + output.println("etcfile " + etcfile); + output.println("homefile " + homefile); + output.println("curfile " + curfile); + output.println("env " + env); + output.println("jvm " + jvm); + output.println("line " + line); + output.println("options " + options); + } + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { pcs.firePropertyChange(propertyName, oldValue, newValue); }

1 0

r1754 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by echatellier＠users.nuiton.org 25 Jan '10

25 Jan '10

Author: echatellier Date: 2010-01-25 17:08:00 +0100 (Mon, 25 Jan 2010) New Revision: 1754 Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java trunk/src/test/java/org/nuiton/util/FileUtilTest.java Log: Fix end of file always lost bug. Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-01-25 14:52:16 UTC (rev 1753) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-01-25 16:08:00 UTC (rev 1754) @@ -1116,7 +1116,7 @@ // TODO is it a good way to write file ? fc.position(0); fc.write(ByteBuffer.wrap(outString.getBytes())); - fc.truncate(outString.length()); + fc.truncate(outString.getBytes().length); } finally { if (fc != null) { Modified: trunk/src/test/java/org/nuiton/util/FileUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2010-01-25 14:52:16 UTC (rev 1753) +++ trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2010-01-25 16:08:00 UTC (rev 1754) @@ -217,11 +217,15 @@ File testUtilFile = FileUtil.find(testDirectory, ".*FileUtil\\.java", true).get(0); // real method to test here : sed - FileUtil.sed(".*\\*.*", "**removed**", testUtilFile , "UTF-8"); + FileUtil.sed(".*\\*.*", "** skipped **", testUtilFile , "UTF-8"); List<CharSequence> lines = FileUtil.grep("/var/tmp/bidulle", testUtilFile , "UTF-8"); Assert.assertNull(lines); + // test une presence en debut et fin de fichier + List<CharSequence> lines2 = FileUtil.grep("// FileUtil", testUtilFile , "UTF-8"); + Assert.assertEquals(2, lines2.size()); + // clean FileUtil.deleteRecursively(testDirectory); }

1 0

r1753 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by echatellier＠users.nuiton.org 25 Jan '10

25 Jan '10

Author: echatellier Date: 2010-01-25 15:52:16 +0100 (Mon, 25 Jan 2010) New Revision: 1753 Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java trunk/src/test/java/org/nuiton/util/FileUtilTest.java Log: Test another way to write file at sed method end. Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-01-24 23:36:43 UTC (rev 1752) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-01-25 14:52:16 UTC (rev 1753) @@ -43,7 +43,8 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.PrintStream; +import java.io.RandomAccessFile; +import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; @@ -1090,17 +1091,17 @@ Pattern pattern = Pattern.compile(searchRegex); - FileInputStream fis = null; + RandomAccessFile raf = null; FileChannel fc = null; String outString = null; try { // Open the file and then get a channel from the stream - fis = new FileInputStream(file); - fc = fis.getChannel(); + raf = new RandomAccessFile(file, "rw"); + fc = raf.getChannel(); // Get the file's size and then map it into memory int sz = (int)fc.size(); - MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, sz); + MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_WRITE, 0, sz); // Decode the file into a char buffer // Charset and decoder for encoding @@ -1110,33 +1111,21 @@ 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.length()); } finally { if (fc != null) { fc.close(); } - if (fis != null) { - fis.close(); + if (raf != null) { + raf.close(); } } - - if (outString != null) { - FileOutputStream fos = null; - PrintStream ps = null; - try { - fos = new FileOutputStream(file.getAbsolutePath()); - ps = new PrintStream(fos); - ps.print(outString); - } - finally { - if (ps != null) { - ps.close(); - } - if (fos != null) { - fos.close(); - } - } - } } /** Modified: trunk/src/test/java/org/nuiton/util/FileUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2010-01-24 23:36:43 UTC (rev 1752) +++ trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2010-01-25 14:52:16 UTC (rev 1753) @@ -202,5 +202,28 @@ // clean FileUtil.deleteRecursively(testDirectory); } + + /** + * Test that sed result which produce shorter file work as well. + * + * @throws IOException + */ + @Test + public void testSedComment() throws IOException { + // try to not make sed in real src dir ;) + File testDirectory = FileUtil.createTempDirectory("sed", "test"); + FileUtil.copyRecursively(new File("src").getAbsoluteFile(), testDirectory); + File testUtilFile = FileUtil.find(testDirectory, ".*FileUtil\\.java", true).get(0); + + // real method to test here : sed + FileUtil.sed(".*\\*.*", "**removed**", testUtilFile , "UTF-8"); + + List<CharSequence> lines = FileUtil.grep("/var/tmp/bidulle", testUtilFile , "UTF-8"); + Assert.assertNull(lines); + + // clean + FileUtil.deleteRecursively(testDirectory); + } + } // FileUtilTest

1 0

r1752 - trunk
by tchemit＠users.nuiton.org 24 Jan '10

24 Jan '10

Author: tchemit Date: 2010-01-25 00:36:43 +0100 (Mon, 25 Jan 2010) New Revision: 1752 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 17:34:35 UTC (rev 1751) +++ trunk/pom.xml 2010-01-24 23:36:43 UTC (rev 1752) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1751 - trunk
by tchemit＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: tchemit Date: 2010-01-19 18:34:35 +0100 (Tue, 19 Jan 2010) New Revision: 1751 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 20:15:23 UTC (rev 1750) +++ trunk/pom.xml 2010-01-19 17:34:35 UTC (rev 1751) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1750 - trunk
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 21:15:23 +0100 (Sun, 17 Jan 2010) New Revision: 1750 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 17:56:14 UTC (rev 1749) +++ trunk/pom.xml 2010-01-17 20:15:23 UTC (rev 1750) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0</version> + <version>2.0.1</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1749 - trunk
by fdesbois＠users.nuiton.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 18:56:14 +0100 (Fri, 15 Jan 2010) New Revision: 1749 Modified: trunk/pom.xml Log: Use jdk 1.5 and last i18n snapshot Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 17:09:52 UTC (rev 1748) +++ trunk/pom.xml 2010-01-15 17:56:14 UTC (rev 1749) @@ -102,11 +102,13 @@ <packaging>jar</packaging> <properties> - <i18n.version>1.0.1</i18n.version> + <i18n.version>1.0.2-SNAPSHOT</i18n.version>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + <maven.compile.source>1.5</maven.compile.source> + <maven.compile.target>1.5</maven.compile.target> </properties> <build>

1 0

r1748 - trunk
by fdesbois＠users.nuiton.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 18:09:52 +0100 (Fri, 15 Jan 2010) New Revision: 1748 Modified: trunk/pom.xml Log: remove defaultGoal Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 16:44:43 UTC (rev 1747) +++ trunk/pom.xml 2010-01-15 17:09:52 UTC (rev 1748) @@ -110,9 +110,7 @@ </properties> <build> - - <defaultGoal>install</defaultGoal> - + <plugins>

1 0

r1747 - trunk
by fdesbois＠users.nuiton.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 17:44:43 +0100 (Fri, 15 Jan 2010) New Revision: 1747 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 16:44:42 UTC (rev 1746) +++ trunk/pom.xml 2010-01-15 16:44:43 UTC (rev 1747) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> <dependencies> @@ -154,9 +154,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.3</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <profiles>

1 0

r1746 - in tags: . nuiton-utils-1.1.3
by fdesbois＠users.nuiton.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 17:44:42 +0100 (Fri, 15 Jan 2010) New Revision: 1746 Added: tags/nuiton-utils-1.1.3/ Log: [maven-scm] copy for tag nuiton-utils-1.1.3 Property changes on: tags/nuiton-utils-1.1.3 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0