PR: MPJXR-3

Use maven.compile.src.set instead of pom.build.sourceDirectory.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@379214 13f79535-47bb-0310-9956-ffa450edef68

jxr/plugin.jelly

@@ -96,9 +96,15 @@
 
       <ant:copy file="${maven.jxr.stylesheet}"
         tofile="${maven.jxr.destdir}/stylesheet.css"/>
-        
+
+      <util:tokenize var="sources_dirs" delim="${path.separator}">${pom.build.sourceDirectory}</util:tokenize>
+      <maven:get var="maven.compile.src.set" plugin="maven-java-plugin" property="maven.compile.src.set"/>
+      <j:if test="${maven.compile.src.set != '' and maven.compile.src.set != null}">
+        <util:tokenize var="sources_dirs" delim="${path.separator}">${maven.compile.src.set}</util:tokenize>
+      </j:if>
+
       <jxr:jxr
-        sourceDir="${pom.build.sourceDirectory}"
+        sourceDirs="${sources_dirs}"
         destDir="${maven.jxr.destdir}"
         inputEncoding="${inputEncoding}"
         outputEncoding="${outputEncoding}"

jxr/src/main/org/apache/maven/jxr/JxrBean.java

@@ -126,6 +126,19 @@ public class JxrBean
         }
     }
 
+    /**
+     * Sets a list of source directories to be cross-referenced.
+     * @param newSourceDirs The list of source directories.
+     */
+    public void setSourceDirs( List newSourceDirs )
+    {
+        if ( !sourceDirs.isEmpty() )
+        {
+            sourceDirs.clear();
+        }
+        this.sourceDirs = newSourceDirs;
+    }
+
     /**
      * Sets a single source directory to be cross-referenced.
      * @param sourceDir The source directory to be cross-referenced.

jxr/xdocs/changes.xml

@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.5-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="fix" issue="MPJXR-3">Use <code>maven.compile.src.set</code> instead of <code>pom.build.sourceDirectory</code>.</action>
       <action dev="aheritier" type="update">Upgrade to maven-jxr 1.0</action>
       <action dev="ltheussl" type="fix" issue="MPJXR-31">Source X-Ref Plugin reverses backslashes.</action>
       <action dev="ltheussl" type="add" issue="MPJXR-32">New property to make inclusion of test Xref optional.</action>