dion 2003/03/27 05:08:57
Modified: src/plugins-build/deploy plugin.jelly
Log:
Explicity use ant name space. In prep for removal of jeez etc
Revision Changes Path
1.5 +24 -23 maven/src/plugins-build/deploy/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/deploy/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 26 Mar 2003 15:49:40 -0000 1.4
+++ plugin.jelly 27 Mar 2003 13:08:57 -0000 1.5
@@ -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="[EMAIL PROTECTED]:${resolvedDirectory}"/>
- </exec>
+ <ant:exec dir="." executable="${copier}">
+ <ant:arg value="${artifact}"/>
+ <ant:arg value="[EMAIL PROTECTED]:${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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
