From fd92af60987f4271ee99a1babab3fabcc984805e Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Thu, 24 Jan 2013 15:40:35 +0000 Subject: QPID-4281: Fix setting of log4j configuration in system tests. While testing the fix, some tests were found to be failing on spawned profile due to config problems - also fixed these. Applied patch from Philip Harvey and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1438053 13f79535-47bb-0310-9956-ffa450edef68 --- java/test-profiles/testprofile.defaults | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'java/test-profiles') diff --git a/java/test-profiles/testprofile.defaults b/java/test-profiles/testprofile.defaults index 47992b9334..e205de2a18 100644 --- a/java/test-profiles/testprofile.defaults +++ b/java/test-profiles/testprofile.defaults @@ -33,7 +33,12 @@ amqj.logging.level=${log} amqj.server.logging.level=${log} amqj.protocol.logging.level=${log} root.logging.level=warn -log4j.configuration=test-profiles/log4j-test.xml + +# System property log4j.configuration is used by log4j. +# QpidBrokerTestCase uses log4j.configuration.file to construct a java.io.File, eg for log configuration of spawned brokers. +log4j.configuration.file=${test.profiles}/log4j-test.xml +log4j.configuration=file:///${log4j.configuration.file} + log4j.debug=false # Note test-provider.properties also has variables of same name. -- cgit v1.2.1