From 6da9564f8e24c138c98f892b7b82d37e52bfc23c Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 11 Sep 2009 12:26:01 +0000
Subject: 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
---
 qpid/java/systests/etc/config-systests-acl.xml   | 1 +
 qpid/java/systests/etc/config-systests-derby.xml | 1 +
 2 files changed, 2 insertions(+)

(limited to 'qpid/java')

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"/>
-- 
cgit v1.2.1