Author: carlos
Date: Thu Jun 9 00:20:29 2005
New Revision: 189723
URL: http://svn.apache.org/viewcvs?rev=189723&view=rev
Log:
Ignore package-info.java files
Added:
maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/ant/
maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/ant/DirectoryScanner.java
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/package-info.java
Modified:
maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JXR.java
maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JXR.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JXR.java?rev=189723&r1=189722&r2=189723&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JXR.java
(original)
+++ maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JXR.java Thu
Jun 9 00:20:29 2005
@@ -22,8 +22,8 @@
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 @@
{
DirectoryScanner ds = new DirectoryScanner();
-
ds.addDefaultExcludes();
File dir = new File(this.getSource());
Added:
maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/ant/DirectoryScanner.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/ant/DirectoryScanner.java?rev=189723&view=auto
==============================================================================
---
maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/ant/DirectoryScanner.java
(added)
+++
maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/ant/DirectoryScanner.java
Thu Jun 9 00:20:29 2005
@@ -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;
+ }
+
+}
Added:
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/package-info.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/package-info.java?rev=189723&view=auto
==============================================================================
---
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/package-info.java
(added)
+++
maven/maven-1/plugins/trunk/jxr/src/test/org/apache/maven/jxr/package-info.java
Thu Jun 9 00:20:29 2005
@@ -0,0 +1 @@
+package org.apache.maven.jxr;
\ No newline at end of file
Modified: maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml?rev=189723&r1=189722&r2=189723&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml Thu Jun 9 00:20:29 2005
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.4.3-SNAPSHOT" date="in SVN">
+ <action dev="carlos" type="fix" issue="MPJXR-26">Ignore Java 5
package-info.java files</action>
<action dev="brett" type="fix" issue="MPJXR-11" due-to="Lukas
Theussi">Fix malformed HTML when "package" or "import" used in the
code/comments outside of the normal keyword use</action>
<action dev="evenisse" type="fix" issue="MPJXR-18">Remove hardcoded
encoding in templates.</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
