woolfel 2005/07/16 11:44:12
Modified: . build.xml
Log:
updated for junit sampler and the dynamic classloader
peter
Revision Changes Path
1.207 +27 -5 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- build.xml 9 Jul 2005 00:03:19 -0000 1.206
+++ build.xml 16 Jul 2005 18:44:11 -0000 1.207
@@ -124,6 +124,7 @@
<sourcePath path="${src.http}" />
<sourcePath path="${src.ftp}" />
<sourcePath path="${src.java}" />
+ <sourcePath path="${src.junit}" />
<sourcePath path="${src.jdbc}" />
<sourcePath path="${src.ldap}" />
<sourcePath path="${src.mail}" />
@@ -173,6 +174,7 @@
<property name="src.test" value="test/src"/>
<property name="src.jdbc" value="src/protocol/jdbc"/>
<property name="src.java" value="src/protocol/java"/>
+ <property name="src.junit" value="src/junit"/>
<property name="src.components" value="src/components"/>
<property name="src.functions" value="src/functions"/>
<property name="src.jorphan" value="src/jorphan"/>
@@ -199,6 +201,7 @@
<pathelement location="${src.ftp}"/>
<pathelement location="${src.jdbc}"/>
<pathelement location="${src.java}"/>
+ <pathelement location="${src.junit}"/>
<pathelement location="${src.jorphan}"/>
<pathelement location="${src.ldap}"/>
<pathelement location="${src.htmlparser}"/>
@@ -217,6 +220,7 @@
<property name="build.ftp" value="build/protocol/ftp"/>
<property name="build.jdbc" value="build/protocol/jdbc"/>
<property name="build.java" value="build/protocol/java"/>
+ <property name="build.junit" value="build/junit"/>
<property name="build.components" value="build/components"/>
<property name="build.functions" value="build/functions"/>
<property name="build.jorphan" value="build/jorphan"/>
@@ -298,7 +302,7 @@
<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.1-2.jar"/>
+ <property name="xstream.jar" value="${lib.dir}/xstream-1.1.2.jar"/>
<property name="xpp3.jar" value="${lib.dir}/xpp3_min-1.1.3.4.I.jar"/>
<!-- The following 3 jars are probably optional for JDK1.4 -->
@@ -623,6 +627,18 @@
</javac>
</target>
+ <target name="compile-junit" depends="compile-jorphan,compile-core"
description="Compile components specific to JUnit sampling.">
+ <mkdir dir="${build.junit}"/>
+ <javac srcdir="${src.junit}" destdir="${build.junit}"
source="${src.java.version}" optimize="${optimize}" debug="on"
target="${target.java.version}" deprecation="${deprecation}"
encoding="${encoding}">
+ <include name="**/*.java"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${build.jorphan}"/>
+ <pathelement location="${build.core}"/>
+ </classpath>
+ </javac>
+ </target>
+
<target name="compile-tcp" depends="compile-jorphan,compile-core"
description="Compile components specific to TCP sampling.">
<mkdir dir="${build.tcp}"/>
<javac srcdir="${src.tcp}" destdir="${build.tcp}"
source="${src.java.version}" optimize="${optimize}" debug="on"
target="${target.java.version}" deprecation="${deprecation}"
encoding="${encoding}">
@@ -731,7 +747,7 @@
</javac>
</target>
- <target name="compile"
depends="compile-core,compile-components,compile-functions,compile-protocols,compile-rmi,compile-htmlparser,compile-monitor"
+ <target name="compile"
depends="compile-core,compile-components,compile-functions,compile-protocols,compile-rmi,compile-htmlparser,compile-monitor,compile-junit"
description="Compile everything."/>
<target name="package" depends="compile, package-only"
@@ -760,7 +776,7 @@
- otherwise, change utils to ignore it -->
<!-- JMeter launch jar -->
- <jar jarfile="${dest.jar.jmeter}/ApacheJMeter.jar"
includes="**/NewDriver*"
+ <jar jarfile="${dest.jar.jmeter}/ApacheJMeter.jar"
includes="**/NewDriver*,**/DynamicClassLoader*"
manifest="${src.core}/MANIFEST"
basedir="${build.core}"/>
@@ -813,6 +829,12 @@
<fileset dir="${src.java}" includes="**/*.properties" />
</jar>
+ <!-- junit -->
+ <jar jarfile="${dest.jar}/ApacheJMeter_junit.jar">
+ <fileset dir="${build.junit}" includes="**/*.class" />
+ <fileset dir="${src.junit}" includes="**/*.properties" />
+ </jar>
+
<!-- ldap -->
<jar jarfile="${dest.jar}/ApacheJMeter_ldap.jar">
<fileset dir="${build.ldap}" includes="**/*.class" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
