Explicity use ant name space. In prep for removal of jeez etc

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113204 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
dion committed 2003-03-27 13:21:38 +00:00
1 parent 7f943882cf
commit 311a1cd941
10 files changed
+329 -321

No files matched your search

+24 -23
View File
@@ -2,6 +2,7 @@
<project
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
xmlns:define="jelly:define"
xmlns:deploy="deploy"
@@ -62,22 +63,22 @@
<j:set var="typeX" value="${type}X"/>
<j:choose>
<j:when test="${typeX != 'X'}">
<property
<ant:property
name="resolvedDirectory"
value="${siteDirectory}/${pom.artifactDirectory}/${type}"
/>
</j:when>
<j:otherwise>
<property
<ant:property
name="resolvedDirectory"
value="${siteDirectory}/${pom.artifactDirectory}"
/>
</j:otherwise>
</j:choose>
<echo>
<ant:echo>
Moving ${artifact} to the ${resolvedDirectory} on ${siteAddress}
</echo>
</ant:echo>
<!--
||
@@ -87,15 +88,15 @@
<j:set var="assureDirectoryCommandX" value="${assureDirectoryCommand}X"/>
<j:if test="${assureDirectoryCommandX != 'X'}">
<exec dir="." executable="${commander}">
<arg line="-l ${username} ${siteAddress} '${assureDirectoryCommand} ${resolvedDirectory}'"/>
</exec>
<ant:exec dir="." executable="${commander}">
<ant:arg line="-l ${username} ${siteAddress} '${assureDirectoryCommand} ${resolvedDirectory}'"/>
</ant:exec>
</j:if>
<exec dir="." executable="${copier}">
<arg value="${artifact}"/>
<arg value="${username}@${siteAddress}:${resolvedDirectory}"/>
</exec>
<ant:exec dir="." executable="${copier}">
<ant:arg value="${artifact}"/>
<ant:arg value="${username}@${siteAddress}:${resolvedDirectory}"/>
</ant:exec>
<!--
||
@@ -113,13 +114,13 @@
value='${strings.replace(siteCommand, "@deployDirectory@", resolvedDirectory)}'
/>
<echo>
<ant:echo>
Executing ${siteCommand} with the username ${username} on ${siteAddress}
</echo>
</ant:echo>
<exec dir="." executable="${commander}">
<arg line="-l ${username} ${siteAddress} '${siteCommand}'"/>
</exec>
<ant:exec dir="." executable="${commander}">
<ant:arg line="-l ${username} ${siteAddress} '${siteCommand}'"/>
</ant:exec>
</j:if>
@@ -140,22 +141,22 @@
</j:if>
<j:set var="mavenRepoLocal" value='${context.getVariable("maven.repo.local")}'/>
<mkdir dir="${todir}"/>
<copy todir="${todir}" flatten="true">
<fileset dir="${mavenRepoLocal}">
<ant:mkdir dir="${todir}"/>
<ant:copy todir="${todir}" flatten="true">
<ant:fileset dir="${mavenRepoLocal}">
<j:forEach var="dep" items="${pom.dependencies}">
<include name="${dep.artifactDirectory}/jars/${dep.artifact}"/>
<ant:include name="${dep.artifactDirectory}/jars/${dep.artifact}"/>
</j:forEach>
<j:if test="${excludes != ''}">
<!-- The excludes are a list of dep ids -->
<util:tokenize var="excludeItems" delim=",">${excludes}</util:tokenize>
<j:forEach var="exclude" items="${excludeItems}">
<j:set var="depToExclude" value="${pom.getDependency(exclude)}"/>
<exclude name="${depToExclude.artifactDirectory}/jars/${depToExclude.artifact}"/>
<ant:exclude name="${depToExclude.artifactDirectory}/jars/${depToExclude.artifact}"/>
</j:forEach>
</j:if>
</fileset>
</copy>
</ant:fileset>
</ant:copy>
</define:tag>
</define:taglib>