jvanzyl 2003/01/08 10:01:20
Modified: src/plugins-build/deploy plugin.jelly
Log:
o the deploy artifact tag will now work with poms, jars and jar snapshots.
the checksum has been taken out for now because the sed command is getting
whacked somehow going through jelly. i'm going to put something on ibiblio
to create the checksums and call it instead.
Revision Changes Path
1.14 +3 -4 jakarta-turbine-maven/src/plugins-build/deploy/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/deploy/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 6 Jan 2003 06:21:04 -0000 1.13
+++ plugin.jelly 8 Jan 2003 18:01:20 -0000 1.14
@@ -87,14 +87,11 @@
<j:set var="assureDirectoryCommandX" value="${assureDirectoryCommand}X"/>
<j:if test="${assureDirectoryCommandX != 'X'}">
- <echo>${siteAddress} -l ${username} '${assureDirectoryCommand}
${resolvedDirectory}</echo>
<exec dir="." executable="${commander}">
<arg line="${siteAddress} -l ${username} '${assureDirectoryCommand}
${resolvedDirectory}'"/>
</exec>
</j:if>
- <echo>${artifact} ${username}@${siteAddress}:${resolvedDirectory}</echo>
-
<exec dir="." executable="${copier}">
<arg value="${artifact}"/>
<arg value="${username}@${siteAddress}:${resolvedDirectory}"/>
@@ -109,9 +106,11 @@
<j:set var="siteCommandX" value="${siteCommand}X"/>
<j:if test="${siteCommandX != 'X'}">
+ <j:useBean var="strings" class="org.apache.commons.lang.StringUtils"/>
+
<j:set
var="siteCommand"
- value='${context.getVariable("toolbox").StringUtils.replace(siteCommand,
"@deployDirectory@", resolvedDirectory)}'
+ value='${strings.replace(siteCommand, "@deployDirectory@",
resolvedDirectory)}'
/>
<echo>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
