diff --git a/jxr/src/main/org/apache/maven/jxr/JXR.java b/jxr/src/main/org/apache/maven/jxr/JXR.java index 1bf0f0e0..6c38526f 100644 --- a/jxr/src/main/org/apache/maven/jxr/JXR.java +++ b/jxr/src/main/org/apache/maven/jxr/JXR.java @@ -22,8 +22,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.maven.jxr.ant.DirectoryScanner; import org.apache.maven.jxr.pacman.PackageManager; -import org.apache.tools.ant.DirectoryScanner; /** * Main entry point into Maven used to kick off the XReference code building. @@ -111,7 +111,6 @@ public class JXR { DirectoryScanner ds = new DirectoryScanner(); - ds.addDefaultExcludes(); File dir = new File(this.getSource()); diff --git a/jxr/src/main/org/apache/maven/jxr/ant/DirectoryScanner.java b/jxr/src/main/org/apache/maven/jxr/ant/DirectoryScanner.java new file mode 100644 index 00000000..08e371a6 --- /dev/null +++ b/jxr/src/main/org/apache/maven/jxr/ant/DirectoryScanner.java @@ -0,0 +1,25 @@ +package org.apache.maven.jxr.ant; + +import java.io.File; + +/** + * Workaround to ignore package-info.java files. + * + * @author Carlos Sanchez + */ +public class DirectoryScanner extends org.apache.tools.ant.DirectoryScanner { + + public void addDefaultExcludes() { + super.addDefaultExcludes(); + int excludesLength = excludes == null ? 0 : excludes.length; + String[] newExcludes; + newExcludes = new String[excludesLength + 1]; + if (excludesLength > 0) { + System.arraycopy(excludes, 0, newExcludes, 0, excludesLength); + } + newExcludes[excludesLength] = "**" + File.separatorChar + + "package-info.java"; + excludes = newExcludes; + } + +} diff --git a/jxr/src/test/org/apache/maven/jxr/package-info.java b/jxr/src/test/org/apache/maven/jxr/package-info.java new file mode 100644 index 00000000..1e533d9d --- /dev/null +++ b/jxr/src/test/org/apache/maven/jxr/package-info.java @@ -0,0 +1 @@ +package org.apache.maven.jxr; \ No newline at end of file diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml index e34093c4..09abcd3b 100644 --- a/jxr/xdocs/changes.xml +++ b/jxr/xdocs/changes.xml @@ -26,6 +26,7 @@ + Ignore Java 5 package-info.java files Fix malformed HTML when "package" or "import" used in the code/comments outside of the normal keyword use Remove hardcoded encoding in templates.