git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@382928 13f79535-47bb-0310-9956-ffa450edef68master
@@ -364,9 +364,12 @@ Other changes: | |||||
* added the inline handler element to the input task. | * added the inline handler element to the input task. | ||||
* <sql> supports property expansion if you set the expandProperties attribute. By default | |||||
it does not expand properties, something we dare not change for fear of breaking complex | |||||
SQL operations in existing files. | |||||
* <sql> supports property expansion if you set the expandProperties | |||||
attribute. By default it does not expand properties, something we | |||||
dare not change for fear of breaking complex SQL operations in | |||||
existing files. | |||||
* <javadoc>'s packagenames attribute is now optional and default to "*". | |||||
Changes from Ant 1.6.4 to Ant 1.6.5 | Changes from Ant 1.6.4 to Ant 1.6.5 | ||||
=================================== | =================================== | ||||
@@ -2077,8 +2077,9 @@ public class Javadoc extends Task { | |||||
// taken from packagenames attribute and nested package | // taken from packagenames attribute and nested package | ||||
// elements and excludes taken from excludepackages attribute | // elements and excludes taken from excludepackages attribute | ||||
// and nested excludepackage elements | // and nested excludepackage elements | ||||
if (sourcePath != null && packageNames.size() > 0) { | |||||
if (sourcePath != null) { | |||||
PatternSet ps = new PatternSet(); | PatternSet ps = new PatternSet(); | ||||
if (packageNames.size() > 0) { | |||||
Enumeration e = packageNames.elements(); | Enumeration e = packageNames.elements(); | ||||
while (e.hasMoreElements()) { | while (e.hasMoreElements()) { | ||||
PackageName p = (PackageName) e.nextElement(); | PackageName p = (PackageName) e.nextElement(); | ||||
@@ -2088,8 +2089,11 @@ public class Javadoc extends Task { | |||||
} | } | ||||
ps.createInclude().setName(pkg); | ps.createInclude().setName(pkg); | ||||
} | } | ||||
} else { | |||||
ps.createInclude().setName("**"); | |||||
} | |||||
e = excludePackageNames.elements(); | |||||
Enumeration e = excludePackageNames.elements(); | |||||
while (e.hasMoreElements()) { | while (e.hasMoreElements()) { | ||||
PackageName p = (PackageName) e.nextElement(); | PackageName p = (PackageName) e.nextElement(); | ||||
String pkg = p.getName().replace('.', '/'); | String pkg = p.getName().replace('.', '/'); | ||||
@@ -41,7 +41,7 @@ public class JavadocTest extends BuildFileTest { | |||||
} | } | ||||
// PR 38370 | // PR 38370 | ||||
public void XtestDirsetPathWithoutPackagenames() throws Exception { | |||||
public void testDirsetPathWithoutPackagenames() throws Exception { | |||||
try { | try { | ||||
executeTarget("dirsetPathWithoutPackagenames"); | executeTarget("dirsetPathWithoutPackagenames"); | ||||
} catch (BuildException e) { | } catch (BuildException e) { | ||||