diff options
| author | Aidan Skinner <aidan@apache.org> | 2009-06-22 14:36:40 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2009-06-22 14:36:40 +0000 |
| commit | 12c7b374d42189bd180367f78bd3924ece76d699 (patch) | |
| tree | 5ed4011560d9b85678901959a245f66cecac7606 | |
| parent | bf3ace9ec0a1c6749963e0c0cf24ddfdfd15a0b3 (diff) | |
| download | qpid-python-12c7b374d42189bd180367f78bd3924ece76d699.tar.gz | |
Use DerbyMessageStore for config-systests.xml, ensure it's cleaned up
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@787248 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/etc/config-systests.xml | 6 | ||||
| -rw-r--r-- | qpid/java/default.testprofile | 2 | ||||
| -rw-r--r-- | qpid/java/java.testprofile | 2 | ||||
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/qpid/java/broker/etc/config-systests.xml b/qpid/java/broker/etc/config-systests.xml index 6aac952fe9..ade832eda1 100644 --- a/qpid/java/broker/etc/config-systests.xml +++ b/qpid/java/broker/etc/config-systests.xml @@ -95,7 +95,7 @@ <name>localhost</name> <localhost> <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> + <class>org.apache.qpid.server.store.DerbyMessageStore</class> </store> <housekeeping> @@ -109,7 +109,7 @@ <name>development</name> <development> <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> + <class>org.apache.qpid.server.store.DerbyMessageStore</class> </store> </development> </virtualhost> @@ -118,7 +118,7 @@ <name>test</name> <test> <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> + <class>org.apache.qpid.server.store.DerbyMessageStore</class> </store> </test> </virtualhost> diff --git a/qpid/java/default.testprofile b/qpid/java/default.testprofile index 7fdc825a1e..4045e28c7f 100644 --- a/qpid/java/default.testprofile +++ b/qpid/java/default.testprofile @@ -3,7 +3,7 @@ java.naming.provider.url=${project.root}/test-provider.properties broker.version=0-8 broker=vm -broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB +broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB broker.ready=Listening on TCP port max_prefetch=1000 diff --git a/qpid/java/java.testprofile b/qpid/java/java.testprofile index d1ec1a0e41..592623f066 100644 --- a/qpid/java/java.testprofile +++ b/qpid/java/java.testprofile @@ -1,6 +1,6 @@ broker.language=java broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${project.root}/log4j-test.xml -broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB +broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB broker.ready=Qpid Broker Ready test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList-nonvm diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java index 1e172be855..bfae6ad115 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java @@ -22,6 +22,8 @@ package org.apache.qpid.test.utils; import javax.jms.Connection; +import org.apache.qpid.util.FileUtils; + public class FailoverBaseCase extends QpidTestCase { @@ -81,6 +83,7 @@ public class FailoverBaseCase extends QpidTestCase port = FAILING_PORT; } stopBroker(port); + FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort()); super.tearDown(); } |