ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r382928 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/Javadoc.java src/testcases/org/apache/tools/ant/taskdefs/JavadocTest.java
Date Fri, 03 Mar 2006 21:02:15 GMT
Author: bodewig
Date: Fri Mar  3 13:02:13 2006
New Revision: 382928

URL: http://svn.apache.org/viewcvs?rev=382928&view=rev
Log:
make packagenames optional

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
    ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JavadocTest.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewcvs/ant/core/trunk/WHATSNEW?rev=382928&r1=382927&r2=382928&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Mar  3 13:02:13 2006
@@ -364,9 +364,12 @@
 
 * 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
 ===================================

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java?rev=382928&r1=382927&r2=382928&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java Fri Mar  3 13:02:13
2006
@@ -2077,8 +2077,9 @@
         // taken from packagenames attribute and nested package
         // elements and excludes taken from excludepackages attribute
         // and nested excludepackage elements
-        if (sourcePath != null && packageNames.size() > 0) {
+        if (sourcePath != null) {
             PatternSet ps = new PatternSet();
+            if (packageNames.size() > 0) {
             Enumeration e = packageNames.elements();
             while (e.hasMoreElements()) {
                 PackageName p = (PackageName) e.nextElement();
@@ -2088,8 +2089,11 @@
                 }
                 ps.createInclude().setName(pkg);
             }
+            } else {
+                ps.createInclude().setName("**");
+            }
 
-            e = excludePackageNames.elements();
+            Enumeration e = excludePackageNames.elements();
             while (e.hasMoreElements()) {
                 PackageName p = (PackageName) e.nextElement();
                 String pkg = p.getName().replace('.', '/');

Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JavadocTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JavadocTest.java?rev=382928&r1=382927&r2=382928&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JavadocTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JavadocTest.java Fri Mar  3
13:02:13 2006
@@ -41,7 +41,7 @@
     }
 
     // PR 38370
-    public void XtestDirsetPathWithoutPackagenames() throws Exception {
+    public void testDirsetPathWithoutPackagenames() throws Exception {
         try {
             executeTarget("dirsetPathWithoutPackagenames");
         } catch (BuildException e) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message