Ok, the changes [1] are not in 1.6 codebase. Is there a way to "undo" the commit? Or should the 15390 be applied to 1.6 as well?
Jan [1] http://cvs.apache.org/viewcvs.cgi/ant/src/main/org/apache/tools/ant/types/Re gularExpression.java?r1=1.15&r2=1.16&diff_format=h > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > Sent: Thursday, April 22, 2004 12:22 PM > To: [EMAIL PROTECTED] > Subject: RE: cvs commit: ant/docs/manual/CoreTypes filterchain.html > > > Ok, the only (bigger by size) modification is that the changes from > 1.14->1.15 [1,2] is not in Ant 1.6-manual. "Make the choice of regular > expression implementation possible with ant.regexp.regexpimpl > as a normal > project property. PR: 15390" (antoine). > > I´ll take a look into the sources of 1.6 ... > > > Jan > > > [1] Diff > > http://cvs.apache.org/viewcvs.cgi/ant/docs/manual/CoreTypes/fi > lterchain.html > ?r1=1.14&r2=1.15&diff_format=h&only_with_tag=MAIN > > [2] BugID > http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15390 > > > > -----Original Message----- > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > Sent: Thursday, April 22, 2004 12:04 PM > > To: [EMAIL PROTECTED] > > Subject: RE: cvs commit: ant/docs/manual/CoreTypes filterchain.html > > > > > > ups, more than I´d modified. Have to have a look at that... > > > > Jan > > > > > -----Original Message----- > > > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > > Sent: Thursday, April 22, 2004 12:02 PM > > > To: [EMAIL PROTECTED] > > > Subject: cvs commit: ant/docs/manual/CoreTypes filterchain.html > > > > > > > > > jhm 2004/04/22 03:02:09 > > > > > > Modified: docs/manual/CoreTypes Tag: ANT_16_BRANCH > > > filterchain.html > > > Log: > > > merge > > > > > > Revision Changes Path > > > No revision > > > No revision > > > 1.13.2.6 +18 -28 ant/docs/manual/CoreTypes/filterchain.html > > > > > > Index: filterchain.html > > > > > =================================================================== > > > RCS file: /home/cvs/ant/docs/manual/CoreTypes/filterchain.html,v > > > retrieving revision 1.13.2.5 > > > retrieving revision 1.13.2.6 > > > diff -u -r1.13.2.5 -r1.13.2.6 > > > --- filterchain.html 9 Feb 2004 22:12:10 -0000 1.13.2.5 > > > +++ filterchain.html 22 Apr 2004 10:02:09 -0000 1.13.2.6 > > > @@ -324,8 +324,8 @@ > > > Convenience method: > > > <BLOCKQUOTE><PRE> > > > <linecontains> > > > - <contains value="foo"> > > > - <contains value="bar"> > > > + <contains value="foo"/> > > > + <contains value="bar"/> > > > </linecontains> > > > </PRE></BLOCKQUOTE> > > > > > > @@ -334,19 +334,8 @@ > > > Filter which includes only those lines that contain the > > > user-specified > > > regular expression matching strings. > > > > > > -<TABLE cellSpacing=0 cellPadding=2 border=1> > > > - <TR> > > > - <TD vAlign=top><B>Parameter Type</B></TD> > > > - <TD vAlign=top><B>Parameter Value</B></TD> > > > - <TD vAlign=top align="center"><B>Required</B></TD> > > > - </TR> > > > - <TR> > > > - <TD vAlign=top>regexp</TD> > > > - <TD vAlign=top align="center">Pattern of the substring > > > to be searched for.</TD> > > > - <TD vAlign=top align="center">Yes</TD> > > > - </TR> > > > -</TABLE> > > > -<P> > > > +See <a href="../CoreTypes/regexp.html">Regexp Type</a> for > > > the description of the nested element regexp and of > > > +the choice of regular expression implementation. > > > <H4>Example:</H4> > > > > > > This will fetch all those lines that contain the pattern > > > <code>foo</code> > > > @@ -359,7 +348,7 @@ > > > Convenience method: > > > <BLOCKQUOTE><PRE> > > > <linecontainsregexp> > > > - <regexp pattern="foo*"> > > > + <regexp pattern="foo*"/> > > > </linecontainsregexp> > > > </PRE></BLOCKQUOTE> > > > > > > @@ -587,9 +576,8 @@ > > > <TD vAlign=top align="center"><B>Required</B></TD> > > > </TR> > > > <TR> > > > - <TD vAlign=top>lines</TD> > > > - <TD vAlign=top align="center">tablength > > > - Defaults to "8"</TD> > > > + <TD vAlign=top>tablength</TD> > > > + <TD vAlign=top align="center">Defaults to > "8"</TD> > > > <TD vAlign=top align="center">No</TD> > > > </TR> > > > </TABLE> > > > @@ -1113,10 +1101,12 @@ > > > </PRE></BLOCKQUOTE> > > > > > > <p><b><em><a name="replaceregex">ReplaceRegex</a></em></b></p> > > > -This string filter replaces regular expressions. See > > > -<a href="../OptionalTasks/replaceregexp.html">ReplaceRegexp</a> > > > -for an explanation on regular expressions. > > > +This string filter replaces regular expressions. > > > This filter may be used directly within a filterchain. > > > +<p> > > > + See <a > > > href="../CoreTypes/regexp.html#implementation">Regexp Type</a> > > > +concerning the choice of the implementation. > > > +</p> > > > > > > <TABLE cellSpacing=0 cellPadding=2 border=1> > > > <TR> > > > @@ -1144,7 +1134,6 @@ > > > <TD vAlign=top align="center">No</TD> > > > </TR> > > > </TABLE> > > > - > > > <H4>Examples:</H4> > > > > > > Replace all occurances of "hello" with "world", ignoring case. > > > @@ -1159,11 +1148,12 @@ > > > <p><b><em><a > name="containsregex">ContainsRegex</a></em></b></p> > > > This filters strings that match regular expressions. > > > The filter may optionally replace the matched regular > expression. > > > -See > > > -<a href="../OptionalTasks/replaceregexp.html">ReplaceRegexp</a> > > > -for an explanation on regular expressions. > > > This filter may be used directly within a filterchain. > > > - > > > +<p> > > > +See > > > +<a > href="../CoreTypes/regexp.html#implementation">Regexp Type</a> > > > +concerning the choice of regular expression implementation. > > > +</p> > > > <TABLE cellSpacing=0 cellPadding=2 border=1> > > > <TR> > > > <TD vAlign=top><B>Attribute</B></TD> > > > @@ -1354,4 +1344,4 @@ > > > <HR> > > > > > > <P align=center>Copyright © 2002-2004 The Apache > > > Software Foundation. All rights > > > -Reserved.</P></BODY></HTML> > > > +Reserved.</P></BODY></HTML> > > > \ No newline at end of file > > > > > > > > > > > > > > > > > > --------------------------------------------------------------------- > > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > > >
