Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 77195 invoked from network); 4 Feb 2010 16:20:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Feb 2010 16:20:06 -0000 Received: (qmail 6233 invoked by uid 500); 4 Feb 2010 16:20:06 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 6170 invoked by uid 500); 4 Feb 2010 16:20:06 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 6161 invoked by uid 99); 4 Feb 2010 16:20:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Feb 2010 16:20:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Feb 2010 16:20:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DCFAA23889CB; Thu, 4 Feb 2010 16:19:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r906549 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Date: Thu, 04 Feb 2010 16:19:42 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100204161942.DCFAA23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Feb 4 16:19:42 2010 New Revision: 906549 URL: http://svn.apache.org/viewvc?rev=906549&view=rev Log: Merged revisions 906544 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r906544 | dkulp | 2010-02-04 11:15:31 -0500 (Thu, 04 Feb 2010) | 1 line [CXF-2651] Fix detection of slf4j ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Propchange: cxf/branches/2.2.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java?rev=906549&r1=906548&r2=906549&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java (original) +++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java Thu Feb 4 16:19:42 2010 @@ -77,7 +77,7 @@ } } if (StringUtils.isEmpty(cname)) { - Class.forName("org/slf4j/impl/StaticLoggerBinder"); + Class.forName("org.slf4j.impl.StaticLoggerBinder"); Class cls = Class.forName("org.slf4j.LoggerFactory"); Class fcls = cls.getMethod("getILoggerFactory").invoke(null).getClass(); if (fcls.getName().contains("Log4j")) {