Colin Sampaleanu wrote:
Stefan Bodewig wrote:
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).On Tue, 30 Apr 2002, Erik Hatcher <[EMAIL PROTECTED]> 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); }
}
}
--
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: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
