You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2009/09/16 19:03:58 UTC
svn commit: r815886 - in /jakarta/jmeter/trunk: build.properties build.xml
Author: sebb
Date: Wed Sep 16 17:03:58 2009
New Revision: 815886
URL: http://svn.apache.org/viewvc?rev=815886&view=rev
Log:
Start adding MD5 checks to downloads
Modified:
jakarta/jmeter/trunk/build.properties
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.properties?rev=815886&r1=815885&r2=815886&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.properties (original)
+++ jakarta/jmeter/trunk/build.properties Wed Sep 16 17:03:58 2009
@@ -16,26 +16,48 @@
# **** External jars (not built as part of JMeter) and needed for build/release ****
apache-bsf.jar = bsf-2.4.0.jar
+apache-bsf.loc = http://repo2.maven.org/maven2/bsf/bsf/2.4.0
+apache-bsf.md5 = 162ed0b06486f75f07a7c8904bcea02a
+
avalon-framework.jar = avalon-framework-4.1.4.jar
+avalon-framework.loc = http://mirrors.ibiblio.org/pub/mirrors/maven/avalon-framework/jars
+avalon-framework.md5 = 2C5306A09B22BD06A78343C0B55D021F
beanshell.jar = bsh-2.0b4.jar
+beanshell.loc = http://www.beanshell.org/
+beanshell.md5 = A1C60AA83C9C9A6CB2391C1C1B85EB00
commons-codec.jar = commons-codec-1.4.jar
commons-codec.loc = http://repo2.maven.org/maven2/commons-codec/commons-codec/1.4
+commons-codec.md5 = 82B899580DA472BE37055DA949B731FA
+
commons-collections.jar = commons-collections-3.2.1.jar
commons-collections.loc = http://repo2.maven.org/maven2/commons-collections/commons-collections/3.2.1
+commons-collections.md5 = 13BC641AFD7FD95E09B260F69C1E4C91
+
commons-httpclient.jar = commons-httpclient-3.1.jar
commons-httpclient.loc = http://repo2.maven.org/maven2/commons-httpclient/commons-httpclient/3.1
+commons-httpclient.md5 = 8AD8C9229EF2D59AB9F59F7050E846A5
+
commons-io.jar = commons-io-1.4.jar
commons-io.loc = http://repo2.maven.org/maven2/commons-io/commons-io/1.4
+commons-io.md5 = B6A50C8A15ECE8753E37CBE5700BF84F
+
commons-jexl.jar = commons-jexl-1.1.jar
commons-jexl.loc = http://repo2.maven.org/maven2/commons-jexl/commons-jexl/1.1
+commons-jexl.md5 = 3F7735D20FCE1DBE05F62FF7A7B178DC
+
commons-lang.jar = commons-lang-2.4.jar
commons-lang.loc = http://repo2.maven.org/maven2/commons-lang/commons-lang/2.4
+commons-lang.md5 = 237A8E845441BAD2E535C57D985C8204
+
commons-logging.jar = commons-logging-1.1.1.jar
commons-logging.loc = http://repo2.maven.org/maven2/commons-logging/commons-logging/1.1.1
+commons-logging.md5 = E2C390FE739B2550A218262B28F290CE
+
commons-net.jar = commons-net-1.4.1.jar
commons-net.loc = http://repo2.maven.org/maven2/commons-net/commons-net/1.4.1
+commons-net.md5 = 365C9A26E81B212DE0553FBED10452CC
excalibur-datasource.jar = excalibur-datasource-1.1.1.jar
excalibur-instrument.jar = excalibur-instrument-1.0.jar
@@ -43,14 +65,16 @@
excalibur-pool.jar = excalibur-pool-1.2.jar
htmlparser.jar = htmlparser-2.0-20060923.jar
+htmlparser.loc = http://downloads.sourceforge.net/htmlparser
htmllexer.jar = htmllexer-2.0-20060923.jar
jakarta-oro.jar = jakarta-oro-2.0.8.jar
jcharts.jar = jCharts-0.7.5.jar
jdom.jar = jdom-1.1.jar
js_rhino.jar = js_rhino1_6R5.jar
-#junit.jar = junit3.8.2.jar
+
junit.jar = junit-4.7.jar
junit.loc = http://downloads.sourceforge.net/junit
+junit.md5 = B03D4C6FF4CEDCD731D6A6D1A3149F65
# N.B. if this is changed, then the rmiregistry classpath also needs to be changed
logkit.jar = logkit-1.2.jar
Modified: jakarta/jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=815886&r1=815885&r2=815886&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Wed Sep 16 17:03:58 2009
@@ -1864,24 +1864,51 @@
<macrodef name="get_jarfile">
<attribute name="jar.file"/>
+ <attribute name="jar.md5"/>
<attribute name="src.dir"/>
<attribute name="dest.dir" default="${lib.dir}"/>
<sequential>
+ <!--
<get src="@{src.dir}/@{jar.file}"
dest="@{dest.dir}/@{jar.file}"
usetimestamp="true"
- ignoreerrors="false"/>
+ ignoreerrors="false"/>
+ -->
+ <!-- Need to use antcall so MD5OK property is localised -->
+ <antcall target="_checkMD5">
+ <param name="file" value="@{jar.file}"/>
+ <param name="path" value="@{dest.dir}"/>
+ <param name="md5" value="@{jar.md5}"/>
+ </antcall>
</sequential>
</macrodef>
- <target name="get-dep-library.jar" description="o Download the dependency : junit.jar">
- <get_jarfile jar.file="${commons-codec.jar}" src.dir="${commons-codec.loc}"/>
- <get_jarfile jar.file="${commons-collections.jar}" src.dir="${commons-collections.loc}"/>
- <get_jarfile jar.file="${commons-httpclient.jar}" src.dir="${commons-httpclient.loc}"/>
- <get_jarfile jar.file="${commons-io.jar}" src.dir="${commons-io.loc}"/>
- <get_jarfile jar.file="${commons-jexl.jar}" src.dir="${commons-jexl.loc}"/>
- <get_jarfile jar.file="${commons-lang.jar}" src.dir="${commons-lang.loc}"/>
- <get_jarfile jar.file="${commons-logging.jar}" src.dir="${commons-logging.loc}"/>
- <get_jarfile jar.file="${commons-net.jar}" src.dir="${commons-net.loc}"/>
+ <!-- Ant subroutine, required to localise MD5OK property -->
+ <target name="_checkMD5">
+ <checksum algorithm="MD5" file="${path}/${file}" property="MD5"/>
+ <condition property="MD5OK">
+ <equals arg1="${MD5}" arg2="${md5}" casesensitive="false"/>
+ </condition>
+ <fail message="Bad Checksum: for ${file} expected ${md5} actual ${MD5}" unless="MD5OK"/>
+ <echo level="info" message="Checksum OK: ${file}"/>
</target>
+
+ <target name="get-dep-library.jar" description="o Download the dependency : junit.jar">
+ <get_jarfile jar.file="${apache-bsf.jar}" src.dir="${apache-bsf.loc}" jar.md5="${apache-bsf.md5}"/>
+ <get_jarfile jar.file="${avalon-framework.jar}" src.dir="${avalon-framework.loc}" jar.md5="${avalon-framework.md5}"/>
+ <get_jarfile jar.file="${beanshell.jar}" src.dir="${beanshell.loc}" jar.md5="${beanshell.md5}"/>
+ <get_jarfile jar.file="${commons-codec.jar}" src.dir="${commons-codec.loc}" jar.md5="${commons-codec.md5}"/>
+ <get_jarfile jar.file="${commons-collections.jar}" src.dir="${commons-collections.loc}" jar.md5="${commons-collections.md5}"/>
+ <get_jarfile jar.file="${commons-httpclient.jar}" src.dir="${commons-httpclient.loc}" jar.md5="${commons-httpclient.md5}"/>
+ <get_jarfile jar.file="${commons-io.jar}" src.dir="${commons-io.loc}" jar.md5="${commons-io.md5}"/>
+ <get_jarfile jar.file="${commons-jexl.jar}" src.dir="${commons-jexl.loc}" jar.md5="${commons-jexl.md5}"/>
+ <get_jarfile jar.file="${commons-lang.jar}" src.dir="${commons-lang.loc}" jar.md5="${commons-lang.md5}"/>
+ <get_jarfile jar.file="${commons-logging.jar}" src.dir="${commons-logging.loc}" jar.md5="${commons-logging.md5}"/>
+ <get_jarfile jar.file="${commons-net.jar}" src.dir="${commons-net.loc}" jar.md5="${commons-net.md5}"/>
+ <get_jarfile jar.file="${junit.jar}" src.dir="${junit.loc}" jar.md5="${junit.md5}"/>
+ <!--
+ Faulty loc
+ <get_jarfile jar.file="${htmlparser.jar}" src.dir="${htmlparser.loc}" jar.md5="${htmlparser.md5}"/>
+ -->
+</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org