Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D22BF4DAB for ; Thu, 23 Jun 2011 12:07:46 +0000 (UTC) Received: (qmail 17097 invoked by uid 500); 23 Jun 2011 12:07:46 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 17027 invoked by uid 500); 23 Jun 2011 12:07:46 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 17020 invoked by uid 99); 23 Jun 2011 12:07:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jun 2011 12:07:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 23 Jun 2011 12:07:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 785C82388A19; Thu, 23 Jun 2011 12:07:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1138846 - in /sling/trunk/bundles/extensions/adapter: pom.xml src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java Date: Thu, 23 Jun 2011 12:07:24 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110623120724.785C82388A19@eris.apache.org> Author: bdelacretaz Date: Thu Jun 23 12:07:24 2011 New Revision: 1138846 URL: http://svn.apache.org/viewvc?rev=1138846&view=rev Log: SLING-2106 - Use slf4j logging in AdapterManagerImpl Modified: sling/trunk/bundles/extensions/adapter/pom.xml sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java Modified: sling/trunk/bundles/extensions/adapter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/pom.xml?rev=1138846&r1=1138845&r2=1138846&view=diff ============================================================================== --- sling/trunk/bundles/extensions/adapter/pom.xml (original) +++ sling/trunk/bundles/extensions/adapter/pom.xml Thu Jun 23 12:07:24 2011 @@ -115,6 +115,11 @@ slf4j-api + org.slf4j + slf4j-simple + test + + junit junit Modified: sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java?rev=1138846&r1=1138845&r2=1138846&view=diff ============================================================================== --- sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java (original) +++ sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java Thu Jun 23 12:07:24 2011 @@ -38,7 +38,8 @@ import org.osgi.framework.ServiceReferen import org.osgi.service.component.ComponentContext; import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; -import org.osgi.service.log.LogService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The AdapterManagerImpl class implements the @@ -55,12 +56,8 @@ import org.osgi.service.log.LogService; */ public class AdapterManagerImpl implements AdapterManager { - /** @scr.reference cardinality="0..1" policy="dynamic" */ - private LogService log; - - /** Whether to debug this class or not */ - private boolean debug = false; - + private Logger log = LoggerFactory.getLogger(getClass()); + /** * The OSGi ComponentContext to retrieve * {@link AdapterFactory} service instances. @@ -118,19 +115,14 @@ public class AdapterManagerImpl implemen // have the factory adapt the adaptable if the factory exists if (factory != null) { - if (debug) { - log(LogService.LOG_DEBUG, "Using adapter factory " + factory - + " to map " + adaptable + " to " + type, null); - } + log.debug("Using adapter factory {} to map {} to {}", + new Object [] { factory, adaptable, type }); return factory.getAdapter(adaptable, type); } // no factory has been found, so we cannot adapt - if (debug) { - log(LogService.LOG_DEBUG, "No adapter factory found to map " - + adaptable + " to " + type, null); - } + log.debug("No adapter factory found to map {} to {}", adaptable, type); return null; } @@ -203,20 +195,6 @@ public class AdapterManagerImpl implemen return factoryCache; } - // ---------- internal ----------------------------------------------------- - - private void log(int level, String message, Throwable t) { - LogService logger = this.log; - if (logger != null) { - logger.log(level, message, t); - } else { - System.out.println(message); - if (t != null) { - t.printStackTrace(System.out); - } - } - } - /** * Unregisters the {@link AdapterFactory} referred to by the service * reference from the registry. @@ -439,4 +417,4 @@ public class AdapterManagerImpl implemen } } } -} +} \ No newline at end of file