aheritier 2004/09/03 15:41:32
Modified: javadoc plugin.jelly
Log:
MPJAVADOC-43 : there's a bug with the function 'empty' provided by Jelly in maven
1.0.X
Revision Changes Path
1.61 +2 -2 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- plugin.jelly 25 Aug 2004 19:48:48 -0000 1.60
+++ plugin.jelly 3 Sep 2004 22:41:32 -0000 1.61
@@ -109,7 +109,7 @@
<j:set var="internal_javadoc_needed" scope="parent" value="false" />
<!-- test if sourceModifications are defined -->
- <j:if test="${not empty(pom.build.sourceModifications)}">
+ <j:if test="${pom.build.sourceModifications!=null and
!pom.build.sourceModifications.isEmpty()}">
<j:if test="${maven.javadoc.debug}"><ant:echo>sourceModifications
used.</ant:echo></j:if>
<util:tokenize var="sources_dirs"
delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</util:tokenize>
<ant:copy todir="${internal_javadoc_src_tmp}">
@@ -137,7 +137,7 @@
</ant:path>
</j:if>
<!-- test if sourceModifications aren't defined -->
- <j:if test="${empty(pom.build.sourceModifications)}">
+ <j:if test="${pom.build.sourceModifications==null ||
pom.build.sourceModifications.isEmpty()}">
<j:if test="${maven.javadoc.debug}"><ant:echo>sourceModifications not
used.</ant:echo></j:if>
<ant:path id="internal_javadoc_sources">
<ant:pathelement
path="${context.getAntProject().getReferences().get('maven.compile.src.set')}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
