You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by Colin Sampaleanu <co...@exis.com> on 2002/05/12 21:38:13 UTC
Re: javadoc changes: have they broken xdoclet?
Stefan Bodewig wrote:
>On Tue, 30 Apr 2002, Erik Hatcher <ja...@ehatchersolutions.com>
>wrote:
>
>>We anxiously await your patch! :)
>>
>>
>
>Trivial:
>
>Index: src/main/org/apache/tools/ant/taskdefs/Javadoc.java
>===================================================================
>RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
>retrieving revision 1.95
>diff -u -r1.95 Javadoc.java
>--- src/main/org/apache/tools/ant/taskdefs/Javadoc.java 26 Apr 2002 16:06:52 -00
>00 1.95
>+++ src/main/org/apache/tools/ant/taskdefs/Javadoc.java 30 Apr 2002 09:53:50 -0000
>@@ -1794,7 +1794,7 @@
> // taken from packagenames attribute and nested package
> // elements and excludes taken from excludepackages attribute
> // and nested excludepackage elements
>- if (sourcePath != null) {
>+ if (sourcePath != null && packageNames.size() > 0) {
> PatternSet ps = new PatternSet();
> Enumeration enum = packageNames.elements();
> while (enum.hasMoreElements()) {
>@@ -1859,6 +1859,9 @@
> }
> if (containsPackages) {
> sp.createPathElement().setLocation(baseDir);
>+ } else {
>+ log(baseDir + " doesn\'t contain any packages, dropping it.",
>+ Project.MSG_VERBOSE);
> }
> }
> }
>
>--
>
>
Did this patch ever make it into CVS? I was hapilly using XDoclet with
1.5Alpha, and the Beta 1 broke it of course. I tried pulling down one of
the nightly builds (May 12, labelled 1.6 alpha, and it still appears to
behave the same way).
Colin
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: javadoc changes: have they broken xdoclet?
Posted by Stefan Bodewig <bo...@apache.org>.
On Sun, 12 May 2002, Colin Sampaleanu <co...@exis.com> wrote:
> Sorry, missed Stefan's commit of a fix (not quite the above) for
> this 2 days ago. I am confused how stuff gets into both the 1.5 and
> 1.6 trees.
1.5 gets bug fixes and 1.6 gets new features (not for 1.5beta). I've
been told last time around that merging would be easier if we don't
commit the same changes to both branches.
> This only went into 1.5 for the time being, right? (which is why I
> didn't pick it up getting the nightly).
You can pick up the latest (not really nightly) of the 1.5 branch from
<http://icarus.apache.org/~bodewig/gump/ant1.5beta/>.
Stefan
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: javadoc changes: have they broken xdoclet?
Posted by Erik Hatcher <ja...@ehatchersolutions.com>.
----- Original Message -----
From: "Colin Sampaleanu" <co...@exis.com>
> Sorry, missed Stefan's commit of a fix (not quite the above) for this 2
> days ago. I am confused how stuff gets into both the 1.5 and 1.6 trees.
> This only went into 1.5 for the time being, right? (which is why I
> didn't pick it up getting the nightly).
We (ok, Magesh or Stefan probably) will merge the branches back together at
some point. Its easier to do en masse instead of for each commit.
Erik
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: javadoc changes: have they broken xdoclet?
Posted by Colin Sampaleanu <co...@exis.com>.
Colin Sampaleanu wrote:
> Stefan Bodewig wrote:
>
>> On Tue, 30 Apr 2002, Erik Hatcher <ja...@ehatchersolutions.com>
>> wrote:
>>
>>> We anxiously await your patch! :)
>>>
>>
>>
>> Trivial:
>>
>> Index: src/main/org/apache/tools/ant/taskdefs/Javadoc.java
>> ===================================================================
>> RCS file:
>> /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
>>
>> retrieving revision 1.95
>> diff -u -r1.95 Javadoc.java
>> --- src/main/org/apache/tools/ant/taskdefs/Javadoc.java 26 Apr
>> 2002 16:06:52 -00
>> 00 1.95
>> +++ src/main/org/apache/tools/ant/taskdefs/Javadoc.java 30 Apr
>> 2002 09:53:50 -0000
>> @@ -1794,7 +1794,7 @@
>> // taken from packagenames attribute and nested package
>> // elements and excludes taken from excludepackages attribute
>> // and nested excludepackage elements
>> - if (sourcePath != null) {
>> + if (sourcePath != null && packageNames.size() > 0) {
>> PatternSet ps = new PatternSet();
>> Enumeration enum = packageNames.elements();
>> while (enum.hasMoreElements()) {
>> @@ -1859,6 +1859,9 @@
>> }
>> if (containsPackages) {
>> sp.createPathElement().setLocation(baseDir);
>> + } else {
>> + log(baseDir + " doesn\'t contain any packages,
>> dropping it.",
>> + Project.MSG_VERBOSE); }
>> }
>> }
>>
>> --
>>
>>
> Did this patch ever make it into CVS? I was hapilly using XDoclet with
> 1.5Alpha, and the Beta 1 broke it of course. I tried pulling down one
> of the nightly builds (May 12, labelled 1.6 alpha, and it still
> appears to behave the same way).
>
> Colin
Sorry, missed Stefan's commit of a fix (not quite the above) for this 2
days ago. I am confused how stuff gets into both the 1.5 and 1.6 trees.
This only went into 1.5 for the time being, right? (which is why I
didn't pick it up getting the nightly).
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>