From 1a477d5ba3b4e594b96f178855f237e5c579327e Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Tue, 30 Mar 2010 13:45:18 +0000 Subject: QPID-2630, QPID-2631: Restore the virtualhosts.xml file. When a virtualhosts.xml file is specified load it as its own Configuration object to ensure the property heirarchy is not lost. Enforce that virtualhost config can only be specified in either the main config.xml file or the virtualhosts.xml file, but not both. Allow the virtualhosts.xml file to be a combined configuration and use to provide override abilities for testing. Applied patch from Andrew Kennedy git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@929136 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/test-profiles/log4j-test.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'qpid/java/test-profiles/log4j-test.xml') diff --git a/qpid/java/test-profiles/log4j-test.xml b/qpid/java/test-profiles/log4j-test.xml index 2d77942a81..39d30d104a 100644 --- a/qpid/java/test-profiles/log4j-test.xml +++ b/qpid/java/test-profiles/log4j-test.xml @@ -51,6 +51,10 @@ + + + + -- cgit v1.2.1