CVS: jcontainer/loom/plugins/maven-sar plugin.jelly,1.12,1.13
mauro-yCVjj/[email protected] Tue, 2 Dec 2003 10:50:16 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar
In directory hogshead.codehaus.org:/tmp/cvs-serv386/loom/plugins/maven-sar
Modified Files:
plugin.jelly
Log Message:
Replaced ant:lib fileset with ant:zipfileset
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar/plugin.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- plugin.jelly 29 Nov 2003 10:45:10 -0000 1.12
+++ plugin.jelly 2 Dec 2003 16:46:44 -0000 1.13
@@ -60,17 +60,19 @@
<ant:zipfileset file="${logging}" prefix="SAR-INF/"/>
</j:if>
<!-- Add build artifacts -->
- <ant:lib dir="${maven.sar.build.dir}">
+ <ant:zipfileset dir="${maven.sar.build.dir}"
+ prefix="SAR-INF/lib">
<ant:include name="${maven.sar.lib.include}"/>
<ant:exclude name="${maven.sar.lib.exclude}"/>
- </ant:lib>
+ </ant:zipfileset>
<!-- Add dependency artifacts -->
<j:forEach var="artifact" items="${pom.artifacts}">
<j:set var="dependency" value="${artifact.dependency}"/>
<j:if test="${dependency.getProperty('sar.bundle')=='true'}">
- <ant:lib dir="${maven.repo.local}/${dependency.artifactDirectory}/jars/">
+ <ant:zipfileset dir="${maven.repo.local}/${dependency.artifactDirectory}/jars/"
+ prefix="SAR-INF/lib">
<ant:include name="${dependency.artifact}"/>
- </ant:lib>
+ </ant:zipfileset>
</j:if>
</j:forEach>
<!-- Add resources with targetPath = 'SAR-INF' -->