Comments inline...
[EMAIL PROTECTED] wrote on 02/07/2003 12:58:52 AM:
> michal 2003/07/01 07:58:52
>
> Modified: src/plugins-build/war plugin.jelly
> src/plugins-build/war/xdocs changes.xml goals.xml
> Log:
> Fixes for MAVEN-518.
[snippage]
> - <j:forEach var="dep" items="${pom.dependencies}">
> + <j:forEach var="lib" items="${pom.artifacts}">
> + <j:set var="dep" value="${lib.dependency}"/>
> + <j:set var="bundle" value="false"/>
> <j:if test="${dep.getProperty('war.bundle.jar')=='true'}">
> <ant:echo>
> DEPRECATION WARNING:
> - Use : war.bundle instead of war.bundle.jar
> + Use : war.bundle instead of war.bundle.jar
> </ant:echo>
> - <ant:lib dir="${maven.repo.local}/${dep.
> artifactDirectory}/jars/">
> - <ant:include name="${dep.artifact}"/>
> - </ant:lib>
> + <j:set var="bundle" value="true"/>
> </j:if>
> - <j:if test="${dep.getProperty('war.bundle')=='true' and
> dep.type =='jar' }">
Is the dep.type check here really necessary? If the user has added the
war.bundle property, then I say let it go in there. It could be an
ejb-client jar file in which case the <type> may not be jar.
> - <ant:lib dir="${maven.repo.local}/${dep.
> artifactDirectory}/jars/">
> - <ant:include name="${dep.artifact}"/>
> + <j:if test="${dep.getProperty('war.bundle')=='true' and
> dep.type =='jar'}">
Ditto.
--
dIon Gillard, Multitask Consulting
Blog: http://blogs.codehaus.org/people/dion/
Work: http://www.multitask.com.au
