diff options
| author | Alan Conway <aconway@apache.org> | 2011-03-28 23:18:16 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-03-28 23:18:16 +0000 |
| commit | 73b7ec00e546b27d2bed22d30ad48a8735cfe6f0 (patch) | |
| tree | 45900f0e0a964b814207fd0adfbacc36b0bbab26 /qpid/java/module.xml | |
| parent | ea98033c3df7fbc1364df69c4edb5cf1e808e87e (diff) | |
| download | qpid-python-73b7ec00e546b27d2bed22d30ad48a8735cfe6f0.tar.gz | |
Merge branch 'trunk' into qpid-2920
Conflicts:
qpid/cpp/src/cluster.mk
qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920@1086439 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/module.xml')
| -rw-r--r-- | qpid/java/module.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qpid/java/module.xml b/qpid/java/module.xml index 80f577b018..6ff807d377 100644 --- a/qpid/java/module.xml +++ b/qpid/java/module.xml @@ -323,6 +323,8 @@ </condition> <property name="jvm.args" value=""/> + <property name="broker.existing.qpid.work" value=""/> + <target name="test" depends="build,compile-tests" if="module.test.src.exists" unless="${dontruntest}" description="execute unit tests"> @@ -346,6 +348,7 @@ <sysproperty key="broker" value="${broker}"/> <sysproperty key="broker.clean" value="${broker.clean}"/> <sysproperty key="broker.clean.between.tests" value="${broker.clean.between.tests}"/> + <sysproperty key="broker.existing.qpid.work" value="${broker.existing.qpid.work}"/> <sysproperty key="broker.persistent" value="${broker.persistent}"/> <sysproperty key="broker.version" value="${broker.version}"/> <sysproperty key="broker.ready" value="${broker.ready}" /> |