summaryrefslogtreecommitdiff
path: root/qpid/java/test-profiles/java-bdb.0-10.testprofile
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2012-07-05 09:40:06 +0000
committerKeith Wall <kwall@apache.org>2012-07-05 09:40:06 +0000
commit8b555d057f483874d9384c15bd989c975d18e0b0 (patch)
treeb5fdf00f4a10c465da038df03d6cdeb357501881 /qpid/java/test-profiles/java-bdb.0-10.testprofile
parent179f46270e539569e7c57e763ccd8a49ccf09a84 (diff)
downloadqpid-python-8b555d057f483874d9384c15bd989c975d18e0b0.tar.gz
QPID-4109: Re-enable LoggingManagement MBean
* Re-wire up LoggingManagementMBean. * Centralise log4j specific functionality into LoggingFacade class (moving implementation from LoggingManagementMBean and QpidLog4JConfigurator together). * Implement unit-tests for MBean and Facade levels. Reenforce units tests with system tests testing logging management end to end. * Changed QpidBrokerTestCase so that log4j.configuration is _always_ used to obtain the log4j config file regardless of whether test type is spawned or internal (previously log4j.configuration was respected only for internal tests). This was require to be able to write a logging management system test that could safely change the contents of the log4j config without running the risk of effecting other tests. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1357528 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/test-profiles/java-bdb.0-10.testprofile')
-rw-r--r--qpid/java/test-profiles/java-bdb.0-10.testprofile2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/test-profiles/java-bdb.0-10.testprofile b/qpid/java/test-profiles/java-bdb.0-10.testprofile
index ac90050a3a..892188aa24 100644
--- a/qpid/java/test-profiles/java-bdb.0-10.testprofile
+++ b/qpid/java/test-profiles/java-bdb.0-10.testprofile
@@ -20,7 +20,7 @@
broker.language=java
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l @LOG_CONFIG_FILE
broker.ready=BRK-1004
broker.stopped=Exception
broker.protocol.excludes=--exclude-1-0 @PORT --exclude-1-0 @SSL_PORT