CVS: jcontainer/loom/plugins/maven-sar plugin.jelly,1.7,1.8
mauro-yCVjj/[email protected] Sat, 22 Nov 2003 10:41:43 -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-serv14397/loom/plugins/maven-sar
Modified Files:
plugin.jelly
Log Message:
Removed Ant sar task, replaced by the Ant task.
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/plugins/maven-sar/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- plugin.jelly 4 Nov 2003 10:27:34 -0000 1.7
+++ plugin.jelly 22 Nov 2003 16:41:40 -0000 1.8
@@ -52,21 +52,14 @@
<goal name="sar:sar" prereqs="jar:jar" description="Build a sar file">
<ant:echo message="Building sar ${maven.sar.final.name}"/>
- <!-- Define taskdef -->
- <ant:taskdef name="sar"
- classname="org.jcontainer.loom.tools.ant.SarTask">
- <ant:classpath>
- <ant:pathelement path="${plugin.dir}"/>
- <ant:pathelement path="${plugin.getDependencyPath('ant')}"/>
- </ant:classpath>
- </ant:taskdef>
<!-- Ensure maven.sar.build.dir exists -->
<ant:mkdir dir="${maven.sar.build.dir}"/>
- <sar sarfile="${maven.sar.build.dir}/${maven.sar.final.name}"
- assembly="${maven.sar.assembly}"
- config="${maven.sar.config}"
- environment="${maven.sar.environment}"
- logging="${maven.sar.logging}">
+ <ant:jar destfile="${maven.sar.build.dir}/${maven.sar.final.name}">
+ <!-- Add Sar descriptor files to SAR-INF/ -->
+ <ant:zipfileset file="${maven.sar.assembly}" prefix="SAR-INF/"/>
+ <ant:zipfileset file="${maven.sar.config}" prefix="SAR-INF/"/>
+ <ant:zipfileset file="${maven.sar.environment}" prefix="SAR-INF/"/>
+ <ant:zipfileset file="${maven.sar.logging}" prefix="SAR-INF/"/>
<!-- Add build artifacts -->
<ant:lib dir="${maven.sar.build.dir}">
<ant:include name="${maven.sar.lib.include}"/>
@@ -128,7 +121,7 @@
value="${pom.organization.name}"/>
</ant:section>
</ant:manifest>
- </sar>
+ </ant:jar>
</goal>