- Maven-helper-plugin-commits - mailman.cloud.codelutin.com

r794 - in tags: . maven-helper-plugin-1.2.10
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 14:50:20 +0100 (Sun, 21 Nov 2010) New Revision: 794 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/794 Log: [maven-release-plugin] copy for tag maven-helper-plugin-1.2.10 Added: tags/maven-helper-plugin-1.2.10/ Property changes on: tags/maven-helper-plugin-1.2.10 ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr *.iws Added: svn:mergeinfo +

1 0

r793 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 14:46:37 +0100 (Sun, 21 Nov 2010) New Revision: 793 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/793 Log: use m-license-p 3.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 13:41:24 UTC (rev 792) +++ trunk/pom.xml 2010-11-21 13:46:37 UTC (rev 793) @@ -39,7 +39,7 @@ <artifactId>maven-helper-plugin</artifactId> - <version>1.2.10-SNAPSHOT</version> + <version>1.2.10</version> <dependencies> @@ -247,9 +247,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he…</url> </scm>  @@ -260,6 +260,9 @@ <properties> +  + <licensePluginVersion>3.0</licensePluginVersion> + <plexusMailSenderVersion>1.0-alpha-2</plexusMailSenderVersion>

1 0

r792 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 14:41:24 +0100 (Sun, 21 Nov 2010) New Revision: 792 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/792 Log: back to mavenpom 2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 13:39:52 UTC (rev 791) +++ trunk/pom.xml 2010-11-21 13:41:24 UTC (rev 792) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4</version> </parent> <artifactId>maven-helper-plugin</artifactId>

1 0

r791 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 14:39:52 +0100 (Sun, 21 Nov 2010) New Revision: 791 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/791 Log: pass to version 1.2.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 11:07:56 UTC (rev 790) +++ trunk/pom.xml 2010-11-21 13:39:52 UTC (rev 791) @@ -39,7 +39,7 @@ <artifactId>maven-helper-plugin</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.2.10-SNAPSHOT</version> <dependencies>

1 0

r790 - in trunk/src: main/java/org/nuiton/io test/java/org/nuiton/io/xpp3
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 12:07:56 +0100 (Sun, 21 Nov 2010) New Revision: 790 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/790 Log: Anomalie #1086: Always Close IO streams Modified: trunk/src/main/java/org/nuiton/io/SortedProperties.java trunk/src/test/java/org/nuiton/io/xpp3/Xpp3HelperTest.java trunk/src/test/java/org/nuiton/io/xpp3/Xpp3ReaderTest.java Modified: trunk/src/main/java/org/nuiton/io/SortedProperties.java =================================================================== --- trunk/src/main/java/org/nuiton/io/SortedProperties.java 2010-11-20 14:19:50 UTC (rev 789) +++ trunk/src/main/java/org/nuiton/io/SortedProperties.java 2010-11-21 11:07:56 UTC (rev 790) @@ -164,10 +164,15 @@ @Override public void store(OutputStream out, String comments) throws IOException { - store0(new BufferedWriter(new OutputStreamWriter(out, encoding)), -// store0(new BufferedWriter(new OutputStreamWriter(out, "8859_1")), -comments, -true); + BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, encoding)); + try { + store0(writer, + // store0(new BufferedWriter(new OutputStreamWriter(out, "8859_1")), + comments, + true); + } finally { + writer.close(); + } } protected void store0(BufferedWriter bw, String comments, boolean escUnicode) Modified: trunk/src/test/java/org/nuiton/io/xpp3/Xpp3HelperTest.java =================================================================== --- trunk/src/test/java/org/nuiton/io/xpp3/Xpp3HelperTest.java 2010-11-20 14:19:50 UTC (rev 789) +++ trunk/src/test/java/org/nuiton/io/xpp3/Xpp3HelperTest.java 2010-11-21 11:07:56 UTC (rev 790) @@ -75,9 +75,14 @@ Assert.assertTrue(file.exists()); Reader input = new FileReader(file); - Assert.assertNotNull(input); - Xpp3Helper.readObject(null, input); + try { + Assert.assertNotNull(input); + + Xpp3Helper.readObject(null, input); + } finally { + input.close(); + } } @Test(expected = IllegalArgumentException.class) @@ -87,9 +92,13 @@ Assert.assertTrue(file.exists()); Reader input = new FileReader(file); - Assert.assertNotNull(input); + try { + Assert.assertNotNull(input); - Xpp3Helper.readObject(String.class, input); + Xpp3Helper.readObject(String.class, input); + } finally { + input.close(); + } } @Test @@ -98,10 +107,15 @@ File file = new File(Xpp3ReaderTest.dir, "identity.xml"); Assert.assertTrue(file.exists()); + Identity result; Reader input = new FileReader(file); - Assert.assertNotNull(input); + try { + Assert.assertNotNull(input); - Identity result = Xpp3Helper.readObject(Identity.class, input); + result = Xpp3Helper.readObject(Identity.class, input); + } finally { + input.close(); + } Xpp3ReaderTest.assertEqualsSimpleIdentity(result); } @@ -121,9 +135,13 @@ Assert.assertTrue(file.exists()); Reader input = new FileReader(file); - Assert.assertNotNull(input); + try { + Assert.assertNotNull(input); - Xpp3Helper.readObjects(null, input); + Xpp3Helper.readObjects(null, input); + } finally { + input.close(); + } } @Test(expected = IllegalArgumentException.class) @@ -133,18 +151,27 @@ Assert.assertTrue(file.exists()); Reader input = new FileReader(file); - Assert.assertNotNull(input); + try { + Assert.assertNotNull(input); - Xpp3Helper.readObjects(String.class, input); + Xpp3Helper.readObjects(String.class, input); + } finally { + input.close(); + } } @Test public void testReadObjects() throws Exception { File file = new File(Xpp3ReaderTest.dir, "identities.xml"); + Identity[] result; Reader input = new FileReader(file); - Assert.assertNotNull(input); - Identity[] result = Xpp3Helper.readObjects(Identity.class, input); + try { + Assert.assertNotNull(input); + result = Xpp3Helper.readObjects(Identity.class, input); + } finally { + input.close(); + } Xpp3ReaderTest.assertEqualsIdentities(result); } Modified: trunk/src/test/java/org/nuiton/io/xpp3/Xpp3ReaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/io/xpp3/Xpp3ReaderTest.java 2010-11-20 14:19:50 UTC (rev 789) +++ trunk/src/test/java/org/nuiton/io/xpp3/Xpp3ReaderTest.java 2010-11-21 11:07:56 UTC (rev 790) @@ -65,9 +65,14 @@ File file = new File(dir, "identity.xml"); + Identity result; Reader input = new FileReader(file); - Assert.assertNotNull(input); - Identity result = r.read(input); + try { + Assert.assertNotNull(input); + result = r.read(input); + } finally { + input.close(); + } Assert.assertNotNull(result); Identity expected = new Identity(); expected.setFirstName("first name"); @@ -84,9 +89,13 @@ File file = new File(dir, "identities.xml"); Reader input = new FileReader(file); - Assert.assertNotNull(input); - Identity[] result = r.readArray(input); - assertEqualsIdentities(result); + try { + Assert.assertNotNull(input); + Identity[] result = r.readArray(input); + assertEqualsIdentities(result); + } finally { + input.close(); + } } @@ -98,18 +107,33 @@ File file = new File(dir, "identities2.xml"); Assert.assertTrue(file.exists()); + Identity[] result; Reader input = new FileReader(file); - Assert.assertNotNull(input); - Identity[] result = r.readArray(input); + try { + Assert.assertNotNull(input); + result = r.readArray(input); + } finally { + input.close(); + } assertEqualsIdentities(result); r.setAddDefaultEntities(false); - result = r.readArray(new FileReader(file)); + input = new FileReader(file); + try { + result = r.readArray(input); + } finally { + input.close(); + } assertEqualsIdentities(result); r.setAddDefaultEntities(true); - result = r.readArray(new FileReader(file)); + input = new FileReader(file); + try { + result = r.readArray(input); + } finally { + input.close(); + } assertEqualsIdentities(result); @@ -117,8 +141,12 @@ r.setParentRootTagName("identities"); input = new FileReader(new File(dir, "identities.xml")); - Assert.assertNotNull(input); - result = r.readArray(input); + try { + Assert.assertNotNull(input); + result = r.readArray(input); + } finally { + input.close(); + } assertEqualsIdentities(result); }

1 0

r789 - trunk/src/test/java/org/nuiton/io
by tchemit＠users.nuiton.org 20 Nov '10

20 Nov '10

Author: tchemit Date: 2010-11-20 15:19:50 +0100 (Sat, 20 Nov 2010) New Revision: 789 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/789 Log: fix test under windows os Modified: trunk/src/test/java/org/nuiton/io/SortedPropertiesTest.java Modified: trunk/src/test/java/org/nuiton/io/SortedPropertiesTest.java =================================================================== --- trunk/src/test/java/org/nuiton/io/SortedPropertiesTest.java 2010-11-19 16:48:19 UTC (rev 788) +++ trunk/src/test/java/org/nuiton/io/SortedPropertiesTest.java 2010-11-20 14:19:50 UTC (rev 789) @@ -84,7 +84,7 @@ String inStr = PluginHelper.readAsString(in, "utf-8"); String outStr = PluginHelper.readAsString(out, "utf-8"); - Assert.assertEquals(inStr, outStr); + Assert.assertEquals(inStr.trim(), outStr.trim()); } @@ -115,7 +115,7 @@ String inStr = PluginHelper.readAsString(in, "utf-8"); String outStr = PluginHelper.readAsString(out, "utf-8"); - Assert.assertEquals(inStr, outStr); + Assert.assertEquals(inStr.trim(), outStr.trim()); } }

1 0

r788 - trunk/src/main/java/org/nuiton/plugin
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 17:48:19 +0100 (Fri, 19 Nov 2010) New Revision: 788 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/788 Log: Anomalie #1082: DependenciesUtil.sortArtifact fails when list of artifact is empty Modified: trunk/src/main/java/org/nuiton/plugin/DependencyUtil.java Modified: trunk/src/main/java/org/nuiton/plugin/DependencyUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/DependencyUtil.java 2010-11-19 15:57:37 UTC (rev 787) +++ trunk/src/main/java/org/nuiton/plugin/DependencyUtil.java 2010-11-19 16:48:19 UTC (rev 788) @@ -47,7 +47,7 @@ List<Artifact> artifacts, boolean verbose) { - if (artifacts.size() == 1) { + if (artifacts.size() < 2) { return; }

1 0

r787 - in trunk/src: main/java/org/nuiton/io test/java/org/nuiton/io test/resources/org/nuiton/io
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 16:57:37 +0100 (Fri, 19 Nov 2010) New Revision: 787 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/787 Log: Evolution #1081: improve SortedProperties class Added: trunk/src/test/java/org/nuiton/io/SortedPropertiesTest.java trunk/src/test/resources/org/nuiton/io/unicodeLower.txt trunk/src/test/resources/org/nuiton/io/unicodeUpper.txt Modified: trunk/src/main/java/org/nuiton/io/SortedProperties.java Modified: trunk/src/main/java/org/nuiton/io/SortedProperties.java =================================================================== --- trunk/src/main/java/org/nuiton/io/SortedProperties.java 2010-11-19 11:11:42 UTC (rev 786) +++ trunk/src/main/java/org/nuiton/io/SortedProperties.java 2010-11-19 15:57:37 UTC (rev 787) @@ -25,7 +25,9 @@ package org.nuiton.io; -import org.nuiton.plugin.*; +import org.nuiton.plugin.PluginHelper; + +import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -33,7 +35,9 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; +import java.io.Reader; import java.util.Collections; +import java.util.Date; import java.util.Enumeration; import java.util.List; import java.util.Properties; @@ -42,37 +46,68 @@ /** * Permet d'avoir les fichiers de proprietes tries. * - * @author julien + * @author ruchaud <ruchaud(a)codelutin.com> * @author tchemit <chemit(a)codelutin.com> */ public class SortedProperties extends Properties { private static final long serialVersionUID = -1147150444452577558L; + + /** A table of hex digits in upper case */ + private static final char[] hexDigitUpper = { + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' + }; + + /** A table of hex digits in lower case */ + private static final char[] hexDigitLower = { + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' + }; + /** l'encoding a utiliser pour lire et ecrire le properties. */ protected String encoding; + /** un drapeau pour savoir s'il faut enlever l'entete generere */ protected boolean removeHeader; + /** + * A flag to write unicode using the a lower letter. + * <p/> + * Example : {@code \u00e9} instead of {@code \u00E9}. + */ + final protected boolean unicodeLower; + + final protected char[] hexDigit; + + public SortedProperties(String encoding) { - this(encoding, true); + this(encoding, true, false); } public SortedProperties(String encoding, boolean removeHeader) { + this(encoding, removeHeader, false); + } + + public SortedProperties(String encoding, boolean removeHeader, boolean unicodeLower) { this.encoding = encoding; this.removeHeader = removeHeader; + this.unicodeLower = unicodeLower; + hexDigit = unicodeLower ? hexDigitLower : hexDigitUpper; } public SortedProperties(Properties defaults) { super(defaults); + unicodeLower = false; + hexDigit = hexDigitUpper; } @Override - public synchronized Enumeration<Object> keys() { + public Enumeration<Object> keys() { List<Object> objects = Collections.list(super.keys()); Vector<Object> result; try { // Attention, si les clef ne sont pas des string, ca ne marchera pas - List<String> list = PluginHelper.toGenericList(objects, String.class); + List<String> list = + PluginHelper.toGenericList(objects, String.class); Collections.sort(list); result = new Vector<Object>(list); } catch (IllegalArgumentException e) { @@ -91,7 +126,12 @@ * @throws IOException if any io pb */ public SortedProperties load(File src) throws IOException { - super.load(new InputStreamReader(new FileInputStream(src), encoding)); + Reader reader = new InputStreamReader(new FileInputStream(src), encoding); + try { + load(reader); + } finally { + reader.close(); + } return this; } @@ -102,24 +142,180 @@ * @throws IOException if any io pb */ public void store(File dst) throws IOException { - if (removeHeader) { - super.store(new OutputStreamWriter(new PropertiesDateRemoveFilterStream(new FileOutputStream(dst)), encoding), null); - } else { - super.store(new FileOutputStream(dst), null); + OutputStream writer = new FileOutputStream(dst); + try { + store(writer, null); + } finally { + writer.close(); } } /** - * Sauvegarde le properties dans un fichier, sans commentaire en laissant java encode en unicode. + * Sauvegarde le properties dans un fichier, sans commentaire en laissant + * java encode en unicode. * * @param dst le fichier de destination * @throws IOException if any io pb */ public void store(OutputStream dst) throws IOException { - if (removeHeader) { - super.store(new PropertiesDateRemoveFilterStream(dst), null); - } else { - super.store(dst, null); + store(dst, null); + } + + @Override + public void store(OutputStream out, String comments) + throws IOException { + store0(new BufferedWriter(new OutputStreamWriter(out, encoding)), +// store0(new BufferedWriter(new OutputStreamWriter(out, "8859_1")), +comments, +true); + } + + protected void store0(BufferedWriter bw, String comments, boolean escUnicode) + throws IOException { + if (comments != null) { + writeComments(bw, comments); } + if (!removeHeader) { + bw.write("#" + new Date().toString()); + bw.newLine(); + } + synchronized (this) { + for (Enumeration e = keys(); e.hasMoreElements();) { + String key = (String) e.nextElement(); + String val = (String) get(key); + key = saveConvert(key, true, escUnicode); + /* No need to escape embedded and trailing spaces for value, hence + * pass false to flag. + */ + val = saveConvert(val, false, escUnicode); + bw.write(key + "=" + val); + bw.newLine(); + } + } + bw.flush(); } + + /* + * Converts unicodes to encoded \uxxxx and escapes + * special characters with a preceding slash + */ + + protected String saveConvert(String theString, + boolean escapeSpace, + boolean escapeUnicode) { + int len = theString.length(); + int bufLen = len * 2; + if (bufLen < 0) { + bufLen = Integer.MAX_VALUE; + } + StringBuffer outBuffer = new StringBuffer(bufLen); + + for (int x = 0; x < len; x++) { + char aChar = theString.charAt(x); + // Handle common case first, selecting largest block that + // avoids the specials below + if ((aChar > 61) && (aChar < 127)) { + if (aChar == '\\') { + outBuffer.append('\\'); + outBuffer.append('\\'); + continue; + } + outBuffer.append(aChar); + continue; + } + switch (aChar) { + case ' ': + if (x == 0 || escapeSpace) + outBuffer.append('\\'); + outBuffer.append(' '); + break; + case '\t': + outBuffer.append('\\'); + outBuffer.append('t'); + break; + case '\n': + outBuffer.append('\\'); + outBuffer.append('n'); + break; + case '\r': + outBuffer.append('\\'); + outBuffer.append('r'); + break; + case '\f': + outBuffer.append('\\'); + outBuffer.append('f'); + break; + case '=': // Fall through + case ':': // Fall through + case '#': // Fall through + case '!': + outBuffer.append('\\'); + outBuffer.append(aChar); + break; + default: + if (((aChar < 0x0020) || (aChar > 0x007e)) & escapeUnicode) { + outBuffer.append('\\'); + outBuffer.append('u'); + outBuffer.append(toHex((aChar >> 12) & 0xF)); + outBuffer.append(toHex((aChar >> 8) & 0xF)); + outBuffer.append(toHex((aChar >> 4) & 0xF)); + outBuffer.append(toHex(aChar & 0xF)); + } else { + outBuffer.append(aChar); + } + } + } + return outBuffer.toString(); + } + + public void writeComments(BufferedWriter bw, String comments) + throws IOException { + bw.write("#"); + int len = comments.length(); + int current = 0; + int last = 0; + char[] uu = new char[6]; + uu[0] = '\\'; + uu[1] = 'u'; + while (current < len) { + char c = comments.charAt(current); + if (c > '\u00ff' || c == '\n' || c == '\r') { + if (last != current) + bw.write(comments.substring(last, current)); + if (c > '\u00ff') { + uu[2] = toHex((c >> 12) & 0xf); + uu[3] = toHex((c >> 8) & 0xf); + uu[4] = toHex((c >> 4) & 0xf); + uu[5] = toHex(c & 0xf); + bw.write(new String(uu)); + } else { + bw.newLine(); + if (c == '\r' && + current != len - 1 && + comments.charAt(current + 1) == '\n') { + current++; + } + if (current == len - 1 || + (comments.charAt(current + 1) != '#' && + comments.charAt(current + 1) != '!')) + bw.write("#"); + } + last = current + 1; + } + current++; + } + if (last != current) + bw.write(comments.substring(last, current)); + bw.newLine(); + } + + /** + * Convert a nibble to a hex character + * + * @param nibble the nibble to convert. + */ + protected char toHex(int nibble) { + return hexDigit[(nibble & 0xF)]; + } + } Added: trunk/src/test/java/org/nuiton/io/SortedPropertiesTest.java =================================================================== --- trunk/src/test/java/org/nuiton/io/SortedPropertiesTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/io/SortedPropertiesTest.java 2010-11-19 15:57:37 UTC (rev 787) @@ -0,0 +1,121 @@ +/* + * #%L + * Maven helper plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.io; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.plugin.PluginHelper; +import org.nuiton.plugin.TestHelper; + +import java.io.File; +import java.net.URL; + +/** + * To test {@link SortedProperties}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 + */ +public class SortedPropertiesTest { + + + /** Logger */ + static private Log log = LogFactory.getLog(SortedPropertiesTest.class); + + static File testDir; + + @BeforeClass + public static void init() throws Exception { + testDir = TestHelper.getTestDir(SortedPropertiesTest.class, + "target" + File.separator + "surefire-workdir" + ); + PluginHelper.createDirectoryIfNecessary(testDir); + } + + /** + * To test that a file loaded then stored keep unicode as they were previously. + * <p/> + * In fact we can have some {@code \u00E9} and {@code \u00e9}. + * + * @throws Exception if any error + */ + @Test + public void testUnicodeUpperInvolution() throws Exception { + + URL resource = getClass().getResource("unicodeUpper.txt"); + File in = new File(resource.toURI()); + + log.info("Load file " + in); + SortedProperties p = new SortedProperties("utf-8", true); + + p.load(in); + + File out = new File(testDir, in.getName() + "~"); + + log.info("Store file to " + out); + + p.store(out); + + String inStr = PluginHelper.readAsString(in, "utf-8"); + String outStr = PluginHelper.readAsString(out, "utf-8"); + + Assert.assertEquals(inStr, outStr); + + } + + /** + * To test that a file loaded then stored keep unicode as they were previously. + * <p/> + * In fact we can have some {@code \u00E9} and {@code \u00e9}. + * + * @throws Exception if any error + */ + @Test + public void testUnicodeLowerInvolution() throws Exception { + + URL resource = getClass().getResource("unicodeLower.txt"); + File in = new File(resource.toURI()); + + log.info("Load file " + in); + SortedProperties p = new SortedProperties("utf-8", true, true); + + p.load(in); + + File out = new File(testDir, in.getName() + "~"); + + log.info("Store file to " + out); + + p.store(out); + + String inStr = PluginHelper.readAsString(in, "utf-8"); + String outStr = PluginHelper.readAsString(out, "utf-8"); + + Assert.assertEquals(inStr, outStr); + + } +} Added: trunk/src/test/resources/org/nuiton/io/unicodeLower.txt =================================================================== --- trunk/src/test/resources/org/nuiton/io/unicodeLower.txt (rev 0) +++ trunk/src/test/resources/org/nuiton/io/unicodeLower.txt 2010-11-19 15:57:37 UTC (rev 787) @@ -0,0 +1 @@ +key1=hum\u00e9 Added: trunk/src/test/resources/org/nuiton/io/unicodeUpper.txt =================================================================== --- trunk/src/test/resources/org/nuiton/io/unicodeUpper.txt (rev 0) +++ trunk/src/test/resources/org/nuiton/io/unicodeUpper.txt 2010-11-19 15:57:37 UTC (rev 787) @@ -0,0 +1 @@ +key1=hum\u00E9

1 0

r786 - in trunk: . src/license
by tchemit＠users.nuiton.org 19 Nov '10

19 Nov '10

Author: tchemit Date: 2010-11-19 12:11:42 +0100 (Fri, 19 Nov 2010) New Revision: 786 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/786 Log: regenerate thrid-party with m-license-p 3.0 + reuse ibraries version from mavenpom Modified: trunk/pom.xml trunk/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 16:46:52 UTC (rev 785) +++ trunk/pom.xml 2010-11-19 11:11:42 UTC (rev 786) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <artifactId>maven-helper-plugin</artifactId> @@ -48,19 +48,22 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.5</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.1</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -157,7 +160,7 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-provider-api</artifactId> - <version>1.0-beta-6</version> + <version>1.0-beta-7</version> <scope>provided</scope> </dependency> @@ -201,13 +204,11 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.2</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> <scope>test</scope> </dependency> @@ -270,8 +271,6 @@  <siteSourcesType>apt</siteSourcesType> - <mavenVersion>2.2.1</mavenVersion> - </properties> <build> Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2010-11-11 16:46:52 UTC (rev 785) +++ trunk/src/license/THIRD-PARTY.properties 2010-11-19 11:11:42 UTC (rev 786) @@ -1,27 +1,3 @@ -### -# #%L -# Maven helper plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : @@ -37,14 +13,10 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 22 20:18:44 CEST 2010 -classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html -commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 -commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 -commons-collections--commons-collections--3.1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 -oro--oro--2.0.8=The Apache Software License, Version 2.0 -plexus--plexus-mail-sender-api--1.0-alpha-2=The Apache Software License, Version 2.0 -#plexus--plexus-mail-sender-javamail--1.0-alpha-2=The Apache Software License, Version 2.0 -#plexus--plexus-mail-sender-simple--1.0-alpha-2=The Apache Software License, Version 2.0 +#Fri Nov 19 11:37:21 CET 2010 +classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html +commons-cli--commons-cli--1.0--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 +plexus--plexus-mail-sender-api--1.0-alpha-2--jar=The Apache Software License, Version 2.0

1 0

r785 - trunk
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 17:46:52 +0100 (Thu, 11 Nov 2010) New Revision: 785 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/785 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 16:46:50 UTC (rev 784) +++ trunk/pom.xml 2010-11-11 16:46:52 UTC (rev 785) @@ -39,7 +39,7 @@ <artifactId>maven-helper-plugin</artifactId> - <version>1.2.9</version> + <version>1.3-SNAPSHOT</version> <dependencies> @@ -246,9 +246,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> </scm>

1 0