Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parsing of windows user names was broken

Browse Source 
PR: MPCHANGELOG-22
Obtained from: Tim Shadel
Submitted by:	Tim Shadel
Reviewed by:	dIon


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115213 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
dion
2004-05-10 02:00:25 +00:00
parent fb784890ca
commit 162bbdeed4
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
View File

@@ -44,7 +44,7 @@ import org.apache.regexp.RESyntaxException;
* @author <a href="mailto:dion@multitask.com.au">dIon Gillard</a>
* @author <a href="mailto:pete-apache-dev@kazmier.com">Pete Kazmier</a>
* @author Daniel Rall
* @version $Id: SvnChangeLogParser.java,v 1.4 2004/03/02 15:00:18 evenisse Exp $
* @version $Id: SvnChangeLogParser.java,v 1.5 2004/05/10 02:00:25 dion Exp $
*/
class SvnChangeLogParser implements ChangeLogParser
{
@@ -82,7 +82,7 @@ class SvnChangeLogParser implements ChangeLogParser
/** The pattern used to match svn header lines */
private static final String pattern =
"^r(\\d+)\\s+\\|\\s+" + // revision number
"(\\w+)\\s+\\|\\s+" + // author username
"(\\S+)\\s+\\|\\s+" + // author username
"(\\d+-\\d+-\\d+ " + // date 2002-08-24
"\\d+:\\d+:\\d+) " + // time 16:01:00
"([\\-+])(\\d\\d)(\\d\\d)"; // gmt offset -0400

8
changelog/src/test-resources/svnlib/svnlog.txt
View File

@@ -209,4 +209,12 @@ Changed paths:
A /poolserver/trunk
Poolserver Main Trunk
------------------------------------------------------------------------
r1 | DOMAIN\user | 2002-08-21 00:20:25 -0400 (Wed, 21 Aug 2002) | 3 lines
Changed paths:
M /poolserver/trunk/build.xml
Cleaned up some whitespace.
------------------------------------------------------------------------

12
changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
View File

@@ -30,7 +30,7 @@ import org.apache.maven.changelog.ChangeLogEntry;
* Test cases for {@link SvnChangeLogParser}.
*
* @author <a href="mailto:pete-apache-dev@kazmier.com">Pete Kazmier</a>
* @version $Id: SvnChangeLogParserTest.java,v 1.4 2004/03/02 15:00:19 evenisse Exp $
* @version $Id: SvnChangeLogParserTest.java,v 1.5 2004/05/10 02:00:25 dion Exp $
*/
public class SvnChangeLogParserTest extends TestCase
{
@@ -77,7 +77,7 @@ public class SvnChangeLogParserTest extends TestCase
FileInputStream fis = new FileInputStream(testFile);
List entries = new ArrayList(parser.parse(fis));
assertEquals("Wrong number of entries returned", 12, entries.size());
assertEquals("Wrong number of entries returned", 13, entries.size());
ChangeLogEntry entry = (ChangeLogEntry) entries.get(0);
assertEquals("Entry 0 was parsed incorrectly",
@@ -104,5 +104,13 @@ public class SvnChangeLogParserTest extends TestCase
"Reformatted the indentation (really just an excuse to test out\n" +
"subversion).\n\n",
entry.toString());
entry = (ChangeLogEntry) entries.get(12);
assertEquals("Entry 12 was parsed incorrectly",
"DOMAIN\\user\n" +
DATE.parse("Wed Aug 21 00:20:25 EDT 2002") + "\n" +
"[/poolserver/trunk/build.xml, 1]\n" +
"Cleaned up some whitespace.\n\n",
entry.toString());
}
}

3
changelog/xdocs/changes.xml
View File

@@ -26,6 +26,9 @@
</properties>
<body>
<release version="1.5" date="in CVS">
<action dev="dion" type="fix" due-to="Tim Shadel" issue="MPCHANGELOG-22">
Parsing of windows user names (domain\user) was broken.
</action>
<action dev="dion" type="fix" due-to="Archimedes Trajano">Bad documentation for goals</action>
<action dev="dion" type="update">
Add changelog:create-cvspass goal for creating the required .cvspass file