From 4ce1aba5cd81005c0949dab81e7d6cbbd6faa3d3 Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Mon, 22 Jun 2009 14:36:40 +0000
Subject: Use DerbyMessageStore for config-systests.xml, ensure it's cleaned up

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@787248 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/etc/config-systests.xml                                 | 6 +++---
 java/default.testprofile                                            | 2 +-
 java/java.testprofile                                               | 2 +-
 .../src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java  | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'java')

diff --git a/java/broker/etc/config-systests.xml b/java/broker/etc/config-systests.xml
index 6aac952fe9..ade832eda1 100644
--- a/java/broker/etc/config-systests.xml
+++ b/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/java/default.testprofile b/java/default.testprofile
index 7fdc825a1e..4045e28c7f 100644
--- a/java/default.testprofile
+++ b/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/java/java.testprofile b/java/java.testprofile
index d1ec1a0e41..592623f066 100644
--- a/java/java.testprofile
+++ b/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/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
index 1e172be855..bfae6ad115 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
+++ b/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();
     }
 
-- 
cgit v1.2.1