Alexey,
Thanks for contributing.
Would you mind sticking this in JIRA so we can track and apply this?
http://issues.apache.org/jira
Thanks!
Will
----- Original Message -----
From: "Alexey Panchenko" <[EMAIL PROTECTED]>
To: <[email protected]>
Sent: Wednesday, November 16, 2005 8:48 PM
Subject: download.xml.patch
Hi,
I make the following changes to download.xml:
s/jarname/download.jarname/
s/jarversion/download.jarversion/
I usually compile it using "ant jar jar-src" and 'build-download'
called during 'jar-src' fails since 'jarname' is already defined in
'jar' with <property name="jarname" value="${final.name}" /> - it
tries to download something like velocity-1.5-dev-2.7.5.jar (the first
download is antlr and jarname can not be redefined).
Index: download.xml
===================================================================
--- download.xml (revision 345181)
+++ download.xml (working copy)
@@ -41,70 +41,70 @@
<target name="http-download">
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
- <get src="${repo.url}/${jarname}/jars/${jarname}-${jarversion}.jar"
- dest="${build.lib}/${jarname}-${jarversion}.jar"
+ <get
src="${repo.url}/${download.jarname}/jars/${download.jarname}-${download.jarversion}.jar"
+
dest="${build.lib}/${download.jarname}-${download.jarversion}.jar"
usetimestamp="true"
verbose="false"
ignoreerrors="false" />
</target>
<target name="antlr-download">
- <property name="jarname" value="antlr" />
- <property name="jarversion" value="${jar.antlr.version}" />
+ <property name="download.jarname" value="antlr" />
+ <property name="download.jarversion" value="${jar.antlr.version}" />
<antcall target="http-download"/>
</target>
<target name="avalon-logkit-download">
- <property name="jarname" value="avalon-logkit" />
- <property name="jarversion" value="${jar.avalon-logkit.version}" />
+ <property name="download.jarname" value="avalon-logkit" />
+ <property name="download.jarversion"
value="${jar.avalon-logkit.version}" />
<antcall target="http-download"/>
</target>
<target name="commons-collections-download">
- <property name="jarname" value="commons-collections" />
- <property name="jarversion" value="${jar.commons-collections.version}"
/>
+ <property name="download.jarname" value="commons-collections" />
+ <property name="download.jarversion"
value="${jar.commons-collections.version}" />
<antcall target="http-download"/>
</target>
<target name="commons-lang-download">
- <property name="jarname" value="commons-lang" />
- <property name="jarversion" value="${jar.commons-lang.version}" />
+ <property name="download.jarname" value="commons-lang" />
+ <property name="download.jarversion"
value="${jar.commons-lang.version}" />
<antcall target="http-download"/>
</target>
<target name="jdom-download">
- <property name="jarname" value="jdom" />
- <property name="jarversion" value="${jar.jdom.version}" />
+ <property name="download.jarname" value="jdom" />
+ <property name="download.jarversion" value="${jar.jdom.version}" />
<antcall target="http-download"/>
</target>
<target name="junit-download">
- <property name="jarname" value="junit" />
- <property name="jarversion" value="${jar.junit.version}" />
+ <property name="download.jarname" value="junit" />
+ <property name="download.jarversion" value="${jar.junit.version}" />
<antcall target="http-download"/>
</target>
<target name="log4j-download">
- <property name="jarname" value="log4j" />
- <property name="jarversion" value="${jar.log4j.version}" />
+ <property name="download.jarname" value="log4j" />
+ <property name="download.jarversion" value="${jar.log4j.version}" />
<antcall target="http-download"/>
</target>
<target name="oro-download">
- <property name="jarname" value="oro" />
- <property name="jarversion" value="${jar.oro.version}" />
+ <property name="download.jarname" value="oro" />
+ <property name="download.jarversion" value="${jar.oro.version}" />
<antcall target="http-download"/>
</target>
<target name="servletapi-download">
- <property name="jarname" value="servletapi" />
- <property name="jarversion" value="${jar.servletapi.version}" />
+ <property name="download.jarname" value="servletapi" />
+ <property name="download.jarversion" value="${jar.servletapi.version}"
/>
<antcall target="http-download"/>
</target>
<target name="werken-xpath-download">
- <property name="jarname" value="werken-xpath" />
- <property name="jarversion" value="${jar.werken-xpath.version}" />
+ <property name="download.jarname" value="werken-xpath" />
+ <property name="download.jarversion"
value="${jar.werken-xpath.version}" />
<antcall target="http-download"/>
</target>
</project>
--
Best regards,
Alexey mailto:[EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
