Author: sebb
Date: Mon Jun 28 17:59:40 2010
New Revision: 958662
URL: http://svn.apache.org/viewvc?rev=958662&view=rev
Log:
Include bsf-api-3.1 in releases
Modified:
jakarta/jmeter/trunk/build.properties
jakarta/jmeter/trunk/build.xml
jakarta/jmeter/trunk/eclipse.classpath
Modified: jakarta/jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.properties?rev=958662&r1=958661&r2=958662&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.properties (original)
+++ jakarta/jmeter/trunk/build.properties Mon Jun 28 17:59:40 2010
@@ -34,9 +34,9 @@ apache-bsf.jar = bsf-2.4.0.
apache-bsf.loc = http://repo2.maven.org/maven2/bsf/bsf/2.4.0
apache-bsf.md5 = 16e82d858c648962fb5c959f21959039
-apache-bsf-api.jar = bsf-api-3.1.jar
-apache-bsf-api.loc =
http://repo2.maven.org/maven2/org/apache/bsf/bsf-api/3.1
-apache-bsf-api.md5 = 147c6cb39f889f640036f096f8a4bf59
+apache-jsr223-api.jar = bsf-api-3.1.jar
+apache-jsr223-api.loc =
http://repo2.maven.org/maven2/org/apache/bsf/bsf-api/3.1
+apache-jsr223-api.md5 = 147c6cb39f889f640036f096f8a4bf59
avalon-framework.jar = avalon-framework-4.1.4.jar
avalon-framework.loc =
http://mirrors.ibiblio.org/pub/mirrors/maven/avalon-framework/jars
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=958662&r1=958661&r2=958662&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Mon Jun 28 17:59:40 2010
@@ -306,6 +306,7 @@
<patternset id="external.jars">
<include name="${lib.dir}/${activation.jar}"/>
<include name="${lib.dir}/${apache-bsf.jar}"/>
+ <include name="${lib.dir}/${apache-jsr223-api.jar}"/>
<include name="${lib.dir}/${beanshell.jar}"/>
<include name="${lib.dir}/${avalon-framework.jar}"/>
<include name="${lib.dir}/${xmlgraphics-commons.jar}"/>
@@ -362,6 +363,7 @@
<!-- Externally produced jars -->
<pathelement location="${lib.dir}/${activation.jar}"/>
<pathelement location="${lib.dir}/${apache-bsf.jar}"/>
+ <pathelement location="${lib.dir}/${apache-jsr223-api.jar}"/>
<pathelement location="${lib.dir}/${beanshell.jar}"/>
<pathelement location="${lib.dir}/${avalon-framework.jar}"/>
<pathelement location="${lib.dir}/${xmlgraphics-commons.jar}"/>
@@ -2014,11 +2016,6 @@ run JMeter unless all the JMeter jars ar
<echo level="info" message="Checksum OK: ${file}"/>
</target>
- <!-- Optionally download BSF-API jar -->
- <target name="_process_javax_script" unless="javax.script.present">
- <process_jarfile jarname="apache-bsf-api" dest.dir="${lib.api}"/>
- </target>
-
<!--
Generic target to process all external jars.
The "process_jarfile" macro resolves the properties that begin with the
jarname
@@ -2027,9 +2024,7 @@ run JMeter unless all the JMeter jars ar
-->
<target name="_process_all_jars">
<process_jarfile jarname="apache-bsf"/>
- <!-- Only download if javax.script.ScriptEngine not in JVM classlib -->
- <available classpathref="classpath"
classname="javax.script.ScriptEngine" property="javax.script.present"/>
- <antcall target="_process_javax_script"/>
+ <process_jarfile jarname="apache-jsr223-api"/>
<process_jarfile jarname="avalon-framework"/>
<process_jarfile jarname="bcmail" dest.dir="${lib.api}"/>
<process_jarfile jarname="bcprov" dest.dir="${lib.api}"/>
Modified: jakarta/jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/eclipse.classpath?rev=958662&r1=958661&r2=958662&view=diff
==============================================================================
--- jakarta/jmeter/trunk/eclipse.classpath (original)
+++ jakarta/jmeter/trunk/eclipse.classpath Mon Jun 28 17:59:40 2010
@@ -41,9 +41,9 @@
<classpathentry kind="src" output="build/protocol/tcp"
path="src/protocol/tcp"/>
<classpathentry kind="src" output="build/reports" path="src/reports"/>
<classpathentry kind="src" output="build/test" path="test/src"/>
- <classpathentry kind="lib" path="lib/api/bsf-api-3.0-beta3.jar"/>
<classpathentry kind="lib" path="lib/avalon-framework-4.1.4.jar"/>
<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>
+ <classpathentry kind="lib" path="lib/bsf-api-3.1.jar"/>
<classpathentry kind="lib" path="lib/bsh-2.0b5.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
