Could you revert or modify your modifications. Some users still use the old format of svn log.
Thanks Emmanuel ----- Original Message ----- From: <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Sent: Saturday, November 22, 2003 11:52 PM Subject: cvs commit: maven-plugins/changelog/xdocs properties.xml > dlr 2003/11/22 14:52:13 > > Modified: changelog/src/main/org/apache/maven/svnlib > SvnChangeLogGenerator.java SvnChangeLogParser.java > changelog/src/test/org/apache/maven/svnlib > SvnChangeLogParserTest.java > changelog/src/test-resources/svnlib svnlog.txt > changelog/xdocs properties.xml > Log: > Some updates for Subversion 0.33.0 to implement date operations (they > work over ra_dav these days), and to update the parsing of the ouput > from `svn log`. > > * changelog/xdocs/properties.xml > maven.changelog.range: Removed now unnecessary disclaimer about > SVN and its ra_dav repository access module from the docs. > > * changelog/src/main/org/apache/maven/svnlib/SvnChangeLogGenerator.java > getScmDateArgument(Date, Date): Updated the JavaDoc and > implementation to the correct date argument formatting for SVN. > > * changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java > pattern: Updated regex for new `svn log` output format. > > parse(InputStream): Tweaked inline comment. > > * changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java > Header JavaDoc tweak. > > * changelog/src/test-resources/svnlib/svnlog.txt > Updated to match the current log output format. > > Revision Changes Path > 1.3 +7 -5 maven-plugins/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogGenerat or.java > > Index: SvnChangeLogGenerator.java > =================================================================== > RCS file: /home/cvs/maven-plugins/changelog/src/main/org/apache/maven/svnlib/SvnChange LogGenerator.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -u -r1.2 -r1.3 > --- SvnChangeLogGenerator.java 25 Oct 2003 17:50:37 -0000 1.2 > +++ SvnChangeLogGenerator.java 22 Nov 2003 22:52:13 -0000 1.3 > @@ -78,6 +78,7 @@ > * @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a> > * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a> > * @author <a href="mailto:[EMAIL PROTECTED]">Pete Kazmier</a> > + * @author Daniel Rall > * @version > * $Id$ > */ > @@ -110,8 +111,8 @@ > > /** > * Construct the svn command-line argument that is used to specify > - * the appropriate date range. This date option takes the format of > - * "-D start:end" in the case of Subversion. > + * the appropriate date range. This date option takes the format > + * of <code>-r{start}:{end}</code> in the case of Subversion. > * > * @param before The starting point. > * @param to The ending point. > @@ -121,8 +122,9 @@ > protected String getScmDateArgument(Date before, Date to) > { > SimpleDateFormat outputDate = new SimpleDateFormat("yyyy-MM-dd"); > - // Specify to:before as that will sort the log entries for us > - return "-D " + outputDate.format(to) + ":" + outputDate.format(before); > + // Tell SVN to sort log entries from newest to oldest. > + return "-r{" + outputDate.format(to) + "}:{" + > + outputDate.format(before) + '}'; > } > > /** > > > > 1.3 +4 -3 maven-plugins/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser. java > > Index: SvnChangeLogParser.java > =================================================================== > RCS file: /home/cvs/maven-plugins/changelog/src/main/org/apache/maven/svnlib/SvnChange LogParser.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -u -r1.2 -r1.3 > --- SvnChangeLogParser.java 25 Oct 2003 17:50:37 -0000 1.2 > +++ SvnChangeLogParser.java 22 Nov 2003 22:52:13 -0000 1.3 > @@ -82,6 +82,7 @@ > * > * @author <a href="mailto:[EMAIL PROTECTED]">dIon Gillard</a> > * @author <a href="mailto:[EMAIL PROTECTED]">Pete Kazmier</a> > + * @author Daniel Rall > * @version $Id$ > */ > class SvnChangeLogParser implements ChangeLogParser > @@ -119,7 +120,7 @@ > > /** The pattern used to match svn header lines */ > private static final String pattern = > - "^rev (\\d+):\\s+" + // revision number > + "^r(\\d+)\\s+\\|\\s+" + // revision number > "(\\w+)\\s+\\|\\s+" + // author username > "(\\d+-\\d+-\\d+ " + // date 2002-08-24 > "\\d+:\\d+:\\d+) " + // time 16:01:00 > @@ -193,7 +194,7 @@ > BufferedReader stream = new BufferedReader( > new InputStreamReader(anInputStream)); > > - // current state transitions in the state machine - starts with Get Header > + // Current state transitions in the parser's state machine: > // Get Header -> Get File > // Get File -> Get Comment or Get (another) File > // Get Comment -> Get (another) Comment > > > > 1.3 +3 -2 maven-plugins/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserT est.java > > Index: SvnChangeLogParserTest.java > =================================================================== > RCS file: /home/cvs/maven-plugins/changelog/src/test/org/apache/maven/svnlib/SvnChange LogParserTest.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -u -r1.2 -r1.3 > --- SvnChangeLogParserTest.java 25 Oct 2003 17:50:37 -0000 1.2 > +++ SvnChangeLogParserTest.java 22 Nov 2003 22:52:13 -0000 1.3 > @@ -64,7 +64,8 @@ > import org.apache.maven.changelog.ChangeLogEntry; > > /** > - * Test cases for [EMAIL PROTECTED] SvnChangeLogParser} > + * Test cases for [EMAIL PROTECTED] SvnChangeLogParser}. > + * > * @author <a href="mailto:[EMAIL PROTECTED]">Pete Kazmier</a> > * @version $Id$ > */ > > > > 1.2 +12 -12 maven-plugins/changelog/src/test-resources/svnlib/svnlog.txt > > Index: svnlog.txt > =================================================================== > RCS file: /home/cvs/maven-plugins/changelog/src/test-resources/svnlib/svnlog.txt,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -u -r1.1 -r1.2 > --- svnlog.txt 24 Jan 2003 03:44:57 -0000 1.1 > +++ svnlog.txt 22 Nov 2003 22:52:13 -0000 1.2 > @@ -1,5 +1,5 @@ > ----------------------------------------------------------------------- - > -rev 15: kaz | 2002-08-26 14:33:26 -0400 (Mon, 26 Aug 2002) | 3 lines > +r15 | kaz | 2002-08-26 14:33:26 -0400 (Mon, 26 Aug 2002) | 3 lines > Changed paths: > M /poolserver/trunk/build.xml > M /poolserver/trunk/project.properties > @@ -7,56 +7,56 @@ > Minor formatting changes. > > ----------------------------------------------------------------------- - > -rev 14: kaz | 2002-08-26 10:24:58 -0400 (Mon, 26 Aug 2002) | 3 lines > +r14 | kaz | 2002-08-26 10:24:58 -0400 (Mon, 26 Aug 2002) | 3 lines > Changed paths: > M /poolserver/trunk/build.xml > > Cleaned up some whitespace. > > ----------------------------------------------------------------------- - > -rev 13: kaz | 2002-08-24 12:56:37 -0400 (Sat, 24 Aug 2002) | 3 lines > +r13 | kaz | 2002-08-24 12:56:37 -0400 (Sat, 24 Aug 2002) | 3 lines > Changed paths: > M /poolserver/trunk/src/java > > Added an svn:ignore property to ignore the 'tags' file. > > ----------------------------------------------------------------------- - > -rev 12: kaz | 2002-08-24 12:31:41 -0400 (Sat, 24 Aug 2002) | 3 lines > +r12 | kaz | 2002-08-24 12:31:41 -0400 (Sat, 24 Aug 2002) | 3 lines > Changed paths: > D /poolserver/trunk/src/java/net/ibasis/poolserver/impl/snmp/.SnmpPhysicalGate way.java.swp > > Ditching a vim swap file. > > ----------------------------------------------------------------------- - > -rev 11: kaz | 2002-08-24 00:20:25 -0400 (Sat, 24 Aug 2002) | 3 lines > +r11 | kaz | 2002-08-24 00:20:25 -0400 (Sat, 24 Aug 2002) | 3 lines > Changed paths: > M /poolserver/trunk/src/java/net/ibasis/poolserver/impl/snmp/SnmpPhysicalGatew ay.java > > Did some basic refactoring and just preparing to go-time. > > ----------------------------------------------------------------------- - > -rev 10: kaz | 2002-08-24 00:19:39 -0400 (Sat, 24 Aug 2002) | 3 lines > +r10 | kaz | 2002-08-24 00:19:39 -0400 (Sat, 24 Aug 2002) | 3 lines > Changed paths: > M /poolserver/trunk/build.xml > > Added a ctags target in the event I have to use vim. > > ----------------------------------------------------------------------- - > -rev 9: kaz | 2002-08-23 11:11:52 -0400 (Fri, 23 Aug 2002) | 3 lines > +r9 | kaz | 2002-08-23 11:11:52 -0400 (Fri, 23 Aug 2002) | 3 lines > Changed paths: > M /poolserver/trunk/build.xml > > Testing script out again ... > > ----------------------------------------------------------------------- - > -rev 8: kaz | 2002-08-23 11:07:46 -0400 (Fri, 23 Aug 2002) | 3 lines > +r8 | kaz | 2002-08-23 11:07:46 -0400 (Fri, 23 Aug 2002) | 3 lines > Changed paths: > M /poolserver/trunk/build.xml > > Testing svn commit-email script ... > > ----------------------------------------------------------------------- - > -rev 7: pete | 2002-08-23 11:03:39 -0400 (Fri, 23 Aug 2002) | 4 lines > +r7 | pete | 2002-08-23 11:03:39 -0400 (Fri, 23 Aug 2002) | 4 lines > Changed paths: > M /poolserver/trunk/build.xml > > @@ -64,14 +64,14 @@ > subversion). > > ----------------------------------------------------------------------- - > -rev 6: kaz | 2002-08-23 10:36:23 -0400 (Fri, 23 Aug 2002) | 3 lines > +r6 | kaz | 2002-08-23 10:36:23 -0400 (Fri, 23 Aug 2002) | 3 lines > Changed paths: > M /poolserver/trunk/resources/WEB-INF/lib/xerces-1.4.4.jar > > Replacing the xerces library as it seems to be corrupted. > > ----------------------------------------------------------------------- - > -rev 5: kaz | 2002-08-22 11:28:22 -0400 (Thu, 22 Aug 2002) | 3 lines > +r5 | kaz | 2002-08-22 11:28:22 -0400 (Thu, 22 Aug 2002) | 3 lines > Changed paths: > A /poolserver/trunk/build.xml > A /poolserver/trunk/poolserver.zargo > @@ -204,7 +204,7 @@ > Initial import of sources. > > ----------------------------------------------------------------------- - > -rev 2: kaz | 2002-08-22 11:25:16 -0400 (Thu, 22 Aug 2002) | 1 line > +r2 | kaz | 2002-08-22 11:25:16 -0400 (Thu, 22 Aug 2002) | 1 line > Changed paths: > A /poolserver/trunk > > > > > 1.3 +1 -6 maven-plugins/changelog/xdocs/properties.xml > > Index: properties.xml > =================================================================== > RCS file: /home/cvs/maven-plugins/changelog/xdocs/properties.xml,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -u -r1.2 -r1.3 > --- properties.xml 28 Oct 2003 10:57:43 -0000 1.2 > +++ properties.xml 22 Nov 2003 22:52:13 -0000 1.3 > @@ -20,12 +20,7 @@ > <td> > Specifies the range to use when generating the change log. > This is used by the "changelog" goal. The default value is > - <code>5</code> days. Note: when using the Subversion > - changelog factory, you <b>must</b> set this property to an > - empty value because the Subversion ra_dav module (used to > - access DAV repositories) does not support date operations > - yet. If you are using a local repository (ra_local), then > - this does not apply to you. > + <code>5</code> days. > </td> > </tr> > <tr> > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
