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

r1692 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 29 Oct '09

29 Oct '09

Author: echatellier Date: 2009-10-29 18:44:59 +0100 (Thu, 29 Oct 2009) New Revision: 1692 Modified: trunk/src/main/java/org/nuiton/util/ZipUtil.java Log: Autant la mettre public... Modified: trunk/src/main/java/org/nuiton/util/ZipUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ZipUtil.java 2009-10-29 17:36:00 UTC (rev 1691) +++ trunk/src/main/java/org/nuiton/util/ZipUtil.java 2009-10-29 17:44:59 UTC (rev 1692) @@ -432,7 +432,7 @@ * @param excludes excludes pattern (pattern must match complete entry name including root folder) * @throws IOException */ - protected static void uncompressFiltred(File file, File targetDir, String... excludes) throws IOException { + public static void uncompressFiltred(File file, File targetDir, String... excludes) throws IOException { ZipFile zipFile = new ZipFile(file);

1 0

r1691 - trunk
by echatellier＠users.nuiton.org 29 Oct '09

29 Oct '09

Author: echatellier Date: 2009-10-29 18:36:00 +0100 (Thu, 29 Oct 2009) New Revision: 1691 Modified: trunk/changelog.txt Log: Complete changelog Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-29 17:28:59 UTC (rev 1690) +++ trunk/changelog.txt 2009-10-29 17:36:00 UTC (rev 1691) @@ -1,5 +1,6 @@ 1.1.2 xxx 200910xx + * Add new uncompress method with exclusion filters * [FEATURE] Force application configuration properties to be written sorted * [FEATURE] Add sed and grep method on FileUtil

1 0

r1690 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util test/resources test/resources/zip
by echatellier＠users.nuiton.org 29 Oct '09

29 Oct '09

Author: echatellier Date: 2009-10-29 18:28:59 +0100 (Thu, 29 Oct 2009) New Revision: 1690 Added: trunk/src/test/resources/zip/ trunk/src/test/resources/zip/test-uncompress.zip Modified: trunk/src/main/java/org/nuiton/util/ZipUtil.java trunk/src/test/java/org/nuiton/util/ZipUtilTest.java Log: Move uncompress filtred method from isis to nuiton-utils. Modified: trunk/src/main/java/org/nuiton/util/ZipUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ZipUtil.java 2009-10-26 16:26:38 UTC (rev 1689) +++ trunk/src/main/java/org/nuiton/util/ZipUtil.java 2009-10-29 17:28:59 UTC (rev 1690) @@ -26,6 +26,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.Collection; @@ -424,6 +425,55 @@ } /** + * Unzip compressed archive and keep non excluded patterns. + * + * @param file archive file + * @param targetDir destination file + * @param excludes excludes pattern (pattern must match complete entry name including root folder) + * @throws IOException + */ + protected static void uncompressFiltred(File file, File targetDir, String... excludes) throws IOException { + + ZipFile zipFile = new ZipFile(file); + + Enumeration<? extends ZipEntry> entries = zipFile.entries(); + + while (entries.hasMoreElements()) { + ZipEntry entry = entries.nextElement(); + + String name = entry.getName(); + // add continue to break loop + boolean excludeEntry = false; + if (excludes != null) { + for (String exclude : excludes) { + if (name.matches(exclude)) { + excludeEntry = true; + } + } + } + + if (!excludeEntry) { + File target = new File(targetDir, name); + if (entry.isDirectory()) { + target.mkdirs(); + } else { + // get inputstream only here + InputStream in = zipFile.getInputStream(entry); + target.getParentFile().mkdirs(); + OutputStream out = new BufferedOutputStream(new FileOutputStream(target)); + byte[] buffer = new byte[8 * 1024]; + int len; + + while ((len = in.read(buffer, 0, 8 * 1024)) != -1) { + out.write(buffer, 0, len); + } + out.close(); + in.close(); + } + } + } + } + /** * @deprecated unused/undocumented function */ public static String convertToZipEntryName(String txt, boolean isDir) { Modified: trunk/src/test/java/org/nuiton/util/ZipUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ZipUtilTest.java 2009-10-26 16:26:38 UTC (rev 1689) +++ trunk/src/test/java/org/nuiton/util/ZipUtilTest.java 2009-10-29 17:28:59 UTC (rev 1690) @@ -143,4 +143,46 @@ Assert.assertTrue(md5File.length() > 0); } + /** + * Test la fonction de decompression sans filtres. + * + * @throws IOException + */ + @Test + public void testUncompressFiltredWithoutFilter() throws IOException { + File archive = new File("src" + File.separator + "test" + + File.separator + "resources" + File.separator + "zip" + + File.separator + "test-uncompress.zip"); + File dest = new File("target", "testunzip"); + + if (log.isInfoEnabled()) { + log.info("Extracting " + archive + " to " + dest); + } + + ZipUtil.uncompressFiltred(archive, dest); + File ruleFile = new File(dest, "test-nonregression-20090203" + File.separator + "scripts" + File.separator + "RuleUtil.java"); + Assert.assertTrue(ruleFile.exists()); + } + + /** + * Test la fonction de decompression avec filtres. + * + * @throws IOException + */ + @Test + public void testUncompressFiltredWithFilter() throws IOException { + File archive = new File("src" + File.separator + "test" + + File.separator + "resources" + File.separator + "zip" + + File.separator + "test-uncompress.zip"); + File dest = new File("target", "testunzip2"); + String pattern = ".*/scripts/.*"; + + if (log.isInfoEnabled()) { + log.info("Extracting " + archive + " to " + dest + " without " + pattern); + } + + ZipUtil.uncompressFiltred(archive, dest, pattern); + File ruleFile = new File(dest, "test-nonregression-20090203" + File.separator + "scripts" + File.separator + "RuleUtil.java"); + Assert.assertFalse(ruleFile.exists()); + } } Added: trunk/src/test/resources/zip/test-uncompress.zip =================================================================== (Binary files differ) Property changes on: trunk/src/test/resources/zip/test-uncompress.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r1689 - trunk
by echatellier＠users.nuiton.org 26 Oct '09

26 Oct '09

Author: echatellier Date: 2009-10-26 17:26:38 +0100 (Mon, 26 Oct 2009) New Revision: 1689 Modified: trunk/pom.xml Log: commons-beanutils version bump. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-19 12:44:59 UTC (rev 1688) +++ trunk/pom.xml 2009-10-26 16:26:38 UTC (rev 1689) @@ -51,7 +51,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.0</version> + <version>1.8.1</version> <scope>compile</scope> </dependency>

1 0

r1688 - in trunk: . src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 20 Oct '09

20 Oct '09

Author: echatellier Date: 2009-10-19 14:44:59 +0200 (Mon, 19 Oct 2009) New Revision: 1688 Modified: trunk/changelog.txt trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: Force application configuration properties to be written sorted Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-11 11:27:27 UTC (rev 1687) +++ trunk/changelog.txt 2009-10-19 12:44:59 UTC (rev 1688) @@ -1,5 +1,6 @@ 1.1.2 xxx 200910xx + * [FEATURE] Force application configuration properties to be written sorted * [FEATURE] Add sed and grep method on FileUtil -- Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-10-11 11:27:27 UTC (rev 1687) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-10-19 12:44:59 UTC (rev 1688) @@ -416,7 +416,10 @@ * @throws IOException if IO pb */ public void save(File file, boolean forceAll, String... excludeKeys) throws IOException { - Properties prop = new Properties(); + + // store sorted in file + Properties prop = new SortedProperties(); + if (forceAll) { prop.putAll(defaults); prop.putAll(classpath);

2 1

r1687 - trunk
by tchemit＠users.nuiton.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 13:27:27 +0200 (Sun, 11 Oct 2009) New Revision: 1687 Modified: trunk/pom.xml Log: - use jrst.Version - use redmine.releaseFiles to collect files to send to redmine - bump junit, i18n and processor versions Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 16:45:35 UTC (rev 1686) +++ trunk/pom.xml 2009-10-11 11:27:27 UTC (rev 1687) @@ -22,6 +22,9 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> +  <scope>compile</scope> </dependency> @@ -88,8 +91,7 @@ <i18n.version>1.0.2-SNAPSHOT</i18n.version>  - <redmine.releaseFiles>target/${project.artifactId}-${project.version}-deps.zip, - target/${project.artifactId}-${project.version}-full.zip</redmine.releaseFiles> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> </properties>

1 0

r1686 - trunk
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 18:45:35 +0200 (Sat, 10 Oct 2009) New Revision: 1686 Modified: trunk/pom.xml Log: utilisation de mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-02 10:01:18 UTC (rev 1685) +++ trunk/pom.xml 2009-10-10 16:45:35 UTC (rev 1686) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1685 - in trunk: . src/main/java/org/nuiton/util src/test/java/org/nuiton/util
by echatellier＠users.nuiton.org 02 Oct '09

02 Oct '09

Author: echatellier Date: 2009-10-02 12:01:18 +0200 (Fri, 02 Oct 2009) New Revision: 1685 Modified: trunk/changelog.txt trunk/src/main/java/org/nuiton/util/FileUtil.java trunk/src/test/java/org/nuiton/util/FileUtilTest.java Log: Add sed method (unix like) on FileUtil. Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-09-26 02:30:43 UTC (rev 1684) +++ trunk/changelog.txt 2009-10-02 10:01:18 UTC (rev 1685) @@ -1,3 +1,9 @@ +1.1.2 xxx 200910xx + + * [FEATURE] Add sed and grep method on FileUtil + +-- + 1.1.1 chemit 20090903 * [FEATURE] #39 add a filterVersions method in VersionUtil Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2009-09-26 02:30:43 UTC (rev 1684) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2009-10-02 10:01:18 UTC (rev 1685) @@ -43,6 +43,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; +import java.io.PrintStream; import java.nio.CharBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; @@ -958,9 +959,9 @@ Matcher lm = linePattern.matcher(cb); // Line matcher Matcher pm = null; // Pattern matcher - int lines = 0; + //int lines = 0; while (lm.find()) { - lines++; + //lines++; CharSequence cs = lm.group(); // The current line if (pm == null) { pm = pattern.matcher(cs); @@ -982,7 +983,7 @@ return linesList; } - + /** * Java implementation for the unix grep command. * @@ -1056,4 +1057,73 @@ return results; } + /** + * Sed implementation for a single file. + * + * Oginal source code from http://kickjava.com/src/org/apache/lenya/util/SED.java.htm. + * + * @param searchRegex Prefix which shall be replaced + * @param replace Prefix which is going to replace the original + * @param file File which sed shall be applied + * @param encoding charset encoding + * @throws IOException + */ + public static void sed(String searchRegex, String replace, File file, String encoding) throws IOException { + + Pattern pattern = Pattern.compile(searchRegex); + + // Open the file and then get a channel from the stream + FileInputStream 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_ONLY, 0, sz); + + // Decode the file into a char buffer + // Charset and decoder for encoding + Charset charset = Charset.forName(encoding); + CharsetDecoder decoder = charset.newDecoder(); + CharBuffer cb = decoder.decode(bb); + + Matcher matcher = pattern.matcher(cb); + String outString = matcher.replaceAll(replace); + + FileOutputStream fos = new FileOutputStream(file.getAbsolutePath()); + PrintStream ps = new PrintStream(fos); + ps.print(outString); + ps.close(); + fos.close(); + } + + /** + * Java implementation for the unix sed command. + * + * @param searchRegex regex to search into file + * @param replace string to replace matching patterns + * @param rootDirectory directory to search into + * @param fileRegex regex for file to find in {@code rootDirectory} + * @param encoding encoding to use + * @throws IOException + */ + public static void sed(String searchRegex, String replace, File rootDirectory, String fileRegex, String encoding) throws IOException { + List<File> files = FileUtil.find(rootDirectory, fileRegex, true); + for (File file : files) { + sed(searchRegex, replace, file, encoding); + } + } + + /** + * Java implementation for the unix sed command. + * + * @param searchRegex regex to search into file + * @param replace string to replace matching patterns + * @param fileRegex regex for file to find in current dir + * @param encoding encoding to use + * @throws IOException + */ + public static void sed(String searchRegex, String replace, String fileRegex, String encoding) throws IOException { + sed(searchRegex, replace, new File("."), fileRegex, encoding); + } + } // FileUtil Modified: trunk/src/test/java/org/nuiton/util/FileUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2009-09-26 02:30:43 UTC (rev 1684) +++ trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2009-10-02 10:01:18 UTC (rev 1685) @@ -141,5 +141,66 @@ Assert.assertTrue(results.size() > 100); } + + /** + * Test sed method on a single file. + * @throws IOException + */ + @Test + public void testSedSingleFile() 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); + List<CharSequence> lines = FileUtil.grep("grep\$String .*\$", testUtilFile , "UTF-8"); + Assert.assertEquals(4, lines.size()); + + lines = FileUtil.grep("sedfoo", testUtilFile , "UTF-8"); + Assert.assertNull(lines); + + // real method to test here : sed + FileUtil.sed("grep", "sedfoo", testUtilFile , "UTF-8"); + + lines = FileUtil.grep("grep\$String .*\$", testUtilFile , "UTF-8"); + Assert.assertNull(lines); + + lines = FileUtil.grep("sedfoo", testUtilFile , "UTF-8"); + Assert.assertEquals(9, lines.size()); + + // clean + FileUtil.deleteRecursively(testDirectory); + } + + /** + * Test sed on a multiple files. + * + * Try to replace all "CodeLutin" by "nuiton" in all files. Can fail if some + * src files are deleted. + * + * @throws IOException + */ + @Test + public void testSedMultiple() throws IOException { + + // try to not make sed in real src dir ;) + File testDirectory = FileUtil.createTempDirectory("sed", "test"); + FileUtil.copyRecursively(new File("src").getAbsoluteFile(), testDirectory); + + Map<File, List<CharSequence>> results = FileUtil.grep("CodeLutin", testDirectory , ".*\\.java", "UTF-8"); + Assert.assertTrue(results.size() > 100); + + FileUtil.sed("CodeLutin", "Nuiton", testDirectory, ".*\\.java" , "UTF-8"); + + results = FileUtil.grep("CodeLutin", testDirectory , ".*\\.java", "UTF-8"); + Assert.assertTrue(results.isEmpty()); + + results = FileUtil.grep("Nuiton", testDirectory , ".*\\.java", "UTF-8"); + Assert.assertTrue(results.size() > 100); + + // clean + FileUtil.deleteRecursively(testDirectory); + } + } // FileUtilTest

1 0