diff options
Diffstat (limited to 'qpid/java/qpid-test-utils')
| -rw-r--r-- | qpid/java/qpid-test-utils/pom.xml | 12 | ||||
| -rw-r--r-- | qpid/java/qpid-test-utils/src/main/resources/log4j-test.xml | 67 |
2 files changed, 73 insertions, 6 deletions
diff --git a/qpid/java/qpid-test-utils/pom.xml b/qpid/java/qpid-test-utils/pom.xml index 4e90eb334c..17422d5378 100644 --- a/qpid/java/qpid-test-utils/pom.xml +++ b/qpid/java/qpid-test-utils/pom.xml @@ -33,12 +33,12 @@ <scope>compile</scope> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j-version}</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> diff --git a/qpid/java/qpid-test-utils/src/main/resources/log4j-test.xml b/qpid/java/qpid-test-utils/src/main/resources/log4j-test.xml new file mode 100644 index 0000000000..58205752e1 --- /dev/null +++ b/qpid/java/qpid-test-utils/src/main/resources/log4j-test.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> + +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<!-- ===================================================================== --> +<!-- --> +<!-- Log4j configuration for unit tests --> +<!-- --> +<!-- ===================================================================== --> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + <appender name="console" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + <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"/> + </layout> + </appender> + + <logger name="org.apache.qpid"> + <level value="${amqj.logging.level}"/> + </logger> + + <logger name="qpid.message"> + <level value="INFO"/> + </logger> + + <logger name="qpid.protocol"> + <level value="${amqj.protocol.logging.level}"/> + </logger> + + <logger name="org.apache.qpid.test.utils.QpidTestCase"> + <level value="ALL"/> + </logger> + + <logger name="org.apache.commons"> + <level value="WARN"/> + </logger> + + <logger name="apache.commons.configuration.ConfigurationFactory"> + <level value="ERROR"/> + </logger> + + <root> + <level value="${root.logging.level}"/> + <appender-ref ref="console" /> + </root> +</log4j:configuration> |