Breaking ant <property> caching for jmx tests

This commit is contained in:
Joakim Erdfelt 2015-01-22 07:20:16 -07:00
parent 94f0f29540
commit 41029ca6f8
1 changed files with 10 additions and 10 deletions

View File

@ -123,8 +123,8 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<property name="jetty.home" location="${test-home-dir}/jetty-distribution-${project.version}"/> <property name="jetty.jmx.home" location="${test-home-dir}/jetty-distribution-${project.version}"/>
<property name="jetty.base" location="${test-base-dir}"/> <property name="jetty.jmx.base" location="${test-base-dir}"/>
<echo>Integration Test : Setup Jetty</echo> <echo>Integration Test : Setup Jetty</echo>
<exec executable="${run.command}" <exec executable="${run.command}"
dir="${scripts-dir}" dir="${scripts-dir}"
@ -132,8 +132,8 @@
<arg value="${run.command.xtra}"/> <arg value="${run.command.xtra}"/>
<arg value="${setup.script}"/> <arg value="${setup.script}"/>
<arg file="${java.home}"/> <arg file="${java.home}"/>
<arg file="${jetty.home}"/> <arg file="${jetty.jmx.home}"/>
<arg file="${jetty.base}"/> <arg file="${jetty.jmx.base}"/>
</exec> </exec>
<echo>Integration Test : Starting Jetty ...</echo> <echo>Integration Test : Starting Jetty ...</echo>
@ -143,8 +143,8 @@
<arg value="${run.command.xtra}"/> <arg value="${run.command.xtra}"/>
<arg value="${start.script}"/> <arg value="${start.script}"/>
<arg file="${java.home}"/> <arg file="${java.home}"/>
<arg file="${jetty.home}"/> <arg file="${jetty.jmx.home}"/>
<arg file="${jetty.base}"/> <arg file="${jetty.jmx.base}"/>
</exec> </exec>
<waitfor maxwait="5" maxwaitunit="second" <waitfor maxwait="5" maxwaitunit="second"
checkevery="500" checkeveryunit="millisecond"> checkevery="500" checkeveryunit="millisecond">
@ -162,8 +162,8 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<property name="jetty.home" location="${test-home-dir}/jetty-distribution-${project.version}"/> <property name="jetty.jmx.home" location="${test-home-dir}/jetty-distribution-${project.version}"/>
<property name="jetty.base" location="${test-base-dir}"/> <property name="jetty.jmx.base" location="${test-base-dir}"/>
<echo>Integration Test : Stop Jetty</echo> <echo>Integration Test : Stop Jetty</echo>
<exec executable="${run.command}" <exec executable="${run.command}"
dir="${scripts-dir}" dir="${scripts-dir}"
@ -171,8 +171,8 @@
<arg value="${run.command.xtra}"/> <arg value="${run.command.xtra}"/>
<arg value="${stop.script}"/> <arg value="${stop.script}"/>
<arg file="${java.home}"/> <arg file="${java.home}"/>
<arg file="${jetty.home}"/> <arg file="${jetty.jmx.home}"/>
<arg file="${jetty.base}"/> <arg file="${jetty.jmx.base}"/>
</exec> </exec>
</target> </target>
</configuration> </configuration>