You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/02/20 20:52:36 UTC
svn commit: r379214 - in /maven/maven-1/plugins/trunk/jxr: plugin.jelly
src/main/org/apache/maven/jxr/JxrBean.java xdocs/changes.xml
Author: ltheussl
Date: Mon Feb 20 11:52:34 2006
New Revision: 379214
URL: http://svn.apache.org/viewcvs?rev=379214&view=rev
Log:
PR: MPJXR-3
Use maven.compile.src.set instead of pom.build.sourceDirectory.
Modified:
maven/maven-1/plugins/trunk/jxr/plugin.jelly
maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JxrBean.java
maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/jxr/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/plugin.jelly?rev=379214&r1=379213&r2=379214&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/jxr/plugin.jelly Mon Feb 20 11:52:34 2006
@@ -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}"
Modified: maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JxrBean.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JxrBean.java?rev=379214&r1=379213&r2=379214&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JxrBean.java (original)
+++ maven/maven-1/plugins/trunk/jxr/src/main/org/apache/maven/jxr/JxrBean.java Mon Feb 20 11:52:34 2006
@@ -127,6 +127,19 @@
}
/**
+ * 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.
*/
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=379214&r1=379213&r2=379214&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jxr/xdocs/changes.xml Mon Feb 20 11:52:34 2006
@@ -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>