summaryrefslogtreecommitdiff
path: root/qpid
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-09-11 12:26:01 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-09-11 12:26:01 +0000
commit6da9564f8e24c138c98f892b7b82d37e52bfc23c (patch)
treee1c21d9db824c9e90172f38df68debfbf8edd95d /qpid
parent8ed610465ce4ff173b463adf456c5ab7f7a4ad65 (diff)
downloadqpid-python-6da9564f8e24c138c98f892b7b82d37e52bfc23c.tar.gz
Add test customisation configuration to derby and acl configs
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@813799 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
-rw-r--r--qpid/java/systests/etc/config-systests-acl.xml1
-rw-r--r--qpid/java/systests/etc/config-systests-derby.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/qpid/java/systests/etc/config-systests-acl.xml b/qpid/java/systests/etc/config-systests-acl.xml
index 5f13c06442..34104dbe6b 100644
--- a/qpid/java/systests/etc/config-systests-acl.xml
+++ b/qpid/java/systests/etc/config-systests-acl.xml
@@ -22,6 +22,7 @@
<configuration>
<system/>
<override>
+ <xml fileName="${test.config}" config-optional="true"/>
<xml fileName="${QPID_HOME}/etc/config-systests-acl-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config.xml"/>
diff --git a/qpid/java/systests/etc/config-systests-derby.xml b/qpid/java/systests/etc/config-systests-derby.xml
index d435e85465..18ba0c4ad9 100644
--- a/qpid/java/systests/etc/config-systests-derby.xml
+++ b/qpid/java/systests/etc/config-systests-derby.xml
@@ -22,6 +22,7 @@
<configuration>
<system/>
<override>
+ <xml fileName="${test.config}" config-optional="true"/>
<xml fileName="${QPID_HOME}/etc/config-systests-derby-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config.xml"/>