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

r1695 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 06:51:40 +0100 (Mon, 02 Nov 2009) New Revision: 1695 Modified: trunk/src/main/java/org/nuiton/util/VersionUtil.java Log: fix javadoc, remove redundant initializer Modified: trunk/src/main/java/org/nuiton/util/VersionUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/VersionUtil.java 2009-11-02 03:48:10 UTC (rev 1694) +++ trunk/src/main/java/org/nuiton/util/VersionUtil.java 2009-11-02 05:51:40 UTC (rev 1695) @@ -18,12 +18,7 @@ */ package org.nuiton.util; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.regex.Pattern; /** @@ -116,7 +111,7 @@ * @throws IllegalArgumentException si la version donnee contient deja un classifier. */ public static Version addClassifier(Version version, String classifier, Integer classifierNumber) throws NullPointerException, IllegalArgumentException { - Version result = null; + Version result; if (classifier == null) { throw new NullPointerException("classifier can not be null"); } @@ -140,7 +135,7 @@ * @throws IllegalArgumentException si la version donnee contient deja un classifier. */ public static Version removeClassifier(Version version) throws IllegalArgumentException { - Version result = null; + Version result; if (!version.hasClassifier()) { throw new IllegalArgumentException("version " + version + "does no contain a classifier "); } @@ -230,7 +225,7 @@ } /** - * Le contrat d'un comparateur de versions permettant de controler + * L'implantation d'un comparateur de versions permettant de controler * l'ordre du numero de version, classifier et numero de classifer. * * Toute implementation de ce contrat devrait suivre cet algorithme : @@ -247,10 +242,6 @@ * * 4) On teste l'ordre des versions de classifiers {@link #compareClassifierNumber(org.nuiton.util.Version, org.nuiton.util.Version)}. * - * Une implantation par defaut est fournie : - * - * @see DefaultVersionComparator * - * */ public static class VersionComparator implements Comparator<Version> {

1 0

r1694 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:48:10 +0100 (Mon, 02 Nov 2009) New Revision: 1694 Modified: trunk/pom.xml Log: use mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:42:41 UTC (rev 1693) +++ trunk/pom.xml 2009-11-02 03:48:10 UTC (rev 1694) @@ -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/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> @@ -10,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>nuiton-utils</artifactId> @@ -80,7 +81,7 @@ <description>Library of usefull class to be used in any project.</description> <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/nuiton-utils</url> - +    @@ -92,7 +93,7 @@  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - + </properties> <build>

1 0

r1693 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:42:41 +0100 (Mon, 02 Nov 2009) New Revision: 1693 Modified: trunk/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target velocity.log maven.log .eclipse .classpath lutinutil.iml lutinutil.ipr lutinutil.iws .settings .project + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project

1 0

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