summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2009-05-25 13:19:49 +0000
committerAidan Skinner <aidan@apache.org>2009-05-25 13:19:49 +0000
commitbd99ec1bf64537628a63dd52b7f0793e42ee23a6 (patch)
tree372898f739cddb0527af58066e52eaa83239a49c
parentb1026352ae2413fd637798df1f49a96b5c4a14ab (diff)
downloadqpid-python-bd99ec1bf64537628a63dd52b7f0793e42ee23a6.tar.gz
Nuke derby.log and derbyDB in broker cleanup. Also, why does Derby not honor QPID_HOME? Lame.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@778415 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/default.testprofile2
-rw-r--r--qpid/java/java.testprofile2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/default.testprofile b/qpid/java/default.testprofile
index 78daaaf0d5..647b1cb177 100644
--- a/qpid/java/default.testprofile
+++ b/qpid/java/default.testprofile
@@ -1,6 +1,6 @@
broker.version=0-8
broker=vm
-broker.clean=${project.root}/clean-dir ${build.data}
+broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB ${project.root}/derby.log
broker.ready=Listening on TCP port
java.naming.provider.url=${project.root}/test-provider.properties
diff --git a/qpid/java/java.testprofile b/qpid/java/java.testprofile
index 9581064ae3..16d831d02d 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}
+broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB ${project.root}/derby.log
broker.ready=Qpid Broker Ready
test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList-nonvm