summaryrefslogtreecommitdiff
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
commit92da846b4b1bbba5fe914ad89e161f5fb7c21a31 (patch)
tree8bbb29b07a61a28613a43dd87cc11f55afcee304
parentd7e8123bb12b9c2474ca2141db09dbeeb64149f7 (diff)
downloadqpid-python-92da846b4b1bbba5fe914ad89e161f5fb7c21a31.tar.gz
Add test customisation configuration to derby and acl configs
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@813799 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/systests/etc/config-systests-acl.xml1
-rw-r--r--java/systests/etc/config-systests-derby.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/java/systests/etc/config-systests-acl.xml b/java/systests/etc/config-systests-acl.xml
index 5f13c06442..34104dbe6b 100644
--- a/java/systests/etc/config-systests-acl.xml
+++ b/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/java/systests/etc/config-systests-derby.xml b/java/systests/etc/config-systests-derby.xml
index d435e85465..18ba0c4ad9 100644
--- a/java/systests/etc/config-systests-derby.xml
+++ b/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"/>