diff --git a/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java b/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
index 9ef29479..948e3c80 100644
--- a/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
+++ b/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
@@ -44,7 +44,7 @@ import org.apache.regexp.RESyntaxException;
* @author dIon Gillard
* @author Pete Kazmier
* @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
diff --git a/changelog/src/test-resources/svnlib/svnlog.txt b/changelog/src/test-resources/svnlib/svnlog.txt
index 8a42f1fd..ff95eb8b 100644
--- a/changelog/src/test-resources/svnlib/svnlog.txt
+++ b/changelog/src/test-resources/svnlib/svnlog.txt
@@ -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.
+
------------------------------------------------------------------------
diff --git a/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java b/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
index e6f39e37..6e0dea32 100644
--- a/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
+++ b/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
@@ -30,7 +30,7 @@ import org.apache.maven.changelog.ChangeLogEntry;
* Test cases for {@link SvnChangeLogParser}.
*
* @author Pete Kazmier
- * @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());
}
}
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index 5220725f..ce3f1323 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -26,6 +26,9 @@
+
+ Parsing of windows user names (domain\user) was broken.
+
Bad documentation for goals
Add changelog:create-cvspass goal for creating the required .cvspass file