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 19B6A7179 for ; Mon, 12 Sep 2011 20:52:44 +0000 (UTC) Received: (qmail 41416 invoked by uid 500); 12 Sep 2011 20:52:44 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 41385 invoked by uid 500); 12 Sep 2011 20:52:44 -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 41378 invoked by uid 99); 12 Sep 2011 20:52:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2011 20:52:44 +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; Mon, 12 Sep 2011 20:52:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7B56D2388A02; Mon, 12 Sep 2011 20:52:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1169918 - in /sling/trunk: bundles/commons/log/ bundles/commons/log/src/main/java/org/apache/sling/commons/log/internal/ launchpad/builder/src/main/bundles/ launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serv... Date: Mon, 12 Sep 2011 20:52:19 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110912205219.7B56D2388A02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: justin Date: Mon Sep 12 20:52:18 2011 New Revision: 1169918 URL: http://svn.apache.org/viewvc?rev=1169918&view=rev Log: SLING-2193 - adding JUL support (optionally if framework property org.apache.sling.commons.log.julenabled is "true") Modified: sling/trunk/bundles/commons/log/pom.xml sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/internal/Activator.java sling/trunk/launchpad/builder/src/main/bundles/list.xml sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java sling/trunk/launchpad/testing/src/test/config/sling.properties Modified: sling/trunk/bundles/commons/log/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/pom.xml?rev=1169918&r1=1169917&r2=1169918&view=diff ============================================================================== --- sling/trunk/bundles/commons/log/pom.xml (original) +++ sling/trunk/bundles/commons/log/pom.xml Mon Sep 12 20:52:18 2011 @@ -86,6 +86,9 @@ org.osgi.service.cm;version=1.2 + + jul-to-slf4j;inline="org/slf4j/bridge/SLF4JBridgeHandler.class" + @@ -128,6 +131,13 @@ compile true + + org.slf4j + jul-to-slf4j + ${slf4j.version} + compile + true + Modified: sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/internal/Activator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/internal/Activator.java?rev=1169918&r1=1169917&r2=1169918&view=diff ============================================================================== --- sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/internal/Activator.java (original) +++ sling/trunk/bundles/commons/log/src/main/java/org/apache/sling/commons/log/internal/Activator.java Mon Sep 12 20:52:18 2011 @@ -24,6 +24,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.service.log.LogReaderService; import org.osgi.service.log.LogService; +import org.slf4j.bridge.SLF4JBridgeHandler; /** * The Activator class is the BundleActivator for @@ -35,6 +36,8 @@ public class Activator implements Bundle private static final String VENDOR = "The Apache Software Foundation"; + private static final String JUL_SUPPORT = "org.apache.sling.commons.log.julenabled"; + private LogManager logManager; private LogSupport logSupport; @@ -65,12 +68,18 @@ public class Activator implements Bundle "Apache Sling LogReaderService implementation"); props.put(Constants.SERVICE_VENDOR, VENDOR); context.registerService(LogReaderService.class.getName(), lrsf, props); + + if (Boolean.parseBoolean(context.getProperty(JUL_SUPPORT))) { + SLF4JBridgeHandler.install(); + } } /** * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) */ public void stop(final BundleContext context) throws Exception { + SLF4JBridgeHandler.uninstall(); + if (logSupport != null) { context.removeBundleListener(logSupport); context.removeFrameworkListener(logSupport); Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1169918&r1=1169917&r2=1169918&view=diff ============================================================================== --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Sep 12 20:52:18 2011 @@ -240,7 +240,7 @@ org.apache.sling org.apache.sling.commons.log - 2.1.2 + 2.1.3-SNAPSHOT org.apache.sling Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java?rev=1169918&r1=1169917&r2=1169918&view=diff ============================================================================== --- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java (original) +++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java Mon Sep 12 20:52:18 2011 @@ -19,6 +19,8 @@ package org.apache.sling.launchpad.tests import java.io.IOException; import java.util.Date; import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.servlet.ServletException; @@ -36,6 +38,7 @@ class TestServlet extends SlingAllMethod @Override protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException { + Logger.getLogger(TestServlet.class.getName()).log(Level.SEVERE, "test JUL message"); dumpRequestAsProperties(request, response); } Modified: sling/trunk/launchpad/testing/src/test/config/sling.properties URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/config/sling.properties?rev=1169918&r1=1169917&r2=1169918&view=diff ============================================================================== --- sling/trunk/launchpad/testing/src/test/config/sling.properties (original) +++ sling/trunk/launchpad/testing/src/test/config/sling.properties Mon Sep 12 20:52:18 2011 @@ -14,4 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -sling.system.packages.class.com.vladium.emma.rt.RT=com.vladium.emma.rt \ No newline at end of file +sling.system.packages.class.com.vladium.emma.rt.RT=com.vladium.emma.rt +org.apache.sling.commons.log.julenabled=true \ No newline at end of file