Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 73176 invoked from network); 2 Dec 2010 16:51:20 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Dec 2010 16:51:20 -0000 Received: (qmail 10638 invoked by uid 500); 2 Dec 2010 16:51:19 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 10494 invoked by uid 500); 2 Dec 2010 16:51:18 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 10484 invoked by uid 99); 2 Dec 2010 16:51:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Dec 2010 16:51:17 +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, 02 Dec 2010 16:51:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9AFD223888EA; Thu, 2 Dec 2010 16:49:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041446 - in /geronimo/server/trunk: ./ framework/modules/geronimo-pax-logging/ framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/ framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/ framework/modules/geronimo-... Date: Thu, 02 Dec 2010 16:49:40 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101202164940.9AFD223888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Thu Dec 2 16:49:40 2010 New Revision: 1041446 URL: http://svn.apache.org/viewvc?rev=1041446&view=rev Log: GERONIMO-5396: Use resource bundle to format messages when using JUL Added: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/ geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/ geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/ geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/ geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/ geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java (with props) Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml geronimo/server/trunk/pom.xml Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=1041446&r1=1041445&r2=1041446&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original) +++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Thu Dec 2 16:49:40 2010 @@ -101,9 +101,13 @@ org.apache.geronimo.logging, - org.ops4j.pax.logging.spi;provider=paxlogging;version="1.5" + org.ops4j.pax.logging.spi;provider=paxlogging;version="1.5.3" org.apache.geronimo.logging.impl.LoggingServiceActivator + + {maven-resources}, + org/ops4j/pax/logging/service/internal/JdkHandler.class=target/classes/org/ops4j/pax/logging/service/internal/JdkHandler.class + Added: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java?rev=1041446&view=auto ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java (added) +++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java Thu Dec 2 16:49:40 2010 @@ -0,0 +1,126 @@ +/* + * Copyright 2006 Niclas Hedhman. + * + * Licensed 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. + */ +package org.ops4j.pax.logging.service.internal; + +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.SimpleFormatter; + +import org.ops4j.pax.logging.PaxLoggingService; + +public class JdkHandler extends Handler +{ + + private PaxLoggingService m_logService; + + public JdkHandler( PaxLoggingService logService ) + { + m_logService = logService; + setFormatter( new SimpleFormatter() ); + } + + /** + * Close the Handler and free all associated resources. + *

+ * The close method will perform a flush and then close the + * Handler. After close has been called this Handler + * should no longer be used. Method calls may either be silently + * ignored or may throw runtime exceptions. + * + * @throws SecurityException if a security manager exists and if + * the caller does not have LoggingPermission("control"). + */ + public void close() + throws SecurityException + { + } + + /** + * Flush any buffered output. + */ + public void flush() + { + } + + /** + * Publish a LogRecord. + *

+ * The logging request was made initially to a Logger object, + * which initialized the LogRecord and forwarded it here. + *

+ * The Handler is responsible for formatting the message, when and + * if necessary. The formatting should include localization. + * + * @param record description of the log event + */ + public void publish( LogRecord record ) + { + Level level = record.getLevel(); + if( level.intValue() == Level.CONFIG.intValue() ) + { + return; + } + String loggerName = record.getLoggerName(); + // TODO: Can't associate a bundle with the JDK logger. So how?? + String fqcn = java.util.logging.Logger.class.getName(); + PaxLoggerImpl logger = (PaxLoggerImpl) m_logService.getLogger( null, loggerName, fqcn ); + String message; + try + { + message = getFormatter().formatMessage( record ); + } + catch (Exception ex) + { + message = record.getMessage(); + } + Throwable throwable = record.getThrown(); + org.apache.log4j.Level log4jlevel; + if( level == Level.OFF ) + { + log4jlevel = org.apache.log4j.Level.OFF; + } + else if( level == Level.FINE ) + { + log4jlevel = org.apache.log4j.Level.DEBUG; + } + else if( level == Level.FINER || level == Level.FINEST ) + { + log4jlevel = org.apache.log4j.Level.TRACE; + } + else if( level == Level.INFO ) + { + log4jlevel = org.apache.log4j.Level.INFO; + } + else if( level == Level.WARNING ) + { + log4jlevel = org.apache.log4j.Level.WARN; + } + else if( level == Level.SEVERE ) + { + log4jlevel = org.apache.log4j.Level.ERROR; + } + else + { + log4jlevel = org.apache.log4j.Level.INFO; + } + //bug fixed here + logger.log( log4jlevel, message, throwable ); + } + +} Propchange: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/ops4j/pax/logging/service/internal/JdkHandler.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: geronimo/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1041446&r1=1041445&r2=1041446&view=diff ============================================================================== --- geronimo/server/trunk/pom.xml (original) +++ geronimo/server/trunk/pom.xml Thu Dec 2 16:49:40 2010 @@ -85,7 +85,7 @@ 1.6 ${project.version} - 1.5.2 + 1.5.3 3.2.9_1 0.7.3_1