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 2007/03/03 21:27:01 UTC
svn commit: r514235 - in /jakarta/jmeter/branches/rel-2-2: ./ lib/ xdocs/
Author: sebb
Date: Sat Mar 3 12:27:00 2007
New Revision: 514235
URL: http://svn.apache.org/viewvc?view=rev&rev=514235
Log:
Updated various jars
Changed build to use a properties file and specific jar versions
Added:
jakarta/jmeter/branches/rel-2-2/build.properties (with props)
jakarta/jmeter/branches/rel-2-2/lib/batik-awt-util-1.6.jar (with props)
jakarta/jmeter/branches/rel-2-2/lib/bsf-2.4.0.jar (with props)
jakarta/jmeter/branches/rel-2-2/lib/commons-collections-3.2.jar (with props)
jakarta/jmeter/branches/rel-2-2/lib/commons-jexl-1.1.jar (with props)
jakarta/jmeter/branches/rel-2-2/lib/velocity-1.4.jar (with props)
Removed:
jakarta/jmeter/branches/rel-2-2/lib/batik-awt-util.jar
jakarta/jmeter/branches/rel-2-2/lib/bsf-2.3.0.jar
jakarta/jmeter/branches/rel-2-2/lib/commons-collections.jar
jakarta/jmeter/branches/rel-2-2/lib/commons-jexl-1.0.jar
jakarta/jmeter/branches/rel-2-2/lib/velocity-1.4-dev.jar
Modified:
jakarta/jmeter/branches/rel-2-2/build.xml
jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Added: jakarta/jmeter/branches/rel-2-2/build.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.properties?view=auto&rev=514235
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.properties (added)
+++ jakarta/jmeter/branches/rel-2-2/build.properties Sat Mar 3 12:27:00 2007
@@ -0,0 +1,39 @@
+# External jars (not built as part of JMeter)
+
+apache-bsf.jar = ${lib.dir}/bsf-2.4.0.jar
+avalon-framework.jar = ${lib.dir}/avalon-framework-4.1.4.jar
+batik-awt-util.jar = ${lib.dir}/batik-awt-util-1.6.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.0.1.jar
+commons-jexl.jar = ${lib.dir}/commons-jexl-1.1.jar
+commons-logging.jar = ${lib.dir}/commons-logging-1.1.jar
+
+excalibur-compatibility.jar = ${lib.dir}/excalibur-compatibility-1.1.jar
+excalibur-datasource.jar = ${lib.dir}/excalibur-datasource-1.1.1.jar
+excalibur-i18n.jar = ${lib.dir}/excalibur-i18n-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.0.jar
+js_rhino.jar = ${lib.dir}/js_rhino1_6R5.jar
+junit.jar = ${lib.dir}/junit.jar
+logkit.jar = ${lib.dir}/logkit-1.2.jar
+soap.jar = ${lib.dir}/soap.jar
+tidy.jar = ${lib.dir}/Tidy.jar
+xstream.jar = ${lib.dir}/xstream-1.2.1.jar
+xpp3.jar = ${lib.dir}/xpp3_min-1.1.3.4.O.jar
+
+# The following 3 jars are probably optional for JDK 1.4+
+xalan.jar = ${lib.dir}/xalan.jar
+xerces.jar = ${lib.dir}/xercesImpl.jar
+xml-apis.jar = ${lib.dir}/xml-apis.jar
+
+# The following jar is only needed for source distributions
+velocity.jar = ${lib.dir}/velocity-1.4.jar
\ No newline at end of file
Propchange: jakarta/jmeter/branches/rel-2-2/build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/jmeter/branches/rel-2-2/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.xml?view=diff&rev=514235&r1=514234&r2=514235
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/build.xml Sat Mar 3 12:27:00 2007
@@ -299,39 +299,7 @@
<property name="encoding" value="UTF-8"/>
<!-- 3rd party libraries to be included in the binary distribution -->
- <property name="avalon-framework.jar" value="${lib.dir}/avalon-framework-4.1.4.jar"/>
- <property name="apache-bsf.jar" value="${lib.dir}/bsf-2.3.0.jar"/>
- <property name="jakarta-oro.jar" value="${lib.dir}/jakarta-oro-2.0.8.jar"/>
- <property name="commons-codec.jar" value="${lib.dir}/commons-codec-1.3.jar"/>
- <property name="commons-collections.jar" value="${lib.dir}/commons-collections.jar"/>
- <property name="commons-httpclient.jar" value="${lib.dir}/commons-httpclient-3.0.1.jar"/>
- <property name="commons-jexl.jar" value="${lib.dir}/commons-jexl-1.0.jar"/>
- <property name="commons-logging.jar" value="${lib.dir}/commons-logging-1.1.jar"/>
- <property name="excalibur-logger.jar" value="${lib.dir}/excalibur-logger-1.1.jar"/>
- <property name="excalibur-i18n.jar" value="${lib.dir}/excalibur-i18n-1.1.jar"/>
- <property name="excalibur-compatibility.jar" value="${lib.dir}/excalibur-compatibility-1.1.jar"/>
- <property name="batik-awt-util.jar" value="${lib.dir}/batik-awt-util.jar"/>
- <property name="jcharts.jar" value="${lib.dir}/jCharts-0.7.5.jar"/>
- <property name="junit.jar" value="${lib.dir}/junit.jar"/>
- <property name="logkit.jar" value="${lib.dir}/logkit-1.2.jar"/>
- <property name="excalibur-datasource.jar" value="${lib.dir}/excalibur-datasource-1.1.1.jar"/>
- <property name="excalibur-pool.jar" value="${lib.dir}/excalibur-pool-1.2.jar"/>
- <property name="excalibur-instrument.jar" value="${lib.dir}/excalibur-instrument-1.0.jar"/>
- <property name="xstream.jar" value="${lib.dir}/xstream-1.2.1.jar"/>
- <property name="xpp3.jar" value="${lib.dir}/xpp3_min-1.1.3.4.O.jar"/>
-
- <!-- The following 3 jars are probably optional for JDK1.4 -->
- <property name="xalan.jar" value="${lib.dir}/xalan.jar"/>
- <property name="xerces.jar" value="${lib.dir}/xercesImpl.jar"/>
- <property name="xml-apis.jar" value="${lib.dir}/xml-apis.jar"/>
-
- <property name="jdom.jar" value="${lib.dir}/jdom-1.0.jar"/>
- <property name="js.jar" value="${lib.dir}/js_rhino1_6R5.jar"/>
- <property name="soap.jar" value="${lib.dir}/soap.jar"/>
- <property name="tidy.jar" value="${lib.dir}/Tidy.jar"/>
-
- <!-- The following jars are only needed for source distributions -->
- <property name="velocity.jar" value="${lib.dir}/velocity-1.4-dev.jar"/>
+ <property file="build.properties"/>
<!-- Jars for binary release -->
<patternset id="external.jars">
@@ -359,7 +327,7 @@
<include name="${xerces.jar}"/>
<include name="${xml-apis.jar}"/>
<include name="${jdom.jar}"/>
- <include name="${js.jar}"/>
+ <include name="${js_rhino.jar}"/>
<include name="${soap.jar}"/>
<include name="${tidy.jar}"/>
<include name="${excalibur-datasource.jar}"/>
@@ -388,20 +356,48 @@
<!-- Build classpath (includes the optional jar directory) -->
<path id="classpath">
- <fileset dir="${lib.dir}" includes="*.jar"/>
+ <!-- Externally produced jars -->
+ <pathelement location="${apache-bsf.jar}"/>
+ <pathelement location="${avalon-framework.jar}"/>
+ <pathelement location="${batik-awt-util.jar}"/>
+ <pathelement location="${commons-codec.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-httpclient.jar}"/>
+ <pathelement location="${commons-jexl.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${excalibur-compatibility.jar}"/>
+ <pathelement location="${excalibur-datasource.jar}"/>
+ <pathelement location="${excalibur-i18n.jar}"/>
+ <pathelement location="${excalibur-instrument.jar}"/>
+ <pathelement location="${excalibur-logger.jar}"/>
+ <pathelement location="${excalibur-pool.jar}"/>
+ <pathelement location="${htmlparser.jar}"/>
+ <pathelement location="${htmllexer.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="${soap.jar}"/>
+ <pathelement location="${tidy.jar}"/>
+ <pathelement location="${xstream.jar}"/>
+ <pathelement location="${xpp3.jar}"/>
+ <pathelement location="${xalan.jar}"/>
+ <pathelement location="${xerces.jar}"/>
+ <pathelement location="${xml-apis.jar}"/>
+ <!-- Generated jars -->
+ <fileset dir="${lib.dir}" includes="jorphan.jar"/>
+ <!-- Optional jars -->
<fileset dir="${lib.opt}" includes="*.jar"/>
</path>
<!-- Anakia classpath -->
- <!--
- N.B. On some OSes - e.g. VMS - multiple "." are converted to other characters
- So replace the version part with "*" to match any version.
- -->
<path id="anakia.classpath">
- <fileset dir="${lib.dir}" includes="velocity*.jar"/>
+ <pathelement location="${velocity.jar}"/>
<fileset dir="${legacy.dir}" includes="jdom-b9.jar"/>
- <fileset dir="${lib.dir}" includes="commons-collections*.jar"/>
- <fileset dir="${lib.dir}" includes="logkit-*.jar"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${logkit.jar}"/>
</path>
Added: jakarta/jmeter/branches/rel-2-2/lib/batik-awt-util-1.6.jar
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/batik-awt-util-1.6.jar?view=auto&rev=514235
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/branches/rel-2-2/lib/batik-awt-util-1.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/jmeter/branches/rel-2-2/lib/bsf-2.4.0.jar
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/bsf-2.4.0.jar?view=auto&rev=514235
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/branches/rel-2-2/lib/bsf-2.4.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/jmeter/branches/rel-2-2/lib/commons-collections-3.2.jar
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/commons-collections-3.2.jar?view=auto&rev=514235
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/branches/rel-2-2/lib/commons-collections-3.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/jmeter/branches/rel-2-2/lib/commons-jexl-1.1.jar
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/commons-jexl-1.1.jar?view=auto&rev=514235
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/branches/rel-2-2/lib/commons-jexl-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt?view=diff&rev=514235&r1=514234&r2=514235
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt (original)
+++ jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt Sat Mar 3 12:27:00 2007
@@ -5,21 +5,24 @@
- LogKit (used by HttpClient ?)
- Configuration (ResultCollector, SaveService, SampleResult, TestElementSaver)
-batik-awt-util (org.apache.batik.ext)
+batik-awt-util-1.6 (org.apache.batik.ext)
- SaveGraphicsService
commons-codec-1.3
- used by commons-httpclient-3.0
- also HtmlParserTester for Base64
-commons-collections
+commons-collections-3.2
- ListenerNotifier
- Anakia
-commons-httpclient-3.0
+commons-httpclient-3.0.1
- httpclient
-commons-logging
+commons-jexl-1.1
+- Jexl function
+
+commons-logging-1.1
- httpclient
excalibur-datasource-1.1.1 (org.apache.avalon.excalibur.datasource)
@@ -36,10 +39,11 @@
excalibur-pool-1.2 (org.apache.avalon.excalibur.pool)
- used by excalibur-datasource
-htmlparser
+htmlparser-2.0-20060923
+htmllexer-2.0-20060923
- http: parsing html
-jakarta-oro
+jakarta-oro-2.0.8
- regular expressions: various
jCharts-0.7.5 (org.jCharts)
@@ -88,11 +92,8 @@
The x* jars above are used for XML handling (probably not needed for JDK1.4)
-xml-batik
-- org.apache.batik.ext.awt.image.codec|org.apache.batik.ext.awt.image.codec.tiff
-
-xpp3_min-1.1.3.4.I
+xpp3_min-1.1.3.4.O
- xstream
-xstream-1.1.2
+xstream-1.2.1
- SaveService
Added: jakarta/jmeter/branches/rel-2-2/lib/velocity-1.4.jar
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/velocity-1.4.jar?view=auto&rev=514235
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/branches/rel-2-2/lib/velocity-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=514235&r1=514234&r2=514235
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sat Mar 3 12:27:00 2007
@@ -78,10 +78,23 @@
<h4>Non-functional improvements:</h4>
<ul>
-<li>Change to htmlparser 2.0</li>
-<li>Updated to xstream 1.2.1/xpp3_min-1.1.3.4.O</li>
<li>Functor calls can now be unit tested</li>
<li>Replace com.sun.net classes with javax.net</li>
+<li>Extract external jar definitions into build.properties file</li>
+<li>Use specific jar names in build classpaths so errors are detected sooner</li>
+<li>Updated to: batik 1</li>
+</ul>
+
+<h4>External jar updates:</h4>
+<ul>
+<li>Htmlparser 2.0-20060923</li>
+<li>xstream 1.2.1/xpp3_min-1.1.3.4.O</li>
+<li>Batik 1.6</li>
+<li>BSF 2.4.0</li>
+<li>commons-collections 3.2</li>
+<li>commons-jexl 1.1</li>
+<li>velocity 1.4</li>
+<li></li>
</ul>
<h4>Bug fixes:</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org