Author: sebb
Date: Tue Mar 13 15:21:36 2007
New Revision: 517912
URL: http://svn.apache.org/viewvc?view=rev&rev=517912
Log:
Update to velocity 1.5; add commons-lang-2.3
Added:
jakarta/jmeter/branches/rel-2-2/lib/aareadme.txt
- copied, changed from r517867,
jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt
jakarta/jmeter/branches/rel-2-2/lib/commons-lang-2.3.jar (with props)
jakarta/jmeter/branches/rel-2-2/lib/doc/velocity-1.5.jar (with props)
Removed:
jakarta/jmeter/branches/rel-2-2/lib/doc/LICENSE(jdom).txt
jakarta/jmeter/branches/rel-2-2/lib/doc/jdom-b9.jar
jakarta/jmeter/branches/rel-2-2/lib/doc/velocity-1.4.jar
jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt
Modified:
jakarta/jmeter/branches/rel-2-2/build.properties
jakarta/jmeter/branches/rel-2-2/build.xml
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-2/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.properties?view=diff&rev=517912&r1=517911&r2=517912
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/build.properties Tue Mar 13 15:21:36 2007
@@ -8,6 +8,8 @@
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-lang is currently only needed by velocity; but could be useful for
BeanShell
+commons-lang.jar = ${lib.dir}/commons-lang-2.3.jar
commons-logging.jar = ${lib.dir}/commons-logging-1.1.jar
excalibur-compatibility.jar = ${lib.dir}/excalibur-compatibility-1.1.jar
@@ -45,5 +47,4 @@
# The following jars are only needed for source distributions
# They are used for building the documentation
-jdom-b9.jar = ${lib.doc}/jdom-b9.jar
-velocity.jar = ${lib.doc}/velocity-1.4.jar
\ No newline at end of file
+velocity.jar = ${lib.doc}/velocity-1.5.jar
\ No newline at end of file
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=517912&r1=517911&r2=517912
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/build.xml Tue Mar 13 15:21:36 2007
@@ -296,6 +296,7 @@
<include name="${commons-collections.jar}"/>
<include name="${commons-httpclient.jar}"/>
<include name="${commons-jexl.jar}"/>
+ <include name="${commons-lang.jar}"/>
<include name="${commons-logging.jar}"/>
<include name="${excalibur-logger.jar}"/>
<include name="${excalibur-i18n.jar}"/>
@@ -381,8 +382,9 @@
<!-- Anakia classpath -->
<path id="anakia.classpath">
<pathelement location="${velocity.jar}"/>
- <pathelement location="${jdom-b9.jar}"/>
+ <pathelement location="${jdom.jar}"/>
<pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-lang.jar}"/>
<pathelement location="${logkit.jar}"/>
</path>
@@ -1124,7 +1126,6 @@
<patternset refid="dist.sources"/>
<include name="${dest.docs}/api/**"/>
<include name="${velocity.jar}"/>
- <include name="${jdom-b9.jar}/"/>
</patternset>
<!-- Invoke with -Djmeter.version=m.n
Copied: jakarta/jmeter/branches/rel-2-2/lib/aareadme.txt (from r517867,
jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt)
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/aareadme.txt?view=diff&rev=517912&p1=jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt&r1=517867&p2=jakarta/jmeter/branches/rel-2-2/lib/aareadme.txt&r2=517912
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/lib/jar_usage.txt (original)
+++ jakarta/jmeter/branches/rel-2-2/lib/aareadme.txt Tue Mar 13 15:21:36 2007
@@ -22,6 +22,9 @@
commons-jexl-1.1
- Jexl function
+commons-lang-2.3
+- velocity (Anakia)
+
commons-logging-1.1
- httpclient
@@ -75,7 +78,7 @@
- org.xml.sax - various
- XPathUtil (XPath assertion)
-velocity-1.4
+velocity-1.5
- Anakia (create documentation) Not used by JMeter runtime
xalan
Added: jakarta/jmeter/branches/rel-2-2/lib/commons-lang-2.3.jar
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/commons-lang-2.3.jar?view=auto&rev=517912
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/branches/rel-2-2/lib/commons-lang-2.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: jakarta/jmeter/branches/rel-2-2/lib/doc/velocity-1.5.jar
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/lib/doc/velocity-1.5.jar?view=auto&rev=517912
==============================================================================
Binary file - no diff available.
Propchange: jakarta/jmeter/branches/rel-2-2/lib/doc/velocity-1.5.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=517912&r1=517911&r2=517912
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Tue Mar 13 15:21:36 2007
@@ -135,7 +135,8 @@
<li>BSF 2.4.0</li>
<li>commons-collections 3.2</li>
<li>commons-jexl 1.1</li>
-<li>velocity 1.4</li>
+<li>commons-lang-2.3 (added)</li>
+<li>velocity 1.5</li>
<li></li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
