sebb 2003/10/15 03:05:30
Modified: . build.xml
Log:
BSH* has been renamed BeanShell* to avoid confusion with BSF (Bean Scripting
Framework). Added checkf for BSF (for eventual future use).
Revision Changes Path
1.118 +10 -2 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- build.xml 12 Oct 2003 01:42:00 -0000 1.117
+++ build.xml 15 Oct 2003 10:05:30 -0000 1.118
@@ -218,6 +218,9 @@
<available classname="bsh.Interpreter" property="beanshell.present">
<classpath refid="classpath"/>
</available>
+ <available classname="org.apache.bsf.BSFManager" property="bsf.present">
+ <classpath refid="classpath"/>
+ </available>
</target>
<!--
@@ -239,8 +242,12 @@
<echo message="Classes for BeanShell support not found in classpath"/>
</target>
+ <target name="bsf-message" depends="check-libs" unless="bsf.present">
+ <echo message="Classes for BSF support not found in classpath"/>
+ </target>
+
<target name="report-missing-libs"
- depends="ssl-message,iaik-message,mail-message,beanshell-message"
+ depends="ssl-message,iaik-message,mail-message,beanshell-message,bsf-message"
/>
<!--
@@ -358,7 +365,8 @@
<mkdir dir="${build.java}"/>
<javac srcdir="${src.java}" destdir="${build.java}" optimize="${optimize}"
debug="on" target="${target.java.version}" deprecation="${deprecation}"
encoding="${encoding}">
<include name="**/*.java"/>
- <exclude name="org/apache/jmeter/protocol/java/**/BSH*.java"
unless="beanshell.present"/>
+ <exclude name="org/apache/jmeter/protocol/java/**/BeanShell*.java"
unless="beanshell.present"/>
+ <exclude name="org/apache/jmeter/protocol/java/**/BSF*.java"
unless="bsf.present"/>
<classpath>
<path refid="classpath"/>
<pathelement location="${build.jorphan}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
