Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-01-22 14:20:16 +0000
committerJoakim Erdfelt2015-01-22 14:20:28 +0000
commit41029ca6f880ccb05d7464090f29710e339c449e (patch)
tree2e75594b8eda97903ac61f09343eab12d352b761 /tests
parent94f0f295400f1cdb85d91b3ca0c1697a65df9c69 (diff)
downloadorg.eclipse.jetty.project-41029ca6f880ccb05d7464090f29710e339c449e.tar.gz
org.eclipse.jetty.project-41029ca6f880ccb05d7464090f29710e339c449e.tar.xz
org.eclipse.jetty.project-41029ca6f880ccb05d7464090f29710e339c449e.zip
Breaking ant <property> caching for jmx tests
Diffstat (limited to 'tests')
-rw-r--r--tests/test-jmx/jmx-webapp-it/pom.xml20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml
index a27d6d32d5..7429e49c7d 100644
--- a/tests/test-jmx/jmx-webapp-it/pom.xml
+++ b/tests/test-jmx/jmx-webapp-it/pom.xml
@@ -123,8 +123,8 @@
</goals>
<configuration>
<target>
- <property name="jetty.home" location="${test-home-dir}/jetty-distribution-${project.version}"/>
- <property name="jetty.base" location="${test-base-dir}"/>
+ <property name="jetty.jmx.home" location="${test-home-dir}/jetty-distribution-${project.version}"/>
+ <property name="jetty.jmx.base" location="${test-base-dir}"/>
<echo>Integration Test : Setup Jetty</echo>
<exec executable="${run.command}"
dir="${scripts-dir}"
@@ -132,8 +132,8 @@
<arg value="${run.command.xtra}"/>
<arg value="${setup.script}"/>
<arg file="${java.home}"/>
- <arg file="${jetty.home}"/>
- <arg file="${jetty.base}"/>
+ <arg file="${jetty.jmx.home}"/>
+ <arg file="${jetty.jmx.base}"/>
</exec>
<echo>Integration Test : Starting Jetty ...</echo>
@@ -143,8 +143,8 @@
<arg value="${run.command.xtra}"/>
<arg value="${start.script}"/>
<arg file="${java.home}"/>
- <arg file="${jetty.home}"/>
- <arg file="${jetty.base}"/>
+ <arg file="${jetty.jmx.home}"/>
+ <arg file="${jetty.jmx.base}"/>
</exec>
<waitfor maxwait="5" maxwaitunit="second"
checkevery="500" checkeveryunit="millisecond">
@@ -162,8 +162,8 @@
</goals>
<configuration>
<target>
- <property name="jetty.home" location="${test-home-dir}/jetty-distribution-${project.version}"/>
- <property name="jetty.base" location="${test-base-dir}"/>
+ <property name="jetty.jmx.home" location="${test-home-dir}/jetty-distribution-${project.version}"/>
+ <property name="jetty.jmx.base" location="${test-base-dir}"/>
<echo>Integration Test : Stop Jetty</echo>
<exec executable="${run.command}"
dir="${scripts-dir}"
@@ -171,8 +171,8 @@
<arg value="${run.command.xtra}"/>
<arg value="${stop.script}"/>
<arg file="${java.home}"/>
- <arg file="${jetty.home}"/>
- <arg file="${jetty.base}"/>
+ <arg file="${jetty.jmx.home}"/>
+ <arg file="${jetty.jmx.base}"/>
</exec>
</target>
</configuration>

Back to the top