Author: sebb
Date: Wed Sep 16 15:26:26 2009
New Revision: 815834
URL: http://svn.apache.org/viewvc?rev=815834&view=rev
Log:
Remove target directory from build.properties
Start enabling download of dependencies
Update jars:
codec: 1.3 => 1.4
collections: 3.2 => 3.2.1
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=815834&r1=815833&r2=815834&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.properties (original)
+++ jakarta/jmeter/trunk/build.properties Wed Sep 16 15:26:26 2009
@@ -15,56 +15,66 @@
# **** External jars (not built as part of JMeter) and needed for
build/release ****
-apache-bsf.jar = ${lib.dir}/bsf-2.4.0.jar
-avalon-framework.jar = ${lib.dir}/avalon-framework-4.1.4.jar
+apache-bsf.jar = bsf-2.4.0.jar
+avalon-framework.jar = avalon-framework-4.1.4.jar
-beanshell.jar = ${lib.dir}/bsh-2.0b4.jar
+beanshell.jar = bsh-2.0b4.jar
-commons-codec.jar = ${lib.dir}/commons-codec-1.3.jar
-commons-collections.jar = ${lib.dir}/commons-collections-3.2.jar
-commons-httpclient.jar = ${lib.dir}/commons-httpclient-3.1.jar
-commons-io.jar = ${lib.dir}/commons-io-1.4.jar
-commons-jexl.jar = ${lib.dir}/commons-jexl-1.1.jar
-commons-lang.jar = ${lib.dir}/commons-lang-2.4.jar
-commons-logging.jar = ${lib.dir}/commons-logging-1.1.1.jar
-commons-net.jar = ${lib.dir}/commons-net-1.4.1.jar
-
-excalibur-datasource.jar = ${lib.dir}/excalibur-datasource-1.1.1.jar
-excalibur-instrument.jar = ${lib.dir}/excalibur-instrument-1.0.jar
-excalibur-logger.jar = ${lib.dir}/excalibur-logger-1.1.jar
-excalibur-pool.jar = ${lib.dir}/excalibur-pool-1.2.jar
-
-htmlparser.jar = ${lib.dir}/htmlparser-2.0-20060923.jar
-htmllexer.jar = ${lib.dir}/htmllexer-2.0-20060923.jar
-jakarta-oro.jar = ${lib.dir}/jakarta-oro-2.0.8.jar
-jcharts.jar = ${lib.dir}/jCharts-0.7.5.jar
-jdom.jar = ${lib.dir}/jdom-1.1.jar
-js_rhino.jar = ${lib.dir}/js_rhino1_6R5.jar
-junit.jar = ${lib.dir}/junit3.8.2.jar
+commons-codec.jar = commons-codec-1.4.jar
+commons-codec.loc =
http://repo2.maven.org/maven2/commons-codec/commons-codec/1.4
+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-httpclient.jar = commons-httpclient-3.1.jar
+commons-httpclient.loc =
http://repo2.maven.org/maven2/commons-httpclient/commons-httpclient/3.1
+commons-io.jar = commons-io-1.4.jar
+commons-io.loc =
http://repo2.maven.org/maven2/commons-io/commons-io/1.4
+commons-jexl.jar = commons-jexl-1.1.jar
+commons-jexl.loc =
http://repo2.maven.org/maven2/commons-jexl/commons-jexl/1.1
+commons-lang.jar = commons-lang-2.4.jar
+commons-lang.loc =
http://repo2.maven.org/maven2/commons-lang/commons-lang/2.4
+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-net.jar = commons-net-1.4.1.jar
+commons-net.loc =
http://repo2.maven.org/maven2/commons-net/commons-net/1.4.1
+
+excalibur-datasource.jar = excalibur-datasource-1.1.1.jar
+excalibur-instrument.jar = excalibur-instrument-1.0.jar
+excalibur-logger.jar = excalibur-logger-1.1.jar
+excalibur-pool.jar = excalibur-pool-1.2.jar
+
+htmlparser.jar = htmlparser-2.0-20060923.jar
+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
# N.B. if this is changed, then the rmiregistry classpath also needs to be
changed
-logkit.jar = ${lib.dir}/logkit-1.2.jar
+logkit.jar = logkit-1.2.jar
-soap.jar = ${lib.dir}/soap.jar
-tidy.jar = ${lib.dir}/Tidy.jar
-xstream.jar = ${lib.dir}/xstream-1.3.1.jar
-xpp3.jar = ${lib.dir}/xpp3_min-1.1.4c.jar
+soap.jar = soap.jar
+tidy.jar = Tidy.jar
+xstream.jar = xstream-1.3.1.jar
+xpp3.jar = xpp3_min-1.1.4c.jar
# serialiser and xalan are also used by extras/build.xml
# remember to update the versions there too (build.properties not present in
binary releases)
-serializer.jar = ${lib.dir}/serializer-2_9_1.jar
-xalan.jar = ${lib.dir}/xalan_2_7_1.jar
-xerces.jar = ${lib.dir}/xercesImpl-2_9_1.jar
-xml-apis.jar = ${lib.dir}/xml-apis-2_9_1.jar
+serializer.jar = serializer-2_9_1.jar
+xalan.jar = xalan_2_7_1.jar
+xerces.jar = xercesImpl-2_9_1.jar
+xml-apis.jar = xml-apis-2_9_1.jar
# Codecs were previously provided by Batik
-xmlgraphics-commons.jar = ${lib.dir}/xmlgraphics-commons-1.3.1.jar
+xmlgraphics-commons.jar = xmlgraphics-commons-1.3.1.jar
# Geronimo API jars
-activation.jar = ${lib.api}/geronimo-activation_1.0.2_spec-1.1.jar
-javamail.jar = ${lib.api}/geronimo-javamail_1.3.1_spec-1.1.jar
-jms.jar = ${lib.api}/geronimo-jms_1.1_spec-1.0.jar
+activation.jar = geronimo-activation_1.0.2_spec-1.1.jar
+javamail.jar = geronimo-javamail_1.3.1_spec-1.1.jar
+jms.jar = geronimo-jms_1.1_spec-1.0.jar
# The following jars are only needed for source distributions
# They are used for building the documentation
-velocity.jar = ${lib.doc}/velocity-1.6.2.jar
\ No newline at end of file
+velocity.jar = velocity-1.6.2.jar
\ No newline at end of file
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=815834&r1=815833&r2=815834&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Wed Sep 16 15:26:26 2009
@@ -297,38 +297,38 @@
<!-- Jars for binary release -->
<patternset id="external.jars">
- <include name="${apache-bsf.jar}"/>
- <include name="${beanshell.jar}"/>
- <include name="${avalon-framework.jar}"/>
- <include name="${xmlgraphics-commons.jar}"/>
- <include name="${commons-codec.jar}"/>
- <include name="${commons-collections.jar}"/>
- <include name="${commons-httpclient.jar}"/>
- <include name="${commons-io.jar}"/>
- <include name="${commons-jexl.jar}"/>
- <include name="${commons-lang.jar}"/>
- <include name="${commons-logging.jar}"/>
- <include name="${commons-net.jar}"/>
- <include name="${excalibur-datasource.jar}"/>
- <include name="${excalibur-instrument.jar}"/>
- <include name="${excalibur-logger.jar}"/>
- <include name="${excalibur-pool.jar}"/>
- <include name="${htmllexer.jar}"/>
- <include name="${htmlparser.jar}"/>
- <include name="${jakarta-oro.jar}"/>
- <include name="${jcharts.jar}"/>
- <include name="${jdom.jar}"/>
- <include name="${js_rhino.jar}"/>
- <include name="${junit.jar}"/>
- <include name="${logkit.jar}"/>
- <include name="${serializer.jar}"/>
- <include name="${soap.jar}"/>
- <include name="${tidy.jar}"/>
- <include name="${xalan.jar}"/>
- <include name="${xerces.jar}"/>
- <include name="${xml-apis.jar}"/>
- <include name="${xpp3.jar}"/>
- <include name="${xstream.jar}"/>
+ <include name="${lib.dir}/${apache-bsf.jar}"/>
+ <include name="${lib.dir}/${beanshell.jar}"/>
+ <include name="${lib.dir}/${avalon-framework.jar}"/>
+ <include name="${lib.dir}/${xmlgraphics-commons.jar}"/>
+ <include name="${lib.dir}/${commons-codec.jar}"/>
+ <include name="${lib.dir}/${commons-collections.jar}"/>
+ <include name="${lib.dir}/${commons-httpclient.jar}"/>
+ <include name="${lib.dir}/${commons-io.jar}"/>
+ <include name="${lib.dir}/${commons-jexl.jar}"/>
+ <include name="${lib.dir}/${commons-lang.jar}"/>
+ <include name="${lib.dir}/${commons-logging.jar}"/>
+ <include name="${lib.dir}/${commons-net.jar}"/>
+ <include name="${lib.dir}/${excalibur-datasource.jar}"/>
+ <include name="${lib.dir}/${excalibur-instrument.jar}"/>
+ <include name="${lib.dir}/${excalibur-logger.jar}"/>
+ <include name="${lib.dir}/${excalibur-pool.jar}"/>
+ <include name="${lib.dir}/${htmllexer.jar}"/>
+ <include name="${lib.dir}/${htmlparser.jar}"/>
+ <include name="${lib.dir}/${jakarta-oro.jar}"/>
+ <include name="${lib.dir}/${jcharts.jar}"/>
+ <include name="${lib.dir}/${jdom.jar}"/>
+ <include name="${lib.dir}/${js_rhino.jar}"/>
+ <include name="${lib.dir}/${junit.jar}"/>
+ <include name="${lib.dir}/${logkit.jar}"/>
+ <include name="${lib.dir}/${serializer.jar}"/>
+ <include name="${lib.dir}/${soap.jar}"/>
+ <include name="${lib.dir}/${tidy.jar}"/>
+ <include name="${lib.dir}/${xalan.jar}"/>
+ <include name="${lib.dir}/${xerces.jar}"/>
+ <include name="${lib.dir}/${xml-apis.jar}"/>
+ <include name="${lib.dir}/${xpp3.jar}"/>
+ <include name="${lib.dir}/${xstream.jar}"/>
</patternset>
<!--
@@ -350,55 +350,55 @@
<!-- Build classpath (includes the optional jar directory) -->
<path id="classpath">
<!-- Externally produced jars -->
- <pathelement location="${apache-bsf.jar}"/>
- <pathelement location="${beanshell.jar}"/>
- <pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${xmlgraphics-commons.jar}"/>
- <pathelement location="${commons-codec.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-httpclient.jar}"/>
- <pathelement location="${commons-io.jar}"/>
- <pathelement location="${commons-jexl.jar}"/>
- <pathelement location="${commons-lang.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-net.jar}"/>
- <pathelement location="${excalibur-datasource.jar}"/>
- <pathelement location="${excalibur-instrument.jar}"/>
- <pathelement location="${excalibur-logger.jar}"/>
- <pathelement location="${excalibur-pool.jar}"/>
- <pathelement location="${htmllexer.jar}"/>
- <pathelement location="${htmlparser.jar}"/>
- <pathelement location="${jakarta-oro.jar}"/>
- <pathelement location="${jcharts.jar}"/>
- <pathelement location="${jdom.jar}"/>
- <pathelement location="${js_rhino.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${logkit.jar}"/>
- <pathelement location="${serializer.jar}"/>
- <pathelement location="${soap.jar}"/>
- <pathelement location="${tidy.jar}"/>
- <pathelement location="${xalan.jar}"/>
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xml-apis.jar}"/>
- <pathelement location="${xpp3.jar}"/>
- <pathelement location="${xstream.jar}"/>
+ <pathelement location="${lib.dir}/${apache-bsf.jar}"/>
+ <pathelement location="${lib.dir}/${beanshell.jar}"/>
+ <pathelement location="${lib.dir}/${avalon-framework.jar}"/>
+ <pathelement location="${lib.dir}/${xmlgraphics-commons.jar}"/>
+ <pathelement location="${lib.dir}/${commons-codec.jar}"/>
+ <pathelement location="${lib.dir}/${commons-collections.jar}"/>
+ <pathelement location="${lib.dir}/${commons-httpclient.jar}"/>
+ <pathelement location="${lib.dir}/${commons-io.jar}"/>
+ <pathelement location="${lib.dir}/${commons-jexl.jar}"/>
+ <pathelement location="${lib.dir}/${commons-lang.jar}"/>
+ <pathelement location="${lib.dir}/${commons-logging.jar}"/>
+ <pathelement location="${lib.dir}/${commons-net.jar}"/>
+ <pathelement location="${lib.dir}/${excalibur-datasource.jar}"/>
+ <pathelement location="${lib.dir}/${excalibur-instrument.jar}"/>
+ <pathelement location="${lib.dir}/${excalibur-logger.jar}"/>
+ <pathelement location="${lib.dir}/${excalibur-pool.jar}"/>
+ <pathelement location="${lib.dir}/${htmllexer.jar}"/>
+ <pathelement location="${lib.dir}/${htmlparser.jar}"/>
+ <pathelement location="${lib.dir}/${jakarta-oro.jar}"/>
+ <pathelement location="${lib.dir}/${jcharts.jar}"/>
+ <pathelement location="${lib.dir}/${jdom.jar}"/>
+ <pathelement location="${lib.dir}/${js_rhino.jar}"/>
+ <pathelement location="${lib.dir}/${junit.jar}"/>
+ <pathelement location="${lib.dir}/${logkit.jar}"/>
+ <pathelement location="${lib.dir}/${serializer.jar}"/>
+ <pathelement location="${lib.dir}/${soap.jar}"/>
+ <pathelement location="${lib.dir}/${tidy.jar}"/>
+ <pathelement location="${lib.dir}/${xalan.jar}"/>
+ <pathelement location="${lib.dir}/${xerces.jar}"/>
+ <pathelement location="${lib.dir}/${xml-apis.jar}"/>
+ <pathelement location="${lib.dir}/${xpp3.jar}"/>
+ <pathelement location="${lib.dir}/${xstream.jar}"/>
<!-- Generated jars -->
<fileset dir="${lib.dir}" includes="jorphan.jar"/>
<!-- API-only jars-->
- <pathelement location="${activation.jar}"/>
- <pathelement location="${javamail.jar}"/>
- <pathelement location="${jms.jar}"/>
+ <pathelement location="${lib.api}/${activation.jar}"/>
+ <pathelement location="${lib.api}/${javamail.jar}"/>
+ <pathelement location="${lib.api}/${jms.jar}"/>
<!-- Optional jars -->
<fileset dir="${lib.opt}" includes="*.jar"/>
</path>
<!-- Anakia classpath -->
<path id="anakia.classpath">
- <pathelement location="${velocity.jar}"/>
- <pathelement location="${jdom.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-lang.jar}"/>
- <pathelement location="${logkit.jar}"/>
+ <pathelement location="${lib.doc}/${velocity.jar}"/>
+ <pathelement location="${lib.dir}/${jdom.jar}"/>
+ <pathelement location="${lib.dir}/${commons-collections.jar}"/>
+ <pathelement location="${lib.dir}/${commons-lang.jar}"/>
+ <pathelement location="${lib.dir}/${logkit.jar}"/>
</path>
@@ -1055,7 +1055,7 @@
<!-- Non-native items -->
<patternset id="dist.sources.non.native">
- <include name="${velocity.jar}"/>
+ <include name="${lib.doc}/${velocity.jar}"/>
<include name="${lib.api}/*.jar"/>
<include name="${src.dir}/**/*.gif"/>
<include name="${src.dir}/**/*.jpg"/>
@@ -1861,4 +1861,27 @@
</exec>
<echoproperties prefix="svn"/>
</target>
+
+ <macrodef name="get_jarfile">
+ <attribute name="jar.file"/>
+ <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"/>
+ </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}"/>
+ </target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
