Re-add current ant-jmeter jar

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@654659 13f79535-47bb-0310-9956-ffa450edef68

docs/changes.html

@@ -243,11 +243,6 @@ As a consequence, if a variable name is used, it must not be a valid integer.
 						</li>
 									
 
-												<li	>
-								The ant-jmeter.jar is no longer shipped with JMeter. See extras/build.xml for how to aquire it.
-						</li>
-									
-
 												<li	>
 								The supplied TCPClient implementation no longer treats tcp.eolByte=0 as special.
 To skip EOL checking, set tcp.eolByte=1000 (or some other value which is not a valid byte)
@@ -2516,7 +2511,6 @@ This can be disabled by setting the JMeter property
 							  									 				<ul	>
 								
 
-
 												<li	>
 								Post-processors run in reverse order (see bug 41140)
 						</li>

extras/build.xml

@@ -21,9 +21,6 @@
 		Sample build file for use with ant-jmeter.jar
 		See http://www.programmerplanet.org/pages/projects/jmeter-ant-task.php
 		
-		Download the ant-jmeter.jar file and save it in the same directory as this build file
-		- or in the Ant lib directory
-		
 	To run a test and create the output report:
 		ant -Dtest=script
 	
@@ -75,14 +72,11 @@
 	  </not>
 	</condition>
 
-	<!-- 
-		See http://www.programmerplanet.org/pages/projects/jmeter-ant-task.php	
-		Download the ant-jmeter.jar file and save it in the same directory as this build file
-		- or in the Ant lib directory
-	-->
-	<!-- Allow jar to be picked up locally as well -->
+	<!-- Allow jar to be picked up locally -->
     <path id="jmeter.classpath">
-       <pathelement location="${basedir}/ant-jmeter.jar"/>
+        <fileset dir="${basedir}">
+          <include name="ant-jmeter*.jar"/>
+        </fileset>
     </path>
 
 	<taskdef
@@ -90,14 +84,9 @@
 	    classpathref="jmeter.classpath"
 	    classname="org.programmerplanet.ant.taskdefs.jmeter.JMeterTask"/>
 	
-	
-    <target name="init">
-    </target>
-
-
 	<target name="all" depends="run,report"/>
 
-	<target name="run" depends="init">
+	<target name="run">
 		<echo>funcMode = ${funcMode}</echo>
 		<delete file="${testpath}/${test}.html"/>
 		<jmeter
@@ -108,6 +97,7 @@
 			<jvmarg value="-Xincgc"/>
 			<jvmarg value="-Xmx128m"/>
 			<jvmarg value="-Dproperty=value"/>
+			<jmeterarg value="-qextra.properties"/>
 		-->
 			<!-- Force suitable defaults -->
 			<property name="jmeter.save.saveservice.output_format" value="xml"/>

xdocs/changes.xml

@@ -94,7 +94,6 @@ To revert to earlier behaviour, comment or change the properties classfinder.fun
 </li>
 <li>The reference value parameter for intSum() is now optional. 
 As a consequence, if a variable name is used, it must not be a valid integer.</li>
-<li>The ant-jmeter.jar is no longer shipped with JMeter. See extras/build.xml for how to aquire it.</li>
 <li>The supplied TCPClient implementation no longer treats tcp.eolByte=0 as special.
 To skip EOL checking, set tcp.eolByte=1000 (or some other value which is not a valid byte)
 </li>