Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use a reference to maven.compile.src.set instead of the property.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115401 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier
2004-05-25 22:18:22 +00:00
parent 852f07e9ff
commit 89927ad1e1
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
javadoc/plugin.jelly
View File

@@ -73,21 +73,7 @@
<j:otherwise>
<maven:get
var="maven.compile.src.set"
plugin="maven-java-plugin"
property="maven.compile.src.set"
/>
<!-- Retreive the value of the property ${maven.compile.src.set} -->
<j:if test="${maven.compile.src.set != null}">
<j:set scope="parent" var="maven.compile.src.set" value="${maven.compile.src.set}"/>
</j:if>
<!-- If the property ${maven.compile.src.set} isn't defined we use ${pom.build.sourceDirectory} -->
<j:if test="${maven.compile.src.set == null}">
<j:set scope="parent" var="maven.compile.src.set" value="${pom.build.sourceDirectory}"/>
</j:if>
<ant:property name="maven.javadoc.compile.src.set" refid="maven.compile.src.set"/>
<!-- Create a patternset for source modifications -->
<patternset id="source.modifications">
@@ -107,7 +93,7 @@
</patternset>
<!-- Tokenize the set of directories -->
<util:tokenize var="sources.dirs" delim="${path.separator}">${maven.compile.src.set}</util:tokenize>
<util:tokenize var="sources.dirs" delim="${path.separator}">${maven.javadoc.compile.src.set}</util:tokenize>
<!-- Counter used to name filesets -->
<j:set var="src.set.counter" value="0"/>
@@ -130,7 +116,7 @@
<j:set var="src.set.counter" value="${src.set.counter + 1}"/>
</j:if>
</j:forEach> <!-- dir in maven.compile.src.set -->
</j:forEach> <!-- dir in maven.javadoc.compile.src.set -->
</j:otherwise>
</j:choose>
@@ -217,8 +203,10 @@
useexternalfile="${maven.javadoc.useexternalfile}"
>
<ant:property name="maven.javadoc.compile.src.set" refid="maven.compile.src.set"/>
<!-- Tokenize the set of directories -->
<util:tokenize var="sources.dirs" delim="${path.separator}">${maven.compile.src.set}</util:tokenize>
<util:tokenize var="sources.dirs" delim="${path.separator}">${maven.javadoc.compile.src.set}</util:tokenize>
<j:forEach var="dir" items="${sources.dirs}">
@@ -227,7 +215,7 @@
<patternset refid="source.modifications"/>
</ant:fileset>
</j:forEach>--> <!-- dir in maven.compile.src.set -->
</j:forEach>--> <!-- dir in maven.javadoc.compile.src.set -->
<j:if test="${context.getVariable('maven.javadoc.source') != null}">
<ant:setProperty name="source" value="${maven.javadoc.source}" />
@@ -361,7 +349,7 @@
<ant:copy todir="${maven.javadoc.destdir}">
<util:tokenize var="sources.dirs" delim="${path.separator}">
${maven.compile.src.set}
${maven.javadoc.compile.src.set}
</util:tokenize>
<j:forEach var="dir" items="${sources.dirs}">