From a20fd18aa78bc4a385a0fb3ded48ed6f2e0143e2 Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Tue, 29 Jul 2008 16:17:06 +0000 Subject: QPID-1203: use slf4j instead of log4j directly git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@680751 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/build.deps | 2 +- .../org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qpid/java/build.deps b/qpid/java/build.deps index eb61cf6c15..cbc881f0a5 100644 --- a/qpid/java/build.deps +++ b/qpid/java/build.deps @@ -35,7 +35,7 @@ broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \ broker-plugins.libs=${common.libs} ${felix.libs} -junit-toolkit.libs=${log4j} ${junit} +junit-toolkit.libs=${log4j} ${junit} ${slf4j-api} test.libs=${slf4j-log4j} ${junit-toolkit.libs} systests.libs=${client.libs} ${test.libs} ${broker.libs} perftests.libs=${systests.libs} diff --git a/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java index 605c35feed..3cf8543656 100644 --- a/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java +++ b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java @@ -20,7 +20,8 @@ */ package org.apache.qpid.junit.concurrency; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -68,7 +69,7 @@ import java.util.concurrent.ThreadFactory; public class ThreadTestCoordinator { /** Used for logging. */ - private static final Logger log = Logger.getLogger(ThreadTestCoordinator.class); + private static final Logger log = LoggerFactory.getLogger(ThreadTestCoordinator.class); /** Keeps track of the test threads by their ids. */ private TestRunnable[] testThreads; // = new TestRunnable[2]; -- cgit v1.2.1