You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/03/27 14:15:04 UTC
cvs commit: maven/src/plugins-build/ear plugin.jelly
dion 2003/03/27 05:15:04
Modified: src/plugins-build/ear plugin.jelly
Log:
Explicity use ant name space. In prep for removal of jeez etc
Revision Changes Path
1.5 +33 -33 maven/src/plugins-build/ear/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 11 Feb 2003 10:39:05 -0000 1.4
+++ plugin.jelly 27 Mar 2003 13:15:03 -0000 1.5
@@ -2,6 +2,7 @@
<project
xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
xmlns:license="license"
xmlns:util="jelly:util">
@@ -23,15 +24,15 @@
<!--==================================================================-->
<goal name="ear:ear" prereqs="ear:init" description="Build an ear file">
- <echo>Building EAR ${maven.final.name} with appxml "${maven.ear.appxml}"</echo>
+ <ant:echo>Building EAR ${maven.final.name} with appxml "${maven.ear.appxml}"</ant:echo>
- <mkdir dir="${maven.build.dir}" />
+ <ant:mkdir dir="${maven.build.dir}" />
- <available property="maven.ear.manifest.available"
+ <ant:available property="maven.ear.manifest.available"
file="${maven.ear.manifest}"/>
- <ear destfile="${maven.build.dir}/${maven.final.name}.ear"
+ <ant:ear destfile="${maven.build.dir}/${maven.final.name}.ear"
appxml="${maven.ear.appxml}"
basedir="${maven.ear.src}"
excludes="${maven.ear.appxml}">
@@ -39,52 +40,51 @@
<!-- include marked dependencies -->
<j:forEach var="dep" items="${pom.dependencies}">
<j:if test="${dep.getProperty('ear.bundle.jar')=='true'}">
- <fileset dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
- <include name="${dep.artifact}"/>
- </fileset>
+ <ant:fileset dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
+ <ant:include name="${dep.artifact}"/>
+ </ant:fileset>
</j:if>
<j:if test="${dep.getProperty('ear.bundle.war')=='true'}">
- <fileset dir="${maven.repo.local}/${dep.artifactDirectory}/wars/">
- <include name="${dep.artifact}"/>
- </fileset>
+ <ant:fileset dir="${maven.repo.local}/${dep.artifactDirectory}/wars/">
+ <ant:include name="${dep.artifact}"/>
+ </ant:fileset>
</j:if>
<j:if test="${dep.getProperty('ear.bundle.ejb')=='true'}">
- <fileset dir="${maven.repo.local}/${dep.artifactDirectory}/ejbs/">
- <include name="${dep.artifact}"/>
- </fileset>
+ <ant:fileset dir="${maven.repo.local}/${dep.artifactDirectory}/ejbs/">
+ <ant:include name="${dep.artifact}"/>
+ </ant:fileset>
</j:if>
</j:forEach>
<!-- include license -->
<j:set var="licenseFileName"><license:fileName/></j:set>
<util:file name="${licenseFileName}" var="licenseFile"/>
- <metainf dir="${licenseFile.canonicalFile.parent}">
- <include name="${licenseFile.canonicalFile.name}"/>
- </metainf>
-
+ <ant:metainf dir="${licenseFile.canonicalFile.parent}">
+ <ant:include name="${licenseFile.canonicalFile.name}"/>
+ </ant:metainf>
<j:if test="${maven.ear.manifest.available}">
- <setProperty name="manifest" value="${maven.ear.manifest}" />
+ <ant:setProperty name="manifest" value="${maven.ear.manifest}" />
</j:if>
<!-- standard manifest entries -->
- <manifest>
- <attribute name="Built-By" value="${user.name}" />
- <section name="${pom.package}">
- <attribute name="Specification-Title" value="${pom.artifactId}" />
- <attribute name="Specification-Version"
+ <ant:manifest>
+ <ant:attribute name="Built-By" value="${user.name}" />
+ <ant:section name="${pom.package}">
+ <ant:attribute name="Specification-Title" value="${pom.artifactId}" />
+ <ant:attribute name="Specification-Version"
value="${pom.currentVersion}" />
- <attribute name="Specification-Vendor"
+ <ant:attribute name="Specification-Vendor"
value="${pom.organization.name}" />
- <attribute name="Implementation-Title"
+ <ant:attribute name="Implementation-Title"
value="${pom.package}" />
- <attribute name="Implementation-Version"
+ <ant:attribute name="Implementation-Version"
value="${pom.currentVersion}" />
- <attribute name="Implementation-Vendor"
+ <ant:attribute name="Implementation-Vendor"
value="${pom.organization.name}" />
- </section>
- </manifest>
- </ear>
+ </ant:section>
+ </ant:manifest>
+ </ant:ear>
</goal>
@@ -95,10 +95,10 @@
prereqs="ear:ear"
description="Install the ear in the local repository">
- <property name="maven.ear.install.dir"
+ <ant:property name="maven.ear.install.dir"
value="${maven.repo.local}/${pom.artifactDirectory}/ears"/>
- <mkdir dir="${maven.ear.install.dir}"/>
- <copy file="${maven.build.dir}/${maven.final.name}.ear"
+ <ant:mkdir dir="${maven.ear.install.dir}"/>
+ <ant:copy file="${maven.build.dir}/${maven.final.name}.ear"
tofile="${maven.ear.install.dir}/${maven.final.name}.ear"/>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org