diff options
| author | Alex Rudyy <orudyy@apache.org> | 2014-12-11 12:00:26 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2014-12-11 12:00:26 +0000 |
| commit | 372b2b83eee4501412199326de903d3be65fd6f8 (patch) | |
| tree | 8f7aae19d54153e8f8adb267506fa21e979189d3 /qpid/java | |
| parent | fd6bd8b5dee6807e7890f4eda578a73b4b1bb4dc (diff) | |
| download | qpid-python-372b2b83eee4501412199326de903d3be65fd6f8.tar.gz | |
QPID-6265: Unify log4j layout for system tests and spawn broker, rename test folder qbtc-ouput to qbtc-test-config
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1644611 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/pom.xml | 2 | ||||
| -rw-r--r-- | qpid/java/qpid-systests-parent/pom.xml | 2 | ||||
| -rw-r--r-- | qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index 43e50980d1..0c9b1cb98e 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -54,7 +54,7 @@ <!-- test profile properties and defaults--> <qpid.home>${basedir}</qpid.home> <!-- override for broker tests --> - <qpid.home.qbtc.output>${qpid.home}${file.separator}target${file.separator}qbtc-output</qpid.home.qbtc.output> <!-- override for broker tests --> + <qpid.home.qbtc.output>${qpid.home}${file.separator}target${file.separator}qbtc-test-config</qpid.home.qbtc.output> <!-- override for broker tests --> <qpid.work>${project.build.directory}${file.separator}QPID_WORK</qpid.work> <profile>java-mms.0-10</profile> diff --git a/qpid/java/qpid-systests-parent/pom.xml b/qpid/java/qpid-systests-parent/pom.xml index ce25221ffc..fc76cce231 100644 --- a/qpid/java/qpid-systests-parent/pom.xml +++ b/qpid/java/qpid-systests-parent/pom.xml @@ -34,7 +34,7 @@ <broker.home.dir>target${file.separator}qpid-broker${file.separator}${project.version}</broker.home.dir> <!-- test properties --> <qpid.home>${basedir}${file.separator}${broker.home.dir}</qpid.home> - <qpid.home.qbtc.output>${qpid.home}${file.separator}qbtc-output</qpid.home.qbtc.output> + <qpid.home.qbtc.output>${qpid.home}${file.separator}qbtc-test-config</qpid.home.qbtc.output> <test.output.dir>${basedir}${file.separator}target${file.separator}surefire-reports</test.output.dir> <test.working.directory>${basedir}/..</test.working.directory> diff --git a/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml b/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml index 6bb91f88b1..eb75e740b9 100644 --- a/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml +++ b/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml @@ -32,7 +32,7 @@ <param name="ImmediateFlush" value="true"/> <param name="Follow" value="true"/> <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/> + <param name="ConversionPattern" value="%d %-5p [%t] (%c{2}) - %m%n"/> </layout> </appender> |