From 6a359e9049e06c00e77ddbccb65b7f53cbc4b032 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@1438053 13f79535-47bb-0310-9956-ffa450edef68 --- .../test/java/org/apache/qpid/server/util/TestApplicationRegistry.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/java/broker/src/test') diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java index 600f0d591d..fd3791a8e1 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java @@ -38,6 +38,7 @@ import org.apache.qpid.server.security.auth.manager.AuthenticationManager; import org.apache.qpid.server.security.auth.manager.IAuthenticationManagerRegistry; import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager; import org.apache.qpid.server.security.group.GroupPrincipalAccessor; +import org.apache.qpid.test.utils.QpidTestCase; import java.util.Properties; @@ -54,7 +55,7 @@ public class TestApplicationRegistry extends ApplicationRegistry { CurrentActor.setDefault(new BrokerActor(new NullRootMessageLogger())); GenericActor.setDefaultMessageLogger(new NullRootMessageLogger()); - LoggingManagementFacade.configure("test-profiles/log4j-test.xml"); + LoggingManagementFacade.configure(QpidTestCase.LOG4J_CONFIG_FILE_PATH); super.initialise(); } -- cgit v1.2.1